Browse code

Revert "bytecode/JIT: re-enable SSP with LLVM 3.0."

This reverts commit 3098cdbe298585b3409fab2c83ba071f0c3d0c24.

Török Edvin authored on 2011/10/10 17:43:46
Showing 1 changed files
... ...
@@ -1073,7 +1073,7 @@ public:
1073 1073
 	    // Have an alloca -> some instruction uses its address otherwise
1074 1074
 	    // mem2reg would have converted it to an SSA register.
1075 1075
 	    // Enable stack protector for this function.
1076
-#if !defined(LLVM29) || defined(LLVM30)
1076
+#ifndef LLVM29
1077 1077
 	    // LLVM 2.9 has broken SSP, it does a 'mov 0x28, $rax', which tries
1078 1078
 	    // to read from the address 0x28 and crashes
1079 1079
 	    F->addFnAttr(Attribute::StackProtectReq);
... ...
@@ -1082,7 +1082,7 @@ public:
1082 1082
 	// always add stackprotect attribute (bb #2239), so we know this
1083 1083
 	// function was verified. If there is no alloca it won't actually add
1084 1084
 	// stack protector in emitted code so this won't slow down the app.
1085
-#if !defined(LLVM29) || defined(LLVM30)
1085
+#ifndef LLVM29
1086 1086
 	F->addFnAttr(Attribute::StackProtect);
1087 1087
 #endif
1088 1088
     }