Permalink
Browse files

Fix build with LLVM 2.9.

  • Loading branch information...
1 parent 5b9de8c commit 5b4673e8eb6c3ec45b116f92959d0ed6a83d8532 Matt Pharr committed Feb 7, 2012
Showing with 6 additions and 6 deletions.
  1. +1 −1 builtins/util.m4
  2. +5 −5 opt.cpp
View
2 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
View
10 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
}

0 comments on commit 5b4673e

Please sign in to comment.