diff options
| author | Misha Brukman <brukman+llvm@gmail.com> | 2003-07-28 19:07:30 +0000 |
|---|---|---|
| committer | Misha Brukman <brukman+llvm@gmail.com> | 2003-07-28 19:07:30 +0000 |
| commit | d94a50f99d5201052e7f88d1f5ef0880d827ab40 (patch) | |
| tree | 46e329a947bb86447e31afac2f89ae90f746c096 /lib/ExecutionEngine | |
| parent | df38dae9492ca539387fb7e944ab7a5dbc5f6f1e (diff) | |
| download | external_llvm-d94a50f99d5201052e7f88d1f5ef0880d827ab40.zip external_llvm-d94a50f99d5201052e7f88d1f5ef0880d827ab40.tar.gz external_llvm-d94a50f99d5201052e7f88d1f5ef0880d827ab40.tar.bz2 | |
Clean up code dealing with RTLD_SELF differences on Sparc and X86.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@7362 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/ExecutionEngine')
| -rw-r--r-- | lib/ExecutionEngine/JIT/Intercept.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/ExecutionEngine/JIT/Intercept.cpp b/lib/ExecutionEngine/JIT/Intercept.cpp index ba49bbd..10fd970 100644 --- a/lib/ExecutionEngine/JIT/Intercept.cpp +++ b/lib/ExecutionEngine/JIT/Intercept.cpp @@ -54,11 +54,12 @@ void *VM::getPointerToNamedFunction(const std::string &Name) { if (Name == "atexit") return (void*)&jit_atexit; // If it's an external function, look it up in the process image... -#if defined(i386) || defined(__i386__) || defined(__x86__) - void *Ptr = dlsym(0, Name.c_str()); -#elif defined(sparc) || defined(__sparc__) || defined(__sparcv9) - void *Ptr = dlsym(RTLD_SELF, Name.c_str()); + // 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 + void *Ptr = dlsym(RTLD_SELF, Name.c_str()); if (Ptr == 0) { std::cerr << "WARNING: Cannot resolve fn '" << Name << "' using a dummy noop function instead!\n"; @@ -67,4 +68,3 @@ void *VM::getPointerToNamedFunction(const std::string &Name) { return Ptr; } - |