Integrate new arm patch and fix an LLVM bug

Thanks @luqama!
rust-lang · Aug 4, 2013 · 60e9507 · 60e9507 · bors · Aug 4, 2013
1 parent bb93930
commit 60e9507
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/librustc/lib/llvm.rs b/src/librustc/lib/llvm.rs
@@ -89,7 +89,7 @@ pub enum Attribute {
     // Not added to LLVM yet, so may need to stay updated if LLVM changes.
     // FIXME(#8199): if this changes, be sure to change the relevant constant
     //               down below
-    FixedStackSegment = 1 << 41,
+    // FixedStackSegment = 1 << 41,
 }
 
 // enum for the LLVM IntPredicate type
@@ -2124,10 +2124,12 @@ pub fn SetFunctionAttribute(Fn: ValueRef, attr: Attribute) {
 //               Furthermore, if we use a match of any sort then an LLVM
 //               assertion is generated!
 pub fn SetFixedStackSegmentAttribute(Fn: ValueRef) {
+    unsafe {
         let attr = 1u64 << 41;
         let lower = attr & 0xffffffff;
         let upper = (attr >> 32) & 0xffffffff;
         llvm::LLVMAddFunctionAttr(Fn, lower as c_uint, upper as c_uint);
+    }
 }
 /* Memory-managed object interface to type handles. */
 

diff --git a/src/llvm b/src/llvm