summaryrefslogtreecommitdiff
path: root/lib/ExecutionEngine
diff options
context:
space:
mode:
authorJeffrey Yasskin <jyasskin@google.com>2009-12-13 20:30:32 +0000
committerJeffrey Yasskin <jyasskin@google.com>2009-12-13 20:30:32 +0000
commit898e9df8dbc65b9b7b92c35ac6673ac8651ff3e8 (patch)
tree1b26f0fa5eb248074b52437d08b4c107500d4655 /lib/ExecutionEngine
parentc4174d675bb873b45fbc63777d388147cf27065a (diff)
downloadllvm-898e9df8dbc65b9b7b92c35ac6673ac8651ff3e8.tar.gz
llvm-898e9df8dbc65b9b7b92c35ac6673ac8651ff3e8.tar.bz2
llvm-898e9df8dbc65b9b7b92c35ac6673ac8651ff3e8.tar.xz
Reinstate r91208 to fix available_externally linkage for globals, with
nlewycky's fix to add -rdynamic so the JIT can look symbols up in Linux builds of the JITTests binary. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@91250 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/ExecutionEngine')
-rw-r--r--lib/ExecutionEngine/JIT/JIT.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ExecutionEngine/JIT/JIT.cpp b/lib/ExecutionEngine/JIT/JIT.cpp
index 6d781c7e22..3607f1fcb0 100644
--- a/lib/ExecutionEngine/JIT/JIT.cpp
+++ b/lib/ExecutionEngine/JIT/JIT.cpp
@@ -681,7 +681,7 @@ void *JIT::getOrEmitGlobalVariable(const GlobalVariable *GV) {
if (Ptr) return Ptr;
// If the global is external, just remember the address.
- if (GV->isDeclaration()) {
+ if (GV->isDeclaration() || GV->hasAvailableExternallyLinkage()) {
#if HAVE___DSO_HANDLE
if (GV->getName() == "__dso_handle")
return (void*)&__dso_handle;