Diff
Modified: tags/Safari-604.1.17.1/Source/_javascript_Core/ChangeLog (215431 => 215432)
--- tags/Safari-604.1.17.1/Source/_javascript_Core/ChangeLog 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Source/_javascript_Core/ChangeLog 2017-04-17 21:39:06 UTC (rev 215432)
@@ -1,3 +1,20 @@
+2017-04-17 Jason Marcell <[email protected]>
+
+ Cherry-pick r215386. rdar://problem/31628104
+
+ 2017-04-14 Mark Lam <[email protected]>
+
+ Update architectures in xcconfig files.
+ https://bugs.webkit.org/show_bug.cgi?id=170867
+ <rdar://problem/31628104>
+
+ Reviewed by Joseph Pecoraro.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/FeatureDefines.xcconfig:
+ * Configurations/_javascript_Core.xcconfig:
+ * Configurations/ToolExecutable.xcconfig:
+
2017-04-12 Yusuke Suzuki <[email protected]>
Use HAVE(MACHINE_CONTEXT) instead of USE(MACHINE_CONTEXT)
Modified: tags/Safari-604.1.17.1/Source/_javascript_Core/Configurations/Base.xcconfig (215431 => 215432)
--- tags/Safari-604.1.17.1/Source/_javascript_Core/Configurations/Base.xcconfig 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Source/_javascript_Core/Configurations/Base.xcconfig 2017-04-17 21:39:06 UTC (rev 215432)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009, 2010, 2011, 2013, 2014 Apple Inc. All rights reserved.
+// Copyright (C) 2009-2017 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -67,6 +67,7 @@
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_arm64e = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION_i386 = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION_x86_64 = NO;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
Modified: tags/Safari-604.1.17.1/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (215431 => 215432)
--- tags/Safari-604.1.17.1/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2017-04-17 21:39:06 UTC (rev 215432)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009, 2010, 2014, 2015, 2016, 2017 Apple Inc. All rights reserved.
+// Copyright (C) 2009-2017 Apple Inc. All rights reserved.
// Copyright (C) 2009 Google Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
@@ -184,7 +184,7 @@
ENABLE_WEB_RTC[sdk=watch*] = ;
ENABLE_WEB_RTC[sdk=appletv*] = ;
ENABLE_WEB_RTC[sdk=iphone*] = $(ENABLE_WEB_RTC_ios);
-ENABLE_WEB_RTC_ios[arch=arm64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
+ENABLE_WEB_RTC_ios[arch=arm64*] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
ENABLE_WEB_RTC_ios[arch=x86_64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
ENABLE_WEB_RTC_ios_10_Production = ;
ENABLE_WEB_RTC_ios_10_Debug = ENABLE_WEB_RTC;
@@ -242,7 +242,7 @@
ENABLE_FAST_JIT_PERMISSIONS[sdk=iphone*] = $(ENABLE_FAST_JIT_PERMISSIONS_ios);
ENABLE_FAST_JIT_PERMISSIONS[sdk=iphoneos10*] = ;
ENABLE_FAST_JIT_PERMISSIONS[sdk=iphonesimulator10*] = ;
-ENABLE_FAST_JIT_PERMISSIONS_ios[arch=arm64] = $(ENABLE_FAST_JIT_PERMISSIONS_ios_$(USE_INTERNAL_SDK))
+ENABLE_FAST_JIT_PERMISSIONS_ios[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSIONS_ios_$(USE_INTERNAL_SDK))
ENABLE_FAST_JIT_PERMISSIONS_ios_YES = ENABLE_FAST_JIT_PERMISSIONS;
ENABLE_VARIATION_FONTS[sdk=iphone*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
Modified: tags/Safari-604.1.17.1/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig (215431 => 215432)
--- tags/Safari-604.1.17.1/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig 2017-04-17 21:39:06 UTC (rev 215432)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009, 2014 Apple Inc. All rights reserved.
+// Copyright (C) 2009-2017 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -30,6 +30,7 @@
JSVALUE_MODEL_armv7k = 32_64;
JSVALUE_MODEL_armv7s = 32_64;
JSVALUE_MODEL_arm64 = 64;
+JSVALUE_MODEL_arm64e = 64;
JSVALUE_MODEL_i386 = 32_64;
JSVALUE_MODEL_x86_64 = 64;
Modified: tags/Safari-604.1.17.1/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig (215431 => 215432)
--- tags/Safari-604.1.17.1/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig 2017-04-17 21:39:06 UTC (rev 215432)
@@ -1,4 +1,4 @@
-// Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
+// Copyright (C) 2011-2017 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -48,6 +48,7 @@
CLANG_ENABLE_OBJC_ARC_armv7k = YES;
CLANG_ENABLE_OBJC_ARC_armv7s = YES;
CLANG_ENABLE_OBJC_ARC_arm64 = YES;
+CLANG_ENABLE_OBJC_ARC_arm64e = YES;
OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS) -isystem icu;
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: tags/Safari-604.1.17.1/Source/ThirdParty/libwebrtc/ChangeLog (215431 => 215432)
--- tags/Safari-604.1.17.1/Source/ThirdParty/libwebrtc/ChangeLog 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Source/ThirdParty/libwebrtc/ChangeLog 2017-04-17 21:39:06 UTC (rev 215432)
@@ -1,3 +1,17 @@
+2017-04-17 Jason Marcell <[email protected]>
+
+ Cherry-pick r215386. rdar://problem/31628104
+
+ 2017-04-14 Mark Lam <[email protected]>
+
+ Update architectures in xcconfig files.
+ https://bugs.webkit.org/show_bug.cgi?id=170867
+ <rdar://problem/31628104>
+
+ Reviewed by Joseph Pecoraro.
+
+ * Configurations/opus.xcconfig:
+
2017-04-07 Alex Christensen <[email protected]>
Enable SSE4 and NEON optimizations of libopus where available
Modified: tags/Safari-604.1.17.1/Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig (215431 => 215432)
--- tags/Safari-604.1.17.1/Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig 2017-04-17 21:39:06 UTC (rev 215432)
@@ -12,7 +12,7 @@
USE_HEADERMAP = NO;
WARNING_CFLAGS = -Wno-incompatible-pointer-types
GCC_PREPROCESSOR_DEFINITIONS = VAR_ARRAYS OPUS_BUILD OPUS_EXPORT= HAVE_LRINT HAVE_LRINTF OPUS_X86_MAY_HAVE_SSE2;
-GCC_PREPROCESSOR_DEFINITIONS[arch=arm64] = $(inherited) OPUS_ARM_PRESUME_AARCH64_NEON_INTR;
+GCC_PREPROCESSOR_DEFINITIONS[arch=arm64*] = $(inherited) OPUS_ARM_PRESUME_AARCH64_NEON_INTR;
GCC_PREPROCESSOR_DEFINITIONS[arch=x86_64] = $(inherited) $(SSE4_FLAG);
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *_sse.c *_sse2.c;
Modified: tags/Safari-604.1.17.1/Source/WTF/ChangeLog (215431 => 215432)
--- tags/Safari-604.1.17.1/Source/WTF/ChangeLog 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Source/WTF/ChangeLog 2017-04-17 21:39:06 UTC (rev 215432)
@@ -1,3 +1,17 @@
+2017-04-17 Jason Marcell <[email protected]>
+
+ Cherry-pick r215386. rdar://problem/31628104
+
+ 2017-04-14 Mark Lam <[email protected]>
+
+ Update architectures in xcconfig files.
+ https://bugs.webkit.org/show_bug.cgi?id=170867
+ <rdar://problem/31628104>
+
+ Reviewed by Joseph Pecoraro.
+
+ * Configurations/Base.xcconfig:
+
2017-04-12 Yusuke Suzuki <[email protected]>
Use HAVE(MACHINE_CONTEXT) instead of USE(MACHINE_CONTEXT)
Modified: tags/Safari-604.1.17.1/Source/WTF/Configurations/Base.xcconfig (215431 => 215432)
--- tags/Safari-604.1.17.1/Source/WTF/Configurations/Base.xcconfig 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Source/WTF/Configurations/Base.xcconfig 2017-04-17 21:39:06 UTC (rev 215432)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009, 2010, 2011, 2013 Apple Inc. All rights reserved.
+// Copyright (C) 2009-2017 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -68,6 +68,7 @@
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_arm64e = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION_i386 = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION_x86_64 = NO;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
Modified: tags/Safari-604.1.17.1/Source/WebCore/ChangeLog (215431 => 215432)
--- tags/Safari-604.1.17.1/Source/WebCore/ChangeLog 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Source/WebCore/ChangeLog 2017-04-17 21:39:06 UTC (rev 215432)
@@ -1,3 +1,20 @@
+2017-04-17 Jason Marcell <[email protected]>
+
+ Cherry-pick r215386. rdar://problem/31628104
+
+ 2017-04-14 Mark Lam <[email protected]>
+
+ Update architectures in xcconfig files.
+ https://bugs.webkit.org/show_bug.cgi?id=170867
+ <rdar://problem/31628104>
+
+ Reviewed by Joseph Pecoraro.
+
+ No new tests needed. Only updating xcconfig files.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/FeatureDefines.xcconfig:
+
2017-04-12 Alex Christensen <[email protected]>
Fix WinCairo build after r215265
Modified: tags/Safari-604.1.17.1/Source/WebCore/Configurations/Base.xcconfig (215431 => 215432)
--- tags/Safari-604.1.17.1/Source/WebCore/Configurations/Base.xcconfig 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Source/WebCore/Configurations/Base.xcconfig 2017-04-17 21:39:06 UTC (rev 215432)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009, 2010, 2013, 2014 Apple Inc. All rights reserved.
+// Copyright (C) 2009-2017 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -62,7 +62,7 @@
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
// FIXME: <http://webkit.org/b/109846> WebCore should build with -Wshorten-64-to-32
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-GCC_WARN_64_TO_32_BIT_CONVERSION[arch=arm64] = NO;
+GCC_WARN_64_TO_32_BIT_CONVERSION[arch=arm64*] = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION[arch=x86_64] = NO;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
Modified: tags/Safari-604.1.17.1/Source/WebCore/Configurations/FeatureDefines.xcconfig (215431 => 215432)
--- tags/Safari-604.1.17.1/Source/WebCore/Configurations/FeatureDefines.xcconfig 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Source/WebCore/Configurations/FeatureDefines.xcconfig 2017-04-17 21:39:06 UTC (rev 215432)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009, 2010, 2014, 2015, 2016, 2017 Apple Inc. All rights reserved.
+// Copyright (C) 2009-2017 Apple Inc. All rights reserved.
// Copyright (C) 2009 Google Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
@@ -184,7 +184,7 @@
ENABLE_WEB_RTC[sdk=watch*] = ;
ENABLE_WEB_RTC[sdk=appletv*] = ;
ENABLE_WEB_RTC[sdk=iphone*] = $(ENABLE_WEB_RTC_ios);
-ENABLE_WEB_RTC_ios[arch=arm64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
+ENABLE_WEB_RTC_ios[arch=arm64*] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
ENABLE_WEB_RTC_ios[arch=x86_64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
ENABLE_WEB_RTC_ios_10_Production = ;
ENABLE_WEB_RTC_ios_10_Debug = ENABLE_WEB_RTC;
@@ -242,7 +242,7 @@
ENABLE_FAST_JIT_PERMISSIONS[sdk=iphone*] = $(ENABLE_FAST_JIT_PERMISSIONS_ios);
ENABLE_FAST_JIT_PERMISSIONS[sdk=iphoneos10*] = ;
ENABLE_FAST_JIT_PERMISSIONS[sdk=iphonesimulator10*] = ;
-ENABLE_FAST_JIT_PERMISSIONS_ios[arch=arm64] = $(ENABLE_FAST_JIT_PERMISSIONS_ios_$(USE_INTERNAL_SDK))
+ENABLE_FAST_JIT_PERMISSIONS_ios[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSIONS_ios_$(USE_INTERNAL_SDK))
ENABLE_FAST_JIT_PERMISSIONS_ios_YES = ENABLE_FAST_JIT_PERMISSIONS;
ENABLE_VARIATION_FONTS[sdk=iphone*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
Modified: tags/Safari-604.1.17.1/Source/WebCore/PAL/ChangeLog (215431 => 215432)
--- tags/Safari-604.1.17.1/Source/WebCore/PAL/ChangeLog 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Source/WebCore/PAL/ChangeLog 2017-04-17 21:39:06 UTC (rev 215432)
@@ -1,3 +1,20 @@
+2017-04-17 Jason Marcell <[email protected]>
+
+ Cherry-pick r215386. rdar://problem/31628104
+
+ 2017-04-14 Mark Lam <[email protected]>
+
+ Update architectures in xcconfig files.
+ https://bugs.webkit.org/show_bug.cgi?id=170867
+ <rdar://problem/31628104>
+
+ Reviewed by Joseph Pecoraro.
+
+ No new tests needed. Only updating xcconfig files.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/FeatureDefines.xcconfig:
+
2017-04-11 Dean Jackson <[email protected]>
Disable outdated WritableStream API
Modified: tags/Safari-604.1.17.1/Source/WebCore/PAL/Configurations/Base.xcconfig (215431 => 215432)
--- tags/Safari-604.1.17.1/Source/WebCore/PAL/Configurations/Base.xcconfig 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Source/WebCore/PAL/Configurations/Base.xcconfig 2017-04-17 21:39:06 UTC (rev 215432)
@@ -62,7 +62,7 @@
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
// FIXME: <http://webkit.org/b/109846> WebCore should build with -Wshorten-64-to-32
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-GCC_WARN_64_TO_32_BIT_CONVERSION[arch=arm64] = NO;
+GCC_WARN_64_TO_32_BIT_CONVERSION[arch=arm64*] = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION[arch=x86_64] = NO;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
Modified: tags/Safari-604.1.17.1/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (215431 => 215432)
--- tags/Safari-604.1.17.1/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2017-04-17 21:39:06 UTC (rev 215432)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009, 2010, 2014, 2015, 2016, 2017 Apple Inc. All rights reserved.
+// Copyright (C) 2009-2017 Apple Inc. All rights reserved.
// Copyright (C) 2009 Google Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
@@ -184,7 +184,7 @@
ENABLE_WEB_RTC[sdk=watch*] = ;
ENABLE_WEB_RTC[sdk=appletv*] = ;
ENABLE_WEB_RTC[sdk=iphone*] = $(ENABLE_WEB_RTC_ios);
-ENABLE_WEB_RTC_ios[arch=arm64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
+ENABLE_WEB_RTC_ios[arch=arm64*] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
ENABLE_WEB_RTC_ios[arch=x86_64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
ENABLE_WEB_RTC_ios_10_Production = ;
ENABLE_WEB_RTC_ios_10_Debug = ENABLE_WEB_RTC;
@@ -242,7 +242,7 @@
ENABLE_FAST_JIT_PERMISSIONS[sdk=iphone*] = $(ENABLE_FAST_JIT_PERMISSIONS_ios);
ENABLE_FAST_JIT_PERMISSIONS[sdk=iphoneos10*] = ;
ENABLE_FAST_JIT_PERMISSIONS[sdk=iphonesimulator10*] = ;
-ENABLE_FAST_JIT_PERMISSIONS_ios[arch=arm64] = $(ENABLE_FAST_JIT_PERMISSIONS_ios_$(USE_INTERNAL_SDK))
+ENABLE_FAST_JIT_PERMISSIONS_ios[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSIONS_ios_$(USE_INTERNAL_SDK))
ENABLE_FAST_JIT_PERMISSIONS_ios_YES = ENABLE_FAST_JIT_PERMISSIONS;
ENABLE_VARIATION_FONTS[sdk=iphone*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
Modified: tags/Safari-604.1.17.1/Source/WebKit/mac/ChangeLog (215431 => 215432)
--- tags/Safari-604.1.17.1/Source/WebKit/mac/ChangeLog 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Source/WebKit/mac/ChangeLog 2017-04-17 21:39:06 UTC (rev 215432)
@@ -1,3 +1,17 @@
+2017-04-17 Jason Marcell <[email protected]>
+
+ Cherry-pick r215386. rdar://problem/31628104
+
+ 2017-04-14 Mark Lam <[email protected]>
+
+ Update architectures in xcconfig files.
+ https://bugs.webkit.org/show_bug.cgi?id=170867
+ <rdar://problem/31628104>
+
+ Reviewed by Joseph Pecoraro.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2017-04-11 Dean Jackson <[email protected]>
Disable outdated WritableStream API
Modified: tags/Safari-604.1.17.1/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (215431 => 215432)
--- tags/Safari-604.1.17.1/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2017-04-17 21:39:06 UTC (rev 215432)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009, 2010, 2014, 2015, 2016, 2017 Apple Inc. All rights reserved.
+// Copyright (C) 2009-2017 Apple Inc. All rights reserved.
// Copyright (C) 2009 Google Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
@@ -184,7 +184,7 @@
ENABLE_WEB_RTC[sdk=watch*] = ;
ENABLE_WEB_RTC[sdk=appletv*] = ;
ENABLE_WEB_RTC[sdk=iphone*] = $(ENABLE_WEB_RTC_ios);
-ENABLE_WEB_RTC_ios[arch=arm64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
+ENABLE_WEB_RTC_ios[arch=arm64*] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
ENABLE_WEB_RTC_ios[arch=x86_64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
ENABLE_WEB_RTC_ios_10_Production = ;
ENABLE_WEB_RTC_ios_10_Debug = ENABLE_WEB_RTC;
@@ -242,7 +242,7 @@
ENABLE_FAST_JIT_PERMISSIONS[sdk=iphone*] = $(ENABLE_FAST_JIT_PERMISSIONS_ios);
ENABLE_FAST_JIT_PERMISSIONS[sdk=iphoneos10*] = ;
ENABLE_FAST_JIT_PERMISSIONS[sdk=iphonesimulator10*] = ;
-ENABLE_FAST_JIT_PERMISSIONS_ios[arch=arm64] = $(ENABLE_FAST_JIT_PERMISSIONS_ios_$(USE_INTERNAL_SDK))
+ENABLE_FAST_JIT_PERMISSIONS_ios[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSIONS_ios_$(USE_INTERNAL_SDK))
ENABLE_FAST_JIT_PERMISSIONS_ios_YES = ENABLE_FAST_JIT_PERMISSIONS;
ENABLE_VARIATION_FONTS[sdk=iphone*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
Modified: tags/Safari-604.1.17.1/Source/WebKit2/ChangeLog (215431 => 215432)
--- tags/Safari-604.1.17.1/Source/WebKit2/ChangeLog 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Source/WebKit2/ChangeLog 2017-04-17 21:39:06 UTC (rev 215432)
@@ -1,3 +1,17 @@
+2017-04-17 Jason Marcell <[email protected]>
+
+ Cherry-pick r215386. rdar://problem/31628104
+
+ 2017-04-14 Mark Lam <[email protected]>
+
+ Update architectures in xcconfig files.
+ https://bugs.webkit.org/show_bug.cgi?id=170867
+ <rdar://problem/31628104>
+
+ Reviewed by Joseph Pecoraro.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2017-04-12 Andrew Gold <[email protected]>
Allow iOS to toggle webRTCAPI legacy flag.
Modified: tags/Safari-604.1.17.1/Source/WebKit2/Configurations/FeatureDefines.xcconfig (215431 => 215432)
--- tags/Safari-604.1.17.1/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2017-04-17 21:39:06 UTC (rev 215432)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009, 2010, 2014, 2015, 2016, 2017 Apple Inc. All rights reserved.
+// Copyright (C) 2009-2017 Apple Inc. All rights reserved.
// Copyright (C) 2009 Google Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
@@ -184,7 +184,7 @@
ENABLE_WEB_RTC[sdk=watch*] = ;
ENABLE_WEB_RTC[sdk=appletv*] = ;
ENABLE_WEB_RTC[sdk=iphone*] = $(ENABLE_WEB_RTC_ios);
-ENABLE_WEB_RTC_ios[arch=arm64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
+ENABLE_WEB_RTC_ios[arch=arm64*] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
ENABLE_WEB_RTC_ios[arch=x86_64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
ENABLE_WEB_RTC_ios_10_Production = ;
ENABLE_WEB_RTC_ios_10_Debug = ENABLE_WEB_RTC;
@@ -242,7 +242,7 @@
ENABLE_FAST_JIT_PERMISSIONS[sdk=iphone*] = $(ENABLE_FAST_JIT_PERMISSIONS_ios);
ENABLE_FAST_JIT_PERMISSIONS[sdk=iphoneos10*] = ;
ENABLE_FAST_JIT_PERMISSIONS[sdk=iphonesimulator10*] = ;
-ENABLE_FAST_JIT_PERMISSIONS_ios[arch=arm64] = $(ENABLE_FAST_JIT_PERMISSIONS_ios_$(USE_INTERNAL_SDK))
+ENABLE_FAST_JIT_PERMISSIONS_ios[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSIONS_ios_$(USE_INTERNAL_SDK))
ENABLE_FAST_JIT_PERMISSIONS_ios_YES = ENABLE_FAST_JIT_PERMISSIONS;
ENABLE_VARIATION_FONTS[sdk=iphone*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
Modified: tags/Safari-604.1.17.1/Source/bmalloc/ChangeLog (215431 => 215432)
--- tags/Safari-604.1.17.1/Source/bmalloc/ChangeLog 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Source/bmalloc/ChangeLog 2017-04-17 21:39:06 UTC (rev 215432)
@@ -1,3 +1,17 @@
+2017-04-17 Jason Marcell <[email protected]>
+
+ Cherry-pick r215386. rdar://problem/31628104
+
+ 2017-04-14 Mark Lam <[email protected]>
+
+ Update architectures in xcconfig files.
+ https://bugs.webkit.org/show_bug.cgi?id=170867
+ <rdar://problem/31628104>
+
+ Reviewed by Joseph Pecoraro.
+
+ * Configurations/Base.xcconfig:
+
2017-02-03 Ting-Wei Lan <[email protected]>
Include cstdlib before using ::malloc and posix_memalign
Modified: tags/Safari-604.1.17.1/Source/bmalloc/Configurations/Base.xcconfig (215431 => 215432)
--- tags/Safari-604.1.17.1/Source/bmalloc/Configurations/Base.xcconfig 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Source/bmalloc/Configurations/Base.xcconfig 2017-04-17 21:39:06 UTC (rev 215432)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009, 2010, 2011, 2013 Apple Inc. All rights reserved.
+// Copyright (C) 2009-2017 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -67,6 +67,7 @@
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_arm64e = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION_i386 = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION_x86_64 = NO;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
Modified: tags/Safari-604.1.17.1/Tools/ChangeLog (215431 => 215432)
--- tags/Safari-604.1.17.1/Tools/ChangeLog 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Tools/ChangeLog 2017-04-17 21:39:06 UTC (rev 215432)
@@ -1,3 +1,21 @@
+2017-04-17 Jason Marcell <[email protected]>
+
+ Cherry-pick r215386. rdar://problem/31628104
+
+ 2017-04-14 Mark Lam <[email protected]>
+
+ Update architectures in xcconfig files.
+ https://bugs.webkit.org/show_bug.cgi?id=170867
+ <rdar://problem/31628104>
+
+ Reviewed by Joseph Pecoraro.
+
+ * DumpRenderTree/mac/Configurations/Base.xcconfig:
+ * MobileMiniBrowser/Configurations/Base.xcconfig:
+ * TestWebKitAPI/Configurations/Base.xcconfig:
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+ * WebKitTestRunner/Configurations/Base.xcconfig:
+
2017-04-12 Yusuke Suzuki <[email protected]>
[WTF] Introduce Thread class and use RefPtr<Thread> and align Windows Threading implementation semantics to Pthread one
Modified: tags/Safari-604.1.17.1/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (215431 => 215432)
--- tags/Safari-604.1.17.1/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2017-04-17 21:39:06 UTC (rev 215432)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009, 2013 Apple Inc. All rights reserved.
+// Copyright (C) 2009-2017 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -73,7 +73,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
// FIXME: <http://webkit.org/b/118590> DumpRenderTree should build with -Wshorten-64-to-32
-GCC_WARN_64_TO_32_BIT_CONVERSION[arch=arm64] = NO;
+GCC_WARN_64_TO_32_BIT_CONVERSION[arch=arm64*] = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION[arch=x86_64] = NO;
WARNING_CFLAGS = -Wall -W -Wno-unused-parameter -Wundef
Modified: tags/Safari-604.1.17.1/Tools/MobileMiniBrowser/Configurations/Base.xcconfig (215431 => 215432)
--- tags/Safari-604.1.17.1/Tools/MobileMiniBrowser/Configurations/Base.xcconfig 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Tools/MobileMiniBrowser/Configurations/Base.xcconfig 2017-04-17 21:39:06 UTC (rev 215432)
@@ -1,4 +1,4 @@
-// Copyright (C) 2016 Apple Inc. All rights reserved.
+// Copyright (C) 2016-2017 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -43,7 +43,7 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO
GCC_WARN_UNUSED_FUNCTION = YES
GCC_WARN_UNUSED_VARIABLE = YES
-GCC_WARN_64_TO_32_BIT_CONVERSION[arch=arm64] = NO;
+GCC_WARN_64_TO_32_BIT_CONVERSION[arch=arm64*] = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION[arch=x86_64] = NO;
WARNING_CFLAGS = -Wall -W -Wno-unused-parameter -Wundef
Modified: tags/Safari-604.1.17.1/Tools/TestWebKitAPI/Configurations/Base.xcconfig (215431 => 215432)
--- tags/Safari-604.1.17.1/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2017-04-17 21:39:06 UTC (rev 215432)
@@ -1,4 +1,4 @@
-// Copyright (C) 2010, 2013 Apple Inc. All rights reserved.
+// Copyright (C) 2010-2017 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -60,7 +60,7 @@
GCC_WARN_UNUSED_VARIABLE = YES
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
-GCC_WARN_64_TO_32_BIT_CONVERSION[arch=arm64] = NO;
+GCC_WARN_64_TO_32_BIT_CONVERSION[arch=arm64*] = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION[arch=x86_64] = NO;
WARNING_CFLAGS = -Wall -W -Wno-unused-parameter
Modified: tags/Safari-604.1.17.1/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (215431 => 215432)
--- tags/Safari-604.1.17.1/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2017-04-17 21:39:06 UTC (rev 215432)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009, 2010, 2014, 2015, 2016, 2017 Apple Inc. All rights reserved.
+// Copyright (C) 2009-2017 Apple Inc. All rights reserved.
// Copyright (C) 2009 Google Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
@@ -184,7 +184,7 @@
ENABLE_WEB_RTC[sdk=watch*] = ;
ENABLE_WEB_RTC[sdk=appletv*] = ;
ENABLE_WEB_RTC[sdk=iphone*] = $(ENABLE_WEB_RTC_ios);
-ENABLE_WEB_RTC_ios[arch=arm64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
+ENABLE_WEB_RTC_ios[arch=arm64*] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
ENABLE_WEB_RTC_ios[arch=x86_64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base)_$(CONFIGURATION))
ENABLE_WEB_RTC_ios_10_Production = ;
ENABLE_WEB_RTC_ios_10_Debug = ENABLE_WEB_RTC;
@@ -242,7 +242,7 @@
ENABLE_FAST_JIT_PERMISSIONS[sdk=iphone*] = $(ENABLE_FAST_JIT_PERMISSIONS_ios);
ENABLE_FAST_JIT_PERMISSIONS[sdk=iphoneos10*] = ;
ENABLE_FAST_JIT_PERMISSIONS[sdk=iphonesimulator10*] = ;
-ENABLE_FAST_JIT_PERMISSIONS_ios[arch=arm64] = $(ENABLE_FAST_JIT_PERMISSIONS_ios_$(USE_INTERNAL_SDK))
+ENABLE_FAST_JIT_PERMISSIONS_ios[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSIONS_ios_$(USE_INTERNAL_SDK))
ENABLE_FAST_JIT_PERMISSIONS_ios_YES = ENABLE_FAST_JIT_PERMISSIONS;
ENABLE_VARIATION_FONTS[sdk=iphone*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
Modified: tags/Safari-604.1.17.1/Tools/WebKitTestRunner/Configurations/Base.xcconfig (215431 => 215432)
--- tags/Safari-604.1.17.1/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2017-04-17 21:34:20 UTC (rev 215431)
+++ tags/Safari-604.1.17.1/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2017-04-17 21:39:06 UTC (rev 215432)
@@ -1,4 +1,4 @@
-// Copyright (C) 2010, 2013 Apple Inc. All rights reserved.
+// Copyright (C) 2010-2017 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -46,7 +46,7 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO
GCC_WARN_UNUSED_FUNCTION = YES
GCC_WARN_UNUSED_VARIABLE = YES
-GCC_WARN_64_TO_32_BIT_CONVERSION[arch=arm64] = NO;
+GCC_WARN_64_TO_32_BIT_CONVERSION[arch=arm64*] = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION[arch=x86_64] = NO;
WARNING_CFLAGS = -Wall -W -Wno-unused-parameter -Wundef
GCC_PREFIX_HEADER = WebKitTestRunnerPrefix.h
