Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (161712 => 161713)
--- trunk/Source/_javascript_Core/ChangeLog 2014-01-11 02:16:22 UTC (rev 161712)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-01-11 02:19:33 UTC (rev 161713)
@@ -1,3 +1,15 @@
+2014-01-10 David Kilzer <[email protected]>
+
+ Clean up architectures in xcconfig files
+ <http://webkit.org/b/126794>
+
+ Reviewed by Andy Estes.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/_javascript_Core.xcconfig: Remove armv6, ppc.
+ * Configurations/ToolExecutable.xcconfig: Sort.
+ - Add new arch.
+
2014-01-10 Dean Jackson <[email protected]>
[JSC] Revise typed array implementations to match ECMAScript and WebGL Specification
Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (161712 => 161713)
--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2014-01-11 02:16:22 UTC (rev 161712)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2014-01-11 02:19:33 UTC (rev 161713)
@@ -60,6 +60,7 @@
GCC_WARN_64_TO_32_BIT_CONVERSION = $(GCC_WARN_64_TO_32_BIT_CONVERSION_$(CURRENT_ARCH));
GCC_WARN_64_TO_32_BIT_CONVERSION_ = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION_armv7 = YES;
+GCC_WARN_64_TO_32_BIT_CONVERSION_armv7k = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION_armv7s = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION_arm64 = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION_i386 = YES;
Modified: trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig (161712 => 161713)
--- trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig 2014-01-11 02:16:22 UTC (rev 161712)
+++ trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig 2014-01-11 02:19:33 UTC (rev 161713)
@@ -26,12 +26,11 @@
JSVALUE_MODEL = $(JSVALUE_MODEL_$(CURRENT_ARCH));
JSVALUE_MODEL_ = UNKNOWN_JSVALUE_MODEL;
-JSVALUE_MODEL_armv6 = 32_64;
JSVALUE_MODEL_armv7 = 32_64;
+JSVALUE_MODEL_armv7k = 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.
Modified: trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig (161712 => 161713)
--- trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig 2014-01-11 02:16:22 UTC (rev 161712)
+++ trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig 2014-01-11 02:19:33 UTC (rev 161713)
@@ -41,9 +41,10 @@
CLANG_ENABLE_OBJC_ARC_i386 = $(CLANG_ENABLE_OBJC_ARC_i386_$(PLATFORM_NAME));
CLANG_ENABLE_OBJC_ARC_i386_iphonesimulator = YES; # For iOS Simulator version 4.0 and greater
CLANG_ENABLE_OBJC_ARC_x86_64 = YES;
-CLANG_ENABLE_OBJC_ARC_arm64 = YES;
CLANG_ENABLE_OBJC_ARC_armv7 = YES;
+CLANG_ENABLE_OBJC_ARC_armv7k = YES;
CLANG_ENABLE_OBJC_ARC_armv7s = YES;
+CLANG_ENABLE_OBJC_ARC_arm64 = YES;
OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
Modified: trunk/Source/WTF/ChangeLog (161712 => 161713)
--- trunk/Source/WTF/ChangeLog 2014-01-11 02:16:22 UTC (rev 161712)
+++ trunk/Source/WTF/ChangeLog 2014-01-11 02:19:33 UTC (rev 161713)
@@ -1,3 +1,13 @@
+2014-01-10 David Kilzer <[email protected]>
+
+ Clean up architectures in xcconfig files
+ <http://webkit.org/b/126794>
+
+ Reviewed by Andy Estes.
+
+ * Configurations/Base.xcconfig:
+ - Add new arch.
+
2014-01-10 Tamas Gergely <[email protected]>
[EFL][JSC] Enable udis86 disassembler on efl.
Modified: trunk/Source/WTF/Configurations/Base.xcconfig (161712 => 161713)
--- trunk/Source/WTF/Configurations/Base.xcconfig 2014-01-11 02:16:22 UTC (rev 161712)
+++ trunk/Source/WTF/Configurations/Base.xcconfig 2014-01-11 02:19:33 UTC (rev 161713)
@@ -60,6 +60,7 @@
GCC_WARN_64_TO_32_BIT_CONVERSION = $(GCC_WARN_64_TO_32_BIT_CONVERSION_$(CURRENT_ARCH));
GCC_WARN_64_TO_32_BIT_CONVERSION_ = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION_armv7 = YES;
+GCC_WARN_64_TO_32_BIT_CONVERSION_armv7k = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION_armv7s = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION_arm64 = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION_i386 = YES;
Modified: trunk/Source/WebCore/ChangeLog (161712 => 161713)
--- trunk/Source/WebCore/ChangeLog 2014-01-11 02:16:22 UTC (rev 161712)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 02:19:33 UTC (rev 161713)
@@ -1,3 +1,15 @@
+2014-01-10 David Kilzer <[email protected]>
+
+ Clean up architectures in xcconfig files
+ <http://webkit.org/b/126794>
+
+ Reviewed by Andy Estes.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/WebCore.xcconfig: Remove armv6.
+ * DerivedSources.make: Remove armv6, armv7f. Sort.
+ - Add new arch.
+
2014-01-10 Simon Fraser <[email protected]>
Fix iOS build
Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (161712 => 161713)
--- trunk/Source/WebCore/Configurations/Base.xcconfig 2014-01-11 02:16:22 UTC (rev 161712)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig 2014-01-11 02:19:33 UTC (rev 161713)
@@ -57,6 +57,7 @@
GCC_WARN_64_TO_32_BIT_CONVERSION = $(GCC_WARN_64_TO_32_BIT_CONVERSION_$(CURRENT_ARCH));
GCC_WARN_64_TO_32_BIT_CONVERSION_ = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION_armv7 = YES;
+GCC_WARN_64_TO_32_BIT_CONVERSION_armv7k = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION_armv7s = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION_arm64 = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION_i386 = YES;
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (161712 => 161713)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2014-01-11 02:16:22 UTC (rev 161712)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2014-01-11 02:19:33 UTC (rev 161713)
@@ -26,8 +26,8 @@
EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
EXPORTED_SYMBOLS_FILE_ = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.exp;
-EXPORTED_SYMBOLS_FILE_armv6 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.armv6.exp;
EXPORTED_SYMBOLS_FILE_armv7 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.armv7.exp;
+EXPORTED_SYMBOLS_FILE_armv7k = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.armv7k.exp;
EXPORTED_SYMBOLS_FILE_armv7s = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.armv7s.exp;
EXPORTED_SYMBOLS_FILE_arm64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.arm64.exp;
EXPORTED_SYMBOLS_FILE_i386 = $(EXPORTED_SYMBOLS_FILE_i386_$(PLATFORM_NAME));
Modified: trunk/Source/WebCore/DerivedSources.make (161712 => 161713)
--- trunk/Source/WebCore/DerivedSources.make 2014-01-11 02:16:22 UTC (rev 161712)
+++ trunk/Source/WebCore/DerivedSources.make 2014-01-11 02:19:33 UTC (rev 161713)
@@ -1196,18 +1196,15 @@
ifeq ($(WTF_PLATFORM_IOS),1)
-ifeq ($(findstring armv6,$(ARCHS)), armv6)
- WEBCORE_EXPORT_FILES := $(WEBCORE_EXPORT_FILES) WebCore.LP64.armv6.exp
+ifeq ($(findstring armv7,$(ARCHS)), armv7)
+ WEBCORE_EXPORT_FILES := $(WEBCORE_EXPORT_FILES) WebCore.LP64.armv7.exp
endif
-ifeq ($(findstring armv7f,$(ARCHS)), armv7f)
- WEBCORE_EXPORT_FILES := $(WEBCORE_EXPORT_FILES) WebCore.LP64.armv7f.exp
+ifeq ($(findstring armv7k,$(ARCHS)), armv7k)
+ WEBCORE_EXPORT_FILES := $(WEBCORE_EXPORT_FILES) WebCore.LP64.armv7k.exp
endif
ifeq ($(findstring armv7s,$(ARCHS)), armv7s)
WEBCORE_EXPORT_FILES := $(WEBCORE_EXPORT_FILES) WebCore.LP64.armv7s.exp
endif
-ifeq ($(findstring armv7,$(ARCHS)), armv7)
- WEBCORE_EXPORT_FILES := $(WEBCORE_EXPORT_FILES) WebCore.LP64.armv7.exp
-endif
ifeq ($(findstring arm64,$(ARCHS)), arm64)
WEBCORE_EXPORT_FILES := $(WEBCORE_EXPORT_FILES) WebCore.LP64.arm64.exp
endif
Modified: trunk/Source/WebKit/mac/ChangeLog (161712 => 161713)
--- trunk/Source/WebKit/mac/ChangeLog 2014-01-11 02:16:22 UTC (rev 161712)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-11 02:19:33 UTC (rev 161713)
@@ -1,3 +1,13 @@
+2014-01-10 David Kilzer <[email protected]>
+
+ Clean up architectures in xcconfig files
+ <http://webkit.org/b/126794>
+
+ Reviewed by Andy Estes.
+
+ * Configurations/WebKit.xcconfig: Remove armv6, armv7f, ppc.
+ - Add new arch.
+
2014-01-10 Yongjun Zhang <[email protected]>
Clear unparented tiled layers on memory pressure.
Modified: trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig (161712 => 161713)
--- trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-01-11 02:16:22 UTC (rev 161712)
+++ trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-01-11 02:19:33 UTC (rev 161713)
@@ -31,15 +31,13 @@
EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
EXPORTED_SYMBOLS_FILE_ = mac/WebKit.exp;
-EXPORTED_SYMBOLS_FILE_armv6 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
EXPORTED_SYMBOLS_FILE_armv7 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
-EXPORTED_SYMBOLS_FILE_armv7f = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
+EXPORTED_SYMBOLS_FILE_armv7k = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
EXPORTED_SYMBOLS_FILE_armv7s = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
EXPORTED_SYMBOLS_FILE_arm64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
EXPORTED_SYMBOLS_FILE_i386 = $(EXPORTED_SYMBOLS_FILE_i386_$(PLATFORM_NAME));
EXPORTED_SYMBOLS_FILE_i386_iphonesimulator = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
EXPORTED_SYMBOLS_FILE_i386_macosx = mac/WebKit.exp;
-EXPORTED_SYMBOLS_FILE_ppc = mac/WebKit.exp;
EXPORTED_SYMBOLS_FILE_x86_64 = $(EXPORTED_SYMBOLS_FILE_x86_64_$(PLATFORM_NAME));
EXPORTED_SYMBOLS_FILE_x86_64_iphonesimulator = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
EXPORTED_SYMBOLS_FILE_x86_64_macosx = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.LP64.exp;
