Gardening: Build fix after r237479.
authortzagallo@apple.com <tzagallo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 26 Oct 2018 22:02:54 +0000 (22:02 +0000)
committertzagallo@apple.com <tzagallo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 26 Oct 2018 22:02:54 +0000 (22:02 +0000)
https://bugs.webkit.org/show_bug.cgi?id=187373

Unreviewed.

* Configurations/JSC.xcconfig:
* JavaScriptCore.xcodeproj/project.pbxproj:
* llint/LLIntData.cpp:
(JSC::LLInt::initialize):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237484 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/JSC.xcconfig
Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
Source/JavaScriptCore/llint/LLIntData.cpp

index 19645c2..4c8e4c1 100644 (file)
@@ -1,5 +1,17 @@
 2018-10-26  Tadeu Zagallo  <tzagallo@apple.com>
 
+        Gardening: Build fix after r237479.
+        https://bugs.webkit.org/show_bug.cgi?id=187373
+
+        Unreviewed.
+
+        * Configurations/JSC.xcconfig:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * llint/LLIntData.cpp:
+        (JSC::LLInt::initialize):
+
+2018-10-26  Tadeu Zagallo  <tzagallo@apple.com>
+
         New bytecode format for JSC
         https://bugs.webkit.org/show_bug.cgi?id=187373
         <rdar://problem/44186758>
index 2b75636..6634405 100644 (file)
@@ -37,3 +37,4 @@ OTHER_CODE_SIGN_FLAGS[sdk=iphone*] = -i com.apple.jsc;
 
 // Explicitly add the PrivateHeaders directory to the search path so that generated header files can be found in production builds.
 HEADER_SEARCH_PATHS = "$(JAVASCRIPTCORE_FRAMEWORKS_DIR)/JavaScriptCore.framework/PrivateHeaders" $(inherited);
+HEADER_SEARCH_PATHS = "${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore" $(HEADER_SEARCH_PATHS);
index 39b5bf4..ed49b0b 100644 (file)
                        remoteGlobalIDString = 0F4680A914BA7FD900BFE272;
                        remoteInfo = "LLInt Offsets";
                };
+               14013B752183C01E00999946 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 65FB3F6609D11E9100F49DEB;
+                       remoteInfo = "Derived Sources";
+               };
                14BD6883215191310050DAFF /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
                        buildRules = (
                        );
                        dependencies = (
+                               14013B762183C01E00999946 /* PBXTargetDependency */,
                        );
                        name = jsc;
                        productInstallPath = /usr/local/bin;
                        target = 0F4680A914BA7FD900BFE272 /* LLInt Offsets */;
                        targetProxy = 0FF922D214F46B2F0041A24E /* PBXContainerItemProxy */;
                };
+               14013B762183C01E00999946 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 65FB3F6609D11E9100F49DEB /* Derived Sources */;
+                       targetProxy = 14013B752183C01E00999946 /* PBXContainerItemProxy */;
+               };
                14BD6882215191310050DAFF /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 65FB3F6609D11E9100F49DEB /* Derived Sources */;
index 0a3a871..359d5ef 100644 (file)
@@ -51,7 +51,7 @@ uint8_t Data::s_exceptionInstructions[maxOpcodeLength + 1] = { };
 Opcode g_opcodeMap[numOpcodeIDs] = { };
 Opcode g_opcodeMapWide[numOpcodeIDs] = { };
 
-#if ENABLE(JIT)
+#if !ENABLE(C_LOOP)
 extern "C" void llint_entry(void*, void*);
 #endif
 
@@ -60,7 +60,7 @@ void initialize()
 #if ENABLE(C_LOOP)
     CLoop::initialize();
 
-#else // ENABLE(JIT)
+#else // !ENABLE(C_LOOP)
     llint_entry(&g_opcodeMap, &g_opcodeMapWide);
 
     for (int i = 0; i < numOpcodeIDs; ++i) {
@@ -71,7 +71,7 @@ void initialize()
     ASSERT(llint_throw_from_slow_path_trampoline < UINT8_MAX);
     for (int i = 0; i < maxOpcodeLength + 1; ++i)
         Data::s_exceptionInstructions[i] = llint_throw_from_slow_path_trampoline;
-#endif // ENABLE(JIT)
+#endif // ENABLE(C_LOOP)
 }
 
 IGNORE_CLANG_WARNINGS_BEGIN("missing-noreturn")