X-Git-Url: https://git.saurik.com/apple/libdispatch.git/blobdiff_plain/e85f44377864e428703fb21503e29f422c11288f..fe4ce08b25268ab7a007bb9eb2dd578ca5a9d5e8:/xcodeconfig/libdispatch.xcconfig

diff --git a/xcodeconfig/libdispatch.xcconfig b/xcodeconfig/libdispatch.xcconfig
index e7d44f4..e651bfc 100644
--- a/xcodeconfig/libdispatch.xcconfig
+++ b/xcodeconfig/libdispatch.xcconfig
@@ -22,7 +22,6 @@
 SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator
 ARCHS[sdk=iphonesimulator*] = $(NATIVE_ARCH_32_BIT) // Override BSD.xcconfig ARCHS <rdar://problem/9303721>
 PRODUCT_NAME = libdispatch
-PRODUCT_NAME[sdk=iphonesimulator*] = libdispatch_sim
 EXECUTABLE_PREFIX =
 LD_DYLIB_INSTALL_NAME = /usr/lib/system/$(EXECUTABLE_NAME)
 INSTALL_PATH = /usr/lib/system
@@ -31,6 +30,10 @@ PUBLIC_HEADERS_FOLDER_PATH = /usr/include/dispatch
 PUBLIC_HEADERS_FOLDER_PATH[sdk=iphonesimulator*] = $(SDKROOT)/usr/include/dispatch
 PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/dispatch
 PRIVATE_HEADERS_FOLDER_PATH[sdk=iphonesimulator*] = $(SDKROOT)/usr/local/include/dispatch
+OS_PUBLIC_HEADERS_FOLDER_PATH = /usr/include/os
+OS_PUBLIC_HEADERS_FOLDER_PATH[sdk=iphonesimulator*] = $(SDKROOT)/usr/include/os
+OS_PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/os
+OS_PRIVATE_HEADERS_FOLDER_PATH[sdk=iphonesimulator*] = $(SDKROOT)/usr/local/include/os
 HEADER_SEARCH_PATHS = $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders $(PROJECT_DIR)
 INSTALLHDRS_SCRIPT_PHASE = YES
 ALWAYS_SEARCH_USER_PATHS = NO
@@ -39,10 +42,7 @@ ONLY_ACTIVE_ARCH = NO
 GCC_VERSION = com.apple.compilers.llvm.clang.1_0
 GCC_STRICT_ALIASING = YES
 GCC_SYMBOLS_PRIVATE_EXTERN = YES
-GCC_CW_ASM_SYNTAX = NO
-GCC_ENABLE_CPP_EXCEPTIONS = NO
-GCC_ENABLE_CPP_RTTI = NO
-GCC_ENABLE_OBJC_EXCEPTIONS = NO
+GCC_ENABLE_OBJC_GC[sdk=macosx*] = supported
 GCC_ENABLE_PASCAL_STRINGS = NO
 GCC_WARN_SHADOW = YES
 GCC_WARN_64_TO_32_BIT_CONVERSION = YES
@@ -54,14 +54,19 @@ GCC_TREAT_WARNINGS_AS_ERRORS = YES
 GCC_OPTIMIZATION_LEVEL = s
 GCC_THUMB_SUPPORT[arch=armv6] = NO
 GCC_PREPROCESSOR_DEFINITIONS = __DARWIN_NON_CANCELABLE=1
-GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*] = $(GCC_PREPROCESSOR_DEFINITIONS) USE_LIBDISPATCH_INIT_CONSTRUCTOR=1 DISPATCH_USE_PTHREAD_ATFORK=1 DISPATCH_USE_DIRECT_TSD=0
 WARNING_CFLAGS = -Wall -Wextra -Waggregate-return -Wfloat-equal -Wpacked -Wmissing-declarations -Wstrict-overflow=4 -Wstrict-aliasing=2
-OTHER_CFLAGS = -fno-unwind-tables -fno-asynchronous-unwind-tables -fno-exceptions -fdiagnostics-show-option -fverbose-asm -momit-leaf-frame-pointer
+OTHER_CFLAGS = -fdiagnostics-show-option -fverbose-asm
+OTHER_CFLAGS[arch=i386][sdk=macosx*] = $(OTHER_CFLAGS) -fno-unwind-tables -fno-asynchronous-unwind-tables -fno-exceptions
+OTHER_CFLAGS_normal = -momit-leaf-frame-pointer
+OTHER_CFLAGS_normal[arch=armv6][sdk=macosx*] =
+OTHER_CFLAGS_profile = $(OTHER_CFLAGS_normal) -DDISPATCH_PROFILE=1
 OTHER_CFLAGS_debug = -fstack-protector -fno-inline -O0 -DDISPATCH_DEBUG=1
-OTHER_CFLAGS_profile = -DDISPATCH_PROFILE=1
 GENERATE_PROFILING_CODE = NO
-GENERATE_MASTER_OBJECT_FILE = NO
 DYLIB_CURRENT_VERSION = $(CURRENT_PROJECT_VERSION)
 UMBRELLA_LDFLAGS = -umbrella System
 UMBRELLA_LDFLAGS[sdk=iphonesimulator*] =
-OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(UMBRELLA_LDFLAGS) $(CR_LDFLAGS)
+OBJC_LDFLAGS = -Wl,-upward-lobjc -Wl,-order_file,$(SRCROOT)/xcodeconfig/libdispatch.order -Wl,-alias_list,$(SRCROOT)/xcodeconfig/libdispatch.aliases -Wl,-unexported_symbols_list,$(SRCROOT)/xcodeconfig/libdispatch.unexport
+OBJC_LDFLAGS[sdk=macosx*] = $(OBJC_LDFLAGS) -Wl,-upward-lauto
+OBJC_LDFLAGS[arch=i386][sdk=macosx*] =
+OBJC_EXCLUDED_SOURCE_FILE_NAMES_i386_macosx = object.m
+OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(UMBRELLA_LDFLAGS) $(CR_LDFLAGS) $(OBJC_LDFLAGS)