Cleaned up the code which chooses the appropriate value for the file descriptor
to pass to dlsym() -- Linux/x86 wants 0 while Sparc/Solaris wants RTLD_SELF,
which is not zero. Thanks to Chris for the suggestion.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@7204 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/ExecutionEngine/ExecutionEngine.cpp b/lib/ExecutionEngine/ExecutionEngine.cpp
index 74a3c86..5faa2e7 100644
--- a/lib/ExecutionEngine/ExecutionEngine.cpp
+++ b/lib/ExecutionEngine/ExecutionEngine.cpp
@@ -359,14 +359,13 @@
DEBUG(std::cerr << "Global '" << I->getName() << "' -> "
<< (void*)GlobalAddress[I] << "\n");
} else {
- // 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
+ // On Sparc, RTLD_SELF is already defined and it's not zero
// Linux/x86 wants to use a 0, other systems may differ
+#ifndef RTLD_SELF
#define RTLD_SELF 0
#endif
+ // External variable reference, try to use dlsym to get a pointer to it in
+ // the LLI image.
if (void *SymAddr = dlsym(RTLD_SELF, I->getName().c_str()))
GlobalAddress[I] = SymAddr;
else {