diff options
author | Eric Christopher <echristo@gmail.com> | 2015-03-10 00:33:27 +0000 |
---|---|---|
committer | Eric Christopher <echristo@gmail.com> | 2015-03-10 00:33:27 +0000 |
commit | 0c3c1893c4a737613dd402ffb7a9ff5456ae1f5e (patch) | |
tree | c0e54c37476b7501b99c3ea9f1ad4d4643a94e2f /llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp | |
parent | 33866f141c9a0ad567e2051463a0bc7b6dcfa03c (diff) | |
download | bcm5719-llvm-0c3c1893c4a737613dd402ffb7a9ff5456ae1f5e.tar.gz bcm5719-llvm-0c3c1893c4a737613dd402ffb7a9ff5456ae1f5e.zip |
Temporarily revert r231726 and r231724 as they're breaking the build.:
Author: Lang Hames <lhames@gmail.com>
Date: Mon Mar 9 23:51:09 2015 +0000
[Orc][MCJIT][RuntimeDyld] Add header that was accidentally left out of r231724.
Author: Lang Hames <lhames@gmail.com>
Date: Mon Mar 9 23:44:13 2015 +0000
[Orc][MCJIT][RuntimeDyld] Add symbol flags to symbols in RuntimeDyld. Thread the
new types through MCJIT and Orc.
In particular, add a 'weak' flag. When plumbed through RTDyldMemoryManager, this
will allow us to distinguish between weak and strong definitions and find the
right ones during symbol resolution.
llvm-svn: 231731
Diffstat (limited to 'llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp')
-rw-r--r-- | llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp b/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp index 20b85532e0b..527941b59a8 100644 --- a/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp +++ b/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp @@ -257,7 +257,7 @@ uint64_t MCJIT::getExistingSymbolAddress(const std::string &Name) { Mangler Mang(TM->getDataLayout()); SmallString<128> FullName; Mang.getNameWithPrefix(FullName, Name); - return Dyld.getSymbol(FullName).getAddress(); + return Dyld.getSymbolLoadAddress(FullName); } Module *MCJIT::findModuleForSymbol(const std::string &Name, @@ -383,7 +383,7 @@ void *MCJIT::getPointerToFunction(Function *F) { // // This is the accessor for the target address, so make sure to check the // load address of the symbol, not the local address. - return (void*)Dyld.getSymbol(Name).getAddress(); + return (void*)Dyld.getSymbolLoadAddress(Name); } void MCJIT::runStaticConstructorsDestructorsInModulePtrSet( |