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
diff --git a/lib/ExecutionEngine/ExecutionEngine.cpp b/lib/ExecutionEngine/ExecutionEngine.cpp
index a661dd4..74a3c86 100644
--- a/lib/ExecutionEngine/ExecutionEngine.cpp
+++ b/lib/ExecutionEngine/ExecutionEngine.cpp
@@ -362,12 +362,13 @@
// 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";