summaryrefslogtreecommitdiffstats
path: root/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp
diff options
context:
space:
mode:
authorEric Christopher <echristo@gmail.com>2015-03-10 00:33:27 +0000
committerEric Christopher <echristo@gmail.com>2015-03-10 00:33:27 +0000
commit0c3c1893c4a737613dd402ffb7a9ff5456ae1f5e (patch)
treec0e54c37476b7501b99c3ea9f1ad4d4643a94e2f /llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp
parent33866f141c9a0ad567e2051463a0bc7b6dcfa03c (diff)
downloadbcm5719-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/tools/llvm-rtdyld/llvm-rtdyld.cpp')
-rw-r--r--llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp b/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp
index 946201521ba..508318c12a9 100644
--- a/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp
+++ b/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp
@@ -298,7 +298,7 @@ static int executeInput() {
// FIXME: Error out if there are unresolved relocations.
// Get the address of the entry point (_main by default).
- void *MainAddress = Dyld.getSymbolLocalAddress(EntryPoint);
+ void *MainAddress = Dyld.getSymbolAddress(EntryPoint);
if (!MainAddress)
return Error("no definition for '" + EntryPoint + "'");
OpenPOWER on IntegriCloud