JavaScriptCore-7600.1.4.16.1.tar.gz

[apple/javascriptcore.git] / Configurations / JavaScriptCore.xcconfig

diff --git a/Configurations/JavaScriptCore.xcconfig b/Configurations/JavaScriptCore.xcconfig
index 2800ca6961629de4853ba4f42597939cff941fb4..a02e6b36f2e0b3c2717473fe87c2737c0baad05e 100644 (file)
--- a/Configurations/JavaScriptCore.xcconfig
+++ b/Configurations/JavaScriptCore.xcconfig
@@ -26,19 +26,18 @@
 
 JSVALUE_MODEL = $(JSVALUE_MODEL_$(CURRENT_ARCH));
 JSVALUE_MODEL_ = UNKNOWN_JSVALUE_MODEL;
 
 JSVALUE_MODEL = $(JSVALUE_MODEL_$(CURRENT_ARCH));
 JSVALUE_MODEL_ = UNKNOWN_JSVALUE_MODEL;

-JSVALUE_MODEL_armv6 = 32_64;

 JSVALUE_MODEL_armv7 = 32_64;
 JSVALUE_MODEL_armv7 = 32_64;

-JSVALUE_MODEL_armv7f = 32_64;
+JSVALUE_MODEL_armv7k = 32_64;

 JSVALUE_MODEL_armv7s = 32_64;
 JSVALUE_MODEL_arm64 = 64;
 JSVALUE_MODEL_i386 = 32_64;
 JSVALUE_MODEL_armv7s = 32_64;
 JSVALUE_MODEL_arm64 = 64;
 JSVALUE_MODEL_i386 = 32_64;

-JSVALUE_MODEL_ppc = 32_64;

 JSVALUE_MODEL_x86_64 = 64;
 
 // Prevent C++ standard library operator new, delete and their related exception types from being exported as weak symbols.
 JSVALUE_MODEL_x86_64 = 64;
 
 // Prevent C++ standard library operator new, delete and their related exception types from being exported as weak symbols.

-OTHER_LDFLAGS_HIDE_SYMBOLS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv -Wl,-all_load;
+OTHER_LDFLAGS_HIDE_SYMBOLS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv -Wl,-unexported_symbol -Wl,__ZNKSt3__18functionIFvvEEclEv -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvvEEC1EOS2_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvvEEC2EOS2_ -Wl,-unexported_symbol -Wl,__ZNKSt3__18functionIFvRN3JSC17BytecodeGeneratorEPNS1_10RegisterIDEEEclES3_S5_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvRN3JSC17BytecodeGeneratorEPNS1_10RegisterIDEEED1Ev -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvRN3JSC17BytecodeGeneratorEPNS1_10RegisterIDEEED2Ev -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvvEED1Ev -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvvEED2Ev -Wl,-unexported_symbol -Wl,__ZTVNSt3__117bad_function_callE -Wl,-all_load;
+

 OTHER_LDFLAGS_BASE = -lobjc -Wl,-Y,3 $(OTHER_LDFLAGS_HIDE_SYMBOLS);
 OTHER_LDFLAGS_BASE = -lobjc -Wl,-Y,3 $(OTHER_LDFLAGS_HIDE_SYMBOLS);

-OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));

 OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_BASE);
 OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
 OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -framework CoreServices;
 OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_BASE);
 OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
 OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -framework CoreServices;


@@ -51,3 +50,7 @@ DYLIB_INSTALL_NAME_BASE = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR);
 PRODUCT_NAME = JavaScriptCore;
 
 INSTALLHDRS_SCRIPT_PHASE = YES;
 PRODUCT_NAME = JavaScriptCore;
 
 INSTALLHDRS_SCRIPT_PHASE = YES;

+
+EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
+EXCLUDED_SOURCE_FILE_NAMES_iphoneos = framework.sb;
+EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);