From 859e09f06ea44b9182119fce4c75ba52baf429a6 Mon Sep 17 00:00:00 2001 From: Misha Brukman Date: Tue, 15 Jul 2003 15:58:26 +0000 Subject: [PATCH] Clean up my last checkin: code is easier to read and explains the differences in usage of the special file handle RTLD_SELF on Sparc/Solaris vs. 0 on Linux/x86. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@7177 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/ExecutionEngine/ExecutionEngine.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/ExecutionEngine/ExecutionEngine.cpp b/lib/ExecutionEngine/ExecutionEngine.cpp index a661dd49b51..74a3c867ed7 100644 --- a/lib/ExecutionEngine/ExecutionEngine.cpp +++ b/lib/ExecutionEngine/ExecutionEngine.cpp @@ -362,12 +362,13 @@ void ExecutionEngine::emitGlobals() { // External variable reference, try to use dlsym to get a pointer to it in // the LLI image. #if defined(sparc) || defined(__sparc__) || defined(__sparcv9) + // RTLD_SELF is already defined and it's not zero +#else + // Linux/x86 wants to use a 0, other systems may differ +#define RTLD_SELF 0 +#endif if (void *SymAddr = dlsym(RTLD_SELF, I->getName().c_str())) GlobalAddress[I] = SymAddr; -#else - if (void *SymAddr = dlsym(0, I->getName().c_str())) - GlobalAddress[I] = SymAddr; -#endif else { std::cerr << "Could not resolve external global address: " << I->getName() << "\n";