mirror of
https://github.com/RPCSX/llvm.git
synced 2024-11-26 13:10:34 +00:00
Last check-in was a mistake...
I've been told apple gcc version number is not guaranteed to increase monotonically. Change the preprocess condition to make it less risky. The configuration change is done during the middle 10.4 life cycle so we have to check __APPLE_CC. For future OS X release, we should be able to assume -fenable-cxa-atexit is the default. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@30024 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
4f260b4efa
commit
78050d6cbe
@ -32,8 +32,9 @@ using namespace llvm;
|
||||
|
||||
#ifdef __APPLE__
|
||||
#include <AvailabilityMacros.h>
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4 || \
|
||||
__APPLE_CC__ >= 5330
|
||||
#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)
|
||||
// __dso_handle is resolved by Mac OS X dynamic linker.
|
||||
extern void *__dso_handle __attribute__ ((__visibility__ ("hidden")));
|
||||
#endif
|
||||
@ -310,8 +311,9 @@ void *JIT::getOrEmitGlobalVariable(const GlobalVariable *GV) {
|
||||
// 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 || \
|
||||
__APPLE_CC__ >= 5330
|
||||
#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)
|
||||
// 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.
|
||||
|
Loading…
Reference in New Issue
Block a user