diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-10-15 14:03:16 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-10-15 14:03:16 -0700 |
| commit | 9a2ec7c6ed3eb1b133257f5f40503034fcde40de (patch) | |
| tree | 06f6f2e29330c940059a4df7193b905a01c3b7bf /unittests/ExecutionEngine/JIT/JITTest.cpp | |
| parent | 0ecc9098929275a2b6672d625106225231bed813 (diff) | |
| parent | bb20b24224734f5369d124181d086703ca439dd7 (diff) | |
Merge commit 'bb20b24224734f5369d124181d086703ca439dd7'
Conflicts:
lib/Target/X86/X86FrameLowering.cpp
lib/Target/X86/X86ISelLowering.cpp
Diffstat (limited to 'unittests/ExecutionEngine/JIT/JITTest.cpp')
| -rw-r--r-- | unittests/ExecutionEngine/JIT/JITTest.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/unittests/ExecutionEngine/JIT/JITTest.cpp b/unittests/ExecutionEngine/JIT/JITTest.cpp index 5e2af030f2..ae6855e68b 100644 --- a/unittests/ExecutionEngine/JIT/JITTest.cpp +++ b/unittests/ExecutionEngine/JIT/JITTest.cpp @@ -633,6 +633,7 @@ TEST_F(JITTest, AvailableExternallyGlobalIsntEmitted) { // This function is intentionally defined differently in the statically-compiled // program from the IR input to the JIT to assert that the JIT doesn't use its // definition. +extern "C" int32_t JITTest_AvailableExternallyFunction() LLVM_ATTRIBUTE_USED; extern "C" int32_t JITTest_AvailableExternallyFunction() { return 42; } |