diff --git a/llvm/lib/ExecutionEngine/ExecutionEngine.cpp b/llvm/lib/ExecutionEngine/ExecutionEngine.cpp
index 74a3c867ed790d6f198f242ea0519230645a6af7..5faa2e7f64d742e618044e9e467992f2fcef835f 100644
--- a/llvm/lib/ExecutionEngine/ExecutionEngine.cpp
+++ b/llvm/lib/ExecutionEngine/ExecutionEngine.cpp
@@ -359,14 +359,13 @@ void ExecutionEngine::emitGlobals() {
       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 {