diff options
author | Lang Hames <lhames@gmail.com> | 2016-08-18 00:22:34 +0000 |
---|---|---|
committer | Lang Hames <lhames@gmail.com> | 2016-08-18 00:22:34 +0000 |
commit | 1d39cb16ecff71d26927f514970d65cb435d2716 (patch) | |
tree | c134b4df550ba1fe20460ea64d88a358c4b33a22 /llvm/unittests/ExecutionEngine/ExecutionEngineTest.cpp | |
parent | eccffada338fe084676876138b2e5e183d708757 (diff) | |
download | bcm5719-llvm-1d39cb16ecff71d26927f514970d65cb435d2716.tar.gz bcm5719-llvm-1d39cb16ecff71d26927f514970d65cb435d2716.zip |
[RuntimeDyld] Strip leading '_' from symbols on 32-bit windows in
RTDyldMemoryManager::getSymbolAddressInProcess()
This should allow JIT'd code for win32 to find in-process symbols. See
http://llvm.org/PR28699 .
Patch by James Holderness. Thanks James!
llvm-svn: 279016
Diffstat (limited to 'llvm/unittests/ExecutionEngine/ExecutionEngineTest.cpp')
-rw-r--r-- | llvm/unittests/ExecutionEngine/ExecutionEngineTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/unittests/ExecutionEngine/ExecutionEngineTest.cpp b/llvm/unittests/ExecutionEngine/ExecutionEngineTest.cpp index 7cad8413069..798f5ae3575 100644 --- a/llvm/unittests/ExecutionEngine/ExecutionEngineTest.cpp +++ b/llvm/unittests/ExecutionEngine/ExecutionEngineTest.cpp @@ -139,8 +139,8 @@ TEST_F(ExecutionEngineTest, LookupWithMangledAndDemangledSymbol) { // RTDyldMemoryManager::getSymbolAddressInProcess expects a mangled symbol, // but DynamicLibrary is a wrapper for dlsym, which expects the unmangled C // symbol name. This test verifies that getSymbolAddressInProcess strips the - // leading '_' on Darwin, but not on other platforms. -#ifdef __APPLE__ + // leading '_' on Darwin and 32-bit Windows, but not on other platforms. +#if defined(__APPLE__) || (defined(_WIN32) && !defined(_WIN64)) EXPECT_EQ(reinterpret_cast<uint64_t>(&x), RTDyldMemoryManager::getSymbolAddressInProcess("_x")); #else |