Modified: tags/Safari-607.1.10.8/Source/_javascript_Core/ChangeLog (237711 => 237712)
--- tags/Safari-607.1.10.8/Source/_javascript_Core/ChangeLog 2018-11-02 00:51:12 UTC (rev 237711)
+++ tags/Safari-607.1.10.8/Source/_javascript_Core/ChangeLog 2018-11-02 00:58:02 UTC (rev 237712)
@@ -1,3 +1,7 @@
+2018-11-01 Alan Coon <alanc...@apple.com>
+
+ Revert r237583. rdar://problem/45747609
+
2018-10-29 Kocsen Chung <kocsen_ch...@apple.com>
Cherry-pick r237575. rdar://problem/45169447
Modified: tags/Safari-607.1.10.8/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig (237711 => 237712)
--- tags/Safari-607.1.10.8/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig 2018-11-02 00:51:12 UTC (rev 237711)
+++ tags/Safari-607.1.10.8/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig 2018-11-02 00:58:02 UTC (rev 237712)
@@ -25,7 +25,6 @@
#include "Version.xcconfig"
DEFINES_MODULE = YES;
-MODULEMAP_FILE = $(SRCROOT)/_javascript_Core.modulemap;
// 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,__ZTISt9bad_alloc -Wl,-unexported_symbol,__ZTISt9exception -Wl,-unexported_symbol,__ZTSSt9bad_alloc -Wl,-unexported_symbol,__ZTSSt9exception -Wl,-unexported_symbol,__ZdlPvS_ -Wl,-unexported_symbol,__ZnwmPv -Wl,-unexported_symbol,__ZNKSt3__18functionIFvvEEclEv -Wl,-unexported_symbol,__ZNSt3__18functionIFvvEEC1EOS2_ -Wl,-unexported_symbol,__ZNSt3__18functionIFvvEEC2EOS2_ -Wl,-unexported_symbol,__ZNKSt3__18functionIFvRN3JSC17BytecodeGeneratorEPNS1_10RegisterIDEEEclES3_S5_ -Wl,-unexported_symbol,__ZNSt3__18functionIFvRN3JSC17BytecodeGeneratorEPNS1_10RegisterIDEEED1Ev -Wl,-unexported_symbol,__ZNSt3__18functionIFvRN3JSC17BytecodeGeneratorEPNS1_10RegisterIDEEED2Ev -Wl,-unexported_symbol,__ZNSt3__18functionIFvvEED1Ev -Wl,-unexported_symbol,__ZNSt3__18functionIFvvEED2Ev -Wl,-unexported_symbol,__ZTVNSt3__117bad_function_callE;
Deleted: tags/Safari-607.1.10.8/Source/_javascript_Core/_javascript_Core.modulemap (237711 => 237712)
--- tags/Safari-607.1.10.8/Source/_javascript_Core/_javascript_Core.modulemap 2018-11-02 00:51:12 UTC (rev 237711)
+++ tags/Safari-607.1.10.8/Source/_javascript_Core/_javascript_Core.modulemap 2018-11-02 00:58:02 UTC (rev 237712)
@@ -1,18 +0,0 @@
-framework module _javascript_Core {
- umbrella header "_javascript_Core.h"
-
- export *
- module * {
- export *
- }
-
- explicit module JSVirtualMachine {
- // FIXME: 32-bit x86 is a poor way to say "fragile Objective-C ABI"
- requires x86_32
- exclude header "JSValue.h"
- exclude header "JSContext.h"
- exclude header "JSExport.h"
- exclude header "JSManagedValue.h"
- exclude header "JSVirtualMachine.h"
- }
-}
Modified: tags/Safari-607.1.10.8/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (237711 => 237712)
--- tags/Safari-607.1.10.8/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2018-11-02 00:51:12 UTC (rev 237711)
+++ tags/Safari-607.1.10.8/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2018-11-02 00:58:02 UTC (rev 237712)
@@ -3317,7 +3317,6 @@
531374BC1D5CE67600AF7A0B /* WasmPlan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WasmPlan.h; sourceTree = "<group>"; };
531374BE1D5CE95000AF7A0B /* WasmPlan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WasmPlan.cpp; sourceTree = "<group>"; };
531D4E191F59CDD200EC836C /* testapi.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = testapi.cpp; path = API/tests/testapi.cpp; sourceTree = "<group>"; };
- 532631B3218777A5007B8191 /* _javascript_Core.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = _javascript_Core.modulemap; sourceTree = "<group>"; };
533B15DE1DC7F463004D500A /* WasmOps.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WasmOps.h; sourceTree = "<group>"; };
5341FC6F1DAC33E500E7E4D7 /* B3WasmBoundsCheckValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = B3WasmBoundsCheckValue.cpp; path = b3/B3WasmBoundsCheckValue.cpp; sourceTree = "<group>"; };
5341FC711DAC343C00E7E4D7 /* B3WasmBoundsCheckValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = B3WasmBoundsCheckValue.h; path = b3/B3WasmBoundsCheckValue.h; sourceTree = "<group>"; };
@@ -4952,7 +4951,6 @@
8604F4F2143A6C4400B295F5 /* ChangeLog */,
F68EBB8C0255D4C601FF60F7 /* config.h */,
F692A8540255597D01FF60F7 /* create_hash_table */,
- 532631B3218777A5007B8191 /* _javascript_Core.modulemap */,
937B63CC09E766D200A671DD /* DerivedSources.make */,
0F93275A1C20BCDF00CF6564 /* dynbench.cpp */,
6529FB3018B2D63900C61102 /* generate-bytecode-files */,
