From 5b4673e8eb6c3ec45b116f92959d0ed6a83d8532 Mon Sep 17 00:00:00 2001
From: Matt Pharr <matt.pharr@intel.com>
Date: Tue, 7 Feb 2012 08:37:13 -0800
Subject: [PATCH] Fix build with LLVM 2.9.

---
 builtins/util.m4 |  2 +-
 opt.cpp          | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/builtins/util.m4 b/builtins/util.m4
index 563ee3e9..7c022e94 100644
--- a/builtins/util.m4
+++ b/builtins/util.m4
@@ -1867,7 +1867,7 @@ define void @__delete_varying(<WIDTH x i64> %ptr, <WIDTH x MASK> %mask) {
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; read hw clock
 
-define i64 @__clock() nounwind uwtable ssp {
+define i64 @__clock() nounwind {
 entry:
   tail call void asm sideeffect "xorl %eax,%eax \0A    cpuid", "~{rax},~{rbx},~{rcx},~{rdx},~{dirflag},~{fpsr},~{flags}"() nounwind
   %0 = tail call { i32, i32 } asm sideeffect "rdtsc", "={ax},={dx},~{dirflag},~{fpsr},~{flags}"() nounwind
diff --git a/opt.cpp b/opt.cpp
index 57443040..0cfb360c 100644
--- a/opt.cpp
+++ b/opt.cpp
@@ -184,7 +184,7 @@ lCallInst(llvm::Function *func, llvm::Value *arg0, llvm::Value *arg1,
     llvm::ArrayRef<llvm::Value *> newArgArray(&args[0], &args[2]);
     return llvm::CallInst::Create(func, newArgArray, name, insertBefore);
 #else
-    return llvm::CallInst::Create(func, &newArgs[0], &newArgs[2],
+    return llvm::CallInst::Create(func, &args[0], &args[2],
                                   name, insertBefore);
 #endif
 }
@@ -199,7 +199,7 @@ lCallInst(llvm::Function *func, llvm::Value *arg0, llvm::Value *arg1,
     llvm::ArrayRef<llvm::Value *> newArgArray(&args[0], &args[3]);
     return llvm::CallInst::Create(func, newArgArray, name, insertBefore);
 #else
-    return llvm::CallInst::Create(func, &newArgs[0], &newArgs[3],
+    return llvm::CallInst::Create(func, &args[0], &args[3],
                                   name, insertBefore);
 #endif
 }
@@ -215,7 +215,7 @@ lCallInst(llvm::Function *func, llvm::Value *arg0, llvm::Value *arg1,
     llvm::ArrayRef<llvm::Value *> newArgArray(&args[0], &args[4]);
     return llvm::CallInst::Create(func, newArgArray, name, insertBefore);
 #else
-    return llvm::CallInst::Create(func, &newArgs[0], &newArgs[4],
+    return llvm::CallInst::Create(func, &args[0], &args[4],
                                   name, insertBefore);
 #endif
 }
@@ -230,7 +230,7 @@ lCallInst(llvm::Function *func, llvm::Value *arg0, llvm::Value *arg1,
     llvm::ArrayRef<llvm::Value *> newArgArray(&args[0], &args[5]);
     return llvm::CallInst::Create(func, newArgArray, name, insertBefore);
 #else
-    return llvm::CallInst::Create(func, &newArgs[0], &newArgs[5],
+    return llvm::CallInst::Create(func, &args[0], &args[5],
                                   name, insertBefore);
 #endif
 }
@@ -245,7 +245,7 @@ lCallInst(llvm::Function *func, llvm::Value *arg0, llvm::Value *arg1,
     llvm::ArrayRef<llvm::Value *> newArgArray(&args[0], &args[6]);
     return llvm::CallInst::Create(func, newArgArray, name, insertBefore);
 #else
-    return llvm::CallInst::Create(func, &newArgs[0], &newArgs[6],
+    return llvm::CallInst::Create(func, &args[0], &args[6],
                                   name, insertBefore);
 #endif
 }