From 513748dfc1608e0300f6b2fe3c092e04e207d0fe Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Fri, 28 Jul 2006 21:11:31 +0000 Subject: [PATCH] Fix handling of asm specifiers for external globals. This unbreaks many programs on leopard in the jit. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29391 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/ExecutionEngine/JIT/Intercept.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/ExecutionEngine/JIT/Intercept.cpp b/lib/ExecutionEngine/JIT/Intercept.cpp index 43298d6349f..db6165f7818 100644 --- a/lib/ExecutionEngine/JIT/Intercept.cpp +++ b/lib/ExecutionEngine/JIT/Intercept.cpp @@ -100,9 +100,20 @@ void *JIT::getPointerToNamedFunction(const std::string &Name) { // but print a warning. if (Name == "__main") return (void*)(intptr_t)&__mainFunc; + const char *NameStr = Name.c_str(); + // If this is an asm specifier, skip the sentinal. + if (NameStr[0] == 1) ++NameStr; + // If it's an external function, look it up in the process image... - void *Ptr = sys::DynamicLibrary::SearchForAddressOfSymbol(Name); + void *Ptr = sys::DynamicLibrary::SearchForAddressOfSymbol(NameStr); if (Ptr) return Ptr; + + // If it wasn't found and if it starts with an underscore ('_') character, and + // has an asm specifier, try again without the underscore. + if (Name[0] == 1 && NameStr[0] == '_') { + Ptr = sys::DynamicLibrary::SearchForAddressOfSymbol(NameStr+1); + if (Ptr) return Ptr; + } std::cerr << "ERROR: Program used external function '" << Name << "' which could not be resolved!\n";