Changeset 154509 in webkit for trunk/Source/JavaScriptCore/Configurations

Timestamp:

Aug 23, 2013, 12:41:54 PM (12 years ago)

Author:

[email protected]

Message:

build-jsc --ftl-jit should work
​https://bugs.webkit.org/show_bug.cgi?id=120194

Reviewed by Oliver Hunt.

Source/JavaScriptCore:

• Configurations/Base.xcconfig: CPPFLAGS should include FEATURE_DEFINES
• Configurations/JSC.xcconfig: The 'jsc' tool includes headers where field layout may depend on FEATURE_DEFINES
• Configurations/ToolExecutable.xcconfig: All other tools include headers where field layout may depend on FEATURE_DEFINES
• ftl/FTLLowerDFGToLLVM.cpp: Build fix

(JSC::FTL::LowerDFGToLLVM::compilePutStructure):
(JSC::FTL::LowerDFGToLLVM::compilePhantomPutStructure):

Source/WTF:

• wtf/LLVMHeaders.h: I don't know what went wrong here. If HAVE(LLVM), then we need those headers!

Tools:

• Scripts/build-jsc: Need to pass the feature flag to xcodebuild

Location:

trunk/Source/JavaScriptCore/Configurations

Files:

• Base.xcconfig (modified) (1 diff)
• JSC.xcconfig (modified) (1 diff)
• ToolExecutable.xcconfig (modified) (1 diff)

trunk/Source/JavaScriptCore/Configurations/Base.xcconfig

@@ -44 +44 @@
 GCC_OBJC_CALL_CXX_CDTORS = YES;
 GCC_PRECOMPILE_PREFIX_HEADER = YES;
-GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) HAVE_DTRACE=$(HAVE_DTRACE) WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST HAVE_HEADER_DETECTION_H $(GCC_PREPROCESSOR_DEFINITIONS);
+GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) HAVE_DTRACE=$(HAVE_DTRACE) WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST HAVE_HEADER_DETECTION_H $(FEATURE_DEFINES) $(GCC_PREPROCESSOR_DEFINITIONS);
 GCC_STRICT_ALIASING = YES;
 GCC_THREADSAFE_STATICS = NO;

trunk/Source/JavaScriptCore/Configurations/JSC.xcconfig

@@ -22 +22 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
+#include "FeatureDefines.xcconfig"
+#include "Version.xcconfig"
+
 INSTALL_PATH = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/JavaScriptCore.framework/Versions/A/Resources
 PRODUCT_NAME = jsc;

trunk/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig

@@ -22 +22 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
+#include "FeatureDefines.xcconfig"
+#include "Version.xcconfig"
+
 INSTALL_PATH = $(INSTALL_PATH_$(PLATFORM_NAME));
 INSTALL_PATH_iphoneos = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/JavaScriptCore.framework/Resources;