diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-10-18 14:20:07 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-10-18 14:20:07 -0700 |
| commit | 556121338c248ba1bb49b369388b697250e848c3 (patch) | |
| tree | 0dc5059be0416f7d806424759f08a177279f0c11 /unittests/ExecutionEngine/JIT/JITTest.cpp | |
| parent | 722d055f70a29c4af58c60dde2682cecc9003f41 (diff) | |
| parent | 3298959540ca744ec16b4c65db244534a929a862 (diff) | |
Merge commit '3298959540ca744ec16b4c65db244534a929a862'
Conflicts:
lib/Target/X86/X86TargetMachine.h
tools/llc/llc.cpp
Diffstat (limited to 'unittests/ExecutionEngine/JIT/JITTest.cpp')
| -rw-r--r-- | unittests/ExecutionEngine/JIT/JITTest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unittests/ExecutionEngine/JIT/JITTest.cpp b/unittests/ExecutionEngine/JIT/JITTest.cpp index ae6855e68b..6933091949 100644 --- a/unittests/ExecutionEngine/JIT/JITTest.cpp +++ b/unittests/ExecutionEngine/JIT/JITTest.cpp @@ -606,7 +606,7 @@ TEST_F(JITTest, FunctionIsRecompiledAndRelinked) { // program from the IR input to the JIT to assert that the JIT doesn't use its // definition. extern "C" int32_t JITTest_AvailableExternallyGlobal; -int32_t JITTest_AvailableExternallyGlobal = 42; +int32_t JITTest_AvailableExternallyGlobal LLVM_ATTRIBUTE_USED = 42; namespace { // Tests on ARM disabled as we're running the old jit |