Changes in directory llvm/lib/ExecutionEngine/JIT:
JIT.cpp updated: 1.83 -> 1.84 --- Log message: Fix PR1057: http://llvm.org/PR1057 (compilation on macos 10.3), patch by Scott Michel! --- Diffs of the changes: (+8 -8) JIT.cpp | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) Index: llvm/lib/ExecutionEngine/JIT/JIT.cpp diff -u llvm/lib/ExecutionEngine/JIT/JIT.cpp:1.83 llvm/lib/ExecutionEngine/JIT/JIT.cpp:1.84 --- llvm/lib/ExecutionEngine/JIT/JIT.cpp:1.83 Mon Dec 11 19:17:41 2006 +++ llvm/lib/ExecutionEngine/JIT/JIT.cpp Sun Dec 17 15:04:02 2006 @@ -31,9 +31,10 @@ #ifdef __APPLE__ #include <AvailabilityMacros.h> -#if (MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4) || \ - (MAC_OS_X_VERSION_MIN_REQUIRED == MAC_OS_X_VERSION_10_4 && \ - __APPLE_CC__ >= 5330) +#if defined(MAC_OS_X_VERSION_10_4) && \ + ((MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4) || \ + (MAC_OS_X_VERSION_MIN_REQUIRED == MAC_OS_X_VERSION_10_4 && \ + __APPLE_CC__ >= 5330)) // __dso_handle is resolved by Mac OS X dynamic linker. extern void *__dso_handle __attribute__ ((__visibility__ ("hidden"))); #endif @@ -308,10 +309,10 @@ // If the global is external, just remember the address. if (GV->isExternal()) { -#ifdef __APPLE__ -#if (MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4) || \ - (MAC_OS_X_VERSION_MIN_REQUIRED == MAC_OS_X_VERSION_10_4 && \ - __APPLE_CC__ >= 5330) +#if defined(__APPLE__) && defined(MAC_OS_X_VERSION_10_4) && \ + ((MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4) || \ + (MAC_OS_X_VERSION_MIN_REQUIRED == MAC_OS_X_VERSION_10_4 && \ + __APPLE_CC__ >= 5330)) // Apple gcc defaults to -fuse-cxa-atexit (i.e. calls __cxa_atexit instead // of atexit). It passes the address of linker generated symbol __dso_handle // to the function. @@ -319,7 +320,6 @@ if (GV->getName() == "__dso_handle") return (void*)&__dso_handle; #endif -#endif Ptr = sys::DynamicLibrary::SearchForAddressOfSymbol(GV->getName().c_str()); if (Ptr == 0) { cerr << "Could not resolve external global address: " _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
