Diff
Modified: branches/safari-610.2.11.51-branch/Source/_javascript_Core/ChangeLog (268344 => 268345)
--- branches/safari-610.2.11.51-branch/Source/_javascript_Core/ChangeLog 2020-10-12 08:04:04 UTC (rev 268344)
+++ branches/safari-610.2.11.51-branch/Source/_javascript_Core/ChangeLog 2020-10-12 08:08:24 UTC (rev 268345)
@@ -1,3 +1,38 @@
+2020-10-12 Babak Shafiei <bshaf...@apple.com>
+
+ Cherry-pick r268327. rdar://problem/70189401
+
+ Ignore deployment suffix and identifier when computing major OS version for macOS
+ Big Sur and newer
+ https://bugs.webkit.org/show_bug.cgi?id=217584
+ rdar://70168426
+
+ Patch by Luming Yin <luming_...@apple.com> on 2020-10-11
+ Reviewed by Darin Adler.
+
+ Stop using MACOSX_DEPLOYMENT_TARGET:suffix:identifier to compute major OS versions.
+ Only use the deployment target base for macOS Big Sur and newer. Keep the manual
+ definitions for legacy versions of macOS.
+
+ * Configurations/Base.xcconfig:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268327 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-10-11 Luming Yin <luming_...@apple.com>
+
+ Ignore deployment suffix and identifier when computing major OS version for macOS
+ Big Sur and newer
+ https://bugs.webkit.org/show_bug.cgi?id=217584
+ rdar://70168426
+
+ Reviewed by Darin Adler.
+
+ Stop using MACOSX_DEPLOYMENT_TARGET:suffix:identifier to compute major OS versions.
+ Only use the deployment target base for macOS Big Sur and newer. Keep the manual
+ definitions for legacy versions of macOS.
+
+ * Configurations/Base.xcconfig:
+
2020-09-27 Alan Coon <alanc...@apple.com>
Cherry-pick r267304. rdar://problem/69594380
Modified: branches/safari-610.2.11.51-branch/Source/_javascript_Core/Configurations/Base.xcconfig (268344 => 268345)
--- branches/safari-610.2.11.51-branch/Source/_javascript_Core/Configurations/Base.xcconfig 2020-10-12 08:04:04 UTC (rev 268344)
+++ branches/safari-610.2.11.51-branch/Source/_javascript_Core/Configurations/Base.xcconfig 2020-10-12 08:08:24 UTC (rev 268345)
@@ -102,13 +102,15 @@
HEADER_SEARCH_PATHS = . "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MACOSX_DEPLOYMENT_TARGET:base)$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
-TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER = $(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_$(MACOSX_DEPLOYMENT_TARGET:base))
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER))
+TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base)0000
+TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300
+TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400
+TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500
+
WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
WK_TARGET_TVOS_VERSION_MAJOR = $(TVOS_DEPLOYMENT_TARGET:base);
WK_TARGET_WATCHOS_VERSION_MAJOR = $(WATCHOS_DEPLOYMENT_TARGET:base);
Modified: branches/safari-610.2.11.51-branch/Source/ThirdParty/ANGLE/ChangeLog (268344 => 268345)
--- branches/safari-610.2.11.51-branch/Source/ThirdParty/ANGLE/ChangeLog 2020-10-12 08:04:04 UTC (rev 268344)
+++ branches/safari-610.2.11.51-branch/Source/ThirdParty/ANGLE/ChangeLog 2020-10-12 08:08:24 UTC (rev 268345)
@@ -1,3 +1,38 @@
+2020-10-12 Babak Shafiei <bshaf...@apple.com>
+
+ Cherry-pick r268327. rdar://problem/70189401
+
+ Ignore deployment suffix and identifier when computing major OS version for macOS
+ Big Sur and newer
+ https://bugs.webkit.org/show_bug.cgi?id=217584
+ rdar://70168426
+
+ Patch by Luming Yin <luming_...@apple.com> on 2020-10-11
+ Reviewed by Darin Adler.
+
+ Stop using MACOSX_DEPLOYMENT_TARGET:suffix:identifier to compute major OS versions.
+ Only use the deployment target base for macOS Big Sur and newer. Keep the manual
+ definitions for legacy versions of macOS.
+
+ * Configurations/Base.xcconfig:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268327 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-10-11 Luming Yin <luming_...@apple.com>
+
+ Ignore deployment suffix and identifier when computing major OS version for macOS
+ Big Sur and newer
+ https://bugs.webkit.org/show_bug.cgi?id=217584
+ rdar://70168426
+
+ Reviewed by Darin Adler.
+
+ Stop using MACOSX_DEPLOYMENT_TARGET:suffix:identifier to compute major OS versions.
+ Only use the deployment target base for macOS Big Sur and newer. Keep the manual
+ definitions for legacy versions of macOS.
+
+ * Configurations/Base.xcconfig:
+
2020-10-05 Alan Coon <alanc...@apple.com>
Cherry-pick r267869. rdar://problem/69904332
Modified: branches/safari-610.2.11.51-branch/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (268344 => 268345)
--- branches/safari-610.2.11.51-branch/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2020-10-12 08:04:04 UTC (rev 268344)
+++ branches/safari-610.2.11.51-branch/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2020-10-12 08:08:24 UTC (rev 268345)
@@ -69,13 +69,15 @@
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
SUPPORTS_MACCATALYST = YES;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MACOSX_DEPLOYMENT_TARGET:base)$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
-TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER = $(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_$(MACOSX_DEPLOYMENT_TARGET:base))
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER))
+TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base)0000
+TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300
+TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400
+TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500
+
NORMAL_WEBCORE_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=macosx*] = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
Modified: branches/safari-610.2.11.51-branch/Source/ThirdParty/libwebrtc/ChangeLog (268344 => 268345)
--- branches/safari-610.2.11.51-branch/Source/ThirdParty/libwebrtc/ChangeLog 2020-10-12 08:04:04 UTC (rev 268344)
+++ branches/safari-610.2.11.51-branch/Source/ThirdParty/libwebrtc/ChangeLog 2020-10-12 08:08:24 UTC (rev 268345)
@@ -1,3 +1,38 @@
+2020-10-12 Babak Shafiei <bshaf...@apple.com>
+
+ Cherry-pick r268327. rdar://problem/70189401
+
+ Ignore deployment suffix and identifier when computing major OS version for macOS
+ Big Sur and newer
+ https://bugs.webkit.org/show_bug.cgi?id=217584
+ rdar://70168426
+
+ Patch by Luming Yin <luming_...@apple.com> on 2020-10-11
+ Reviewed by Darin Adler.
+
+ Stop using MACOSX_DEPLOYMENT_TARGET:suffix:identifier to compute major OS versions.
+ Only use the deployment target base for macOS Big Sur and newer. Keep the manual
+ definitions for legacy versions of macOS.
+
+ * Configurations/Base.xcconfig:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268327 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-10-11 Luming Yin <luming_...@apple.com>
+
+ Ignore deployment suffix and identifier when computing major OS version for macOS
+ Big Sur and newer
+ https://bugs.webkit.org/show_bug.cgi?id=217584
+ rdar://70168426
+
+ Reviewed by Darin Adler.
+
+ Stop using MACOSX_DEPLOYMENT_TARGET:suffix:identifier to compute major OS versions.
+ Only use the deployment target base for macOS Big Sur and newer. Keep the manual
+ definitions for legacy versions of macOS.
+
+ * Configurations/Base.xcconfig:
+
2020-09-01 Alan Coon <alanc...@apple.com>
Cherry-pick r266064. rdar://problem/68164535
Modified: branches/safari-610.2.11.51-branch/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig (268344 => 268345)
--- branches/safari-610.2.11.51-branch/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig 2020-10-12 08:04:04 UTC (rev 268344)
+++ branches/safari-610.2.11.51-branch/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig 2020-10-12 08:08:24 UTC (rev 268345)
@@ -69,13 +69,15 @@
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx;
VALID_ARCHS = $(ARCHS_STANDARD_64_BIT);
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MACOSX_DEPLOYMENT_TARGET:base)$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
-TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER = $(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_$(MACOSX_DEPLOYMENT_TARGET:base))
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER))
+TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base)0000
+TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300
+TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400
+TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500
+
SDKROOT = macosx.internal;
Modified: branches/safari-610.2.11.51-branch/Source/WTF/ChangeLog (268344 => 268345)
--- branches/safari-610.2.11.51-branch/Source/WTF/ChangeLog 2020-10-12 08:04:04 UTC (rev 268344)
+++ branches/safari-610.2.11.51-branch/Source/WTF/ChangeLog 2020-10-12 08:08:24 UTC (rev 268345)
@@ -1,3 +1,38 @@
+2020-10-12 Babak Shafiei <bshaf...@apple.com>
+
+ Cherry-pick r268327. rdar://problem/70189401
+
+ Ignore deployment suffix and identifier when computing major OS version for macOS
+ Big Sur and newer
+ https://bugs.webkit.org/show_bug.cgi?id=217584
+ rdar://70168426
+
+ Patch by Luming Yin <luming_...@apple.com> on 2020-10-11
+ Reviewed by Darin Adler.
+
+ Stop using MACOSX_DEPLOYMENT_TARGET:suffix:identifier to compute major OS versions.
+ Only use the deployment target base for macOS Big Sur and newer. Keep the manual
+ definitions for legacy versions of macOS.
+
+ * Configurations/Base.xcconfig:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268327 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-10-11 Luming Yin <luming_...@apple.com>
+
+ Ignore deployment suffix and identifier when computing major OS version for macOS
+ Big Sur and newer
+ https://bugs.webkit.org/show_bug.cgi?id=217584
+ rdar://70168426
+
+ Reviewed by Darin Adler.
+
+ Stop using MACOSX_DEPLOYMENT_TARGET:suffix:identifier to compute major OS versions.
+ Only use the deployment target base for macOS Big Sur and newer. Keep the manual
+ definitions for legacy versions of macOS.
+
+ * Configurations/Base.xcconfig:
+
2020-09-17 Alan Coon <alanc...@apple.com>
Cherry-pick r266802. rdar://problem/69101097
Modified: branches/safari-610.2.11.51-branch/Source/WTF/Configurations/Base.xcconfig (268344 => 268345)
--- branches/safari-610.2.11.51-branch/Source/WTF/Configurations/Base.xcconfig 2020-10-12 08:04:04 UTC (rev 268344)
+++ branches/safari-610.2.11.51-branch/Source/WTF/Configurations/Base.xcconfig 2020-10-12 08:08:24 UTC (rev 268345)
@@ -102,13 +102,15 @@
SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WTF_INSTALL_PATH_PREFIX)/usr/local/include $(inherited);
LIBRARY_SEARCH_PATHS = $(SDK_DIR)$(WTF_INSTALL_PATH_PREFIX)/usr/local/lib $(inherited);
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MACOSX_DEPLOYMENT_TARGET:base)$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
-TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER = $(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_$(MACOSX_DEPLOYMENT_TARGET:base))
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER))
+TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base)0000
+TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300
+TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400
+TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500
+
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
SUPPORTS_MACCATALYST = YES;
Modified: branches/safari-610.2.11.51-branch/Source/WebCore/ChangeLog (268344 => 268345)
--- branches/safari-610.2.11.51-branch/Source/WebCore/ChangeLog 2020-10-12 08:04:04 UTC (rev 268344)
+++ branches/safari-610.2.11.51-branch/Source/WebCore/ChangeLog 2020-10-12 08:08:24 UTC (rev 268345)
@@ -1,3 +1,38 @@
+2020-10-12 Babak Shafiei <bshaf...@apple.com>
+
+ Cherry-pick r268327. rdar://problem/70189401
+
+ Ignore deployment suffix and identifier when computing major OS version for macOS
+ Big Sur and newer
+ https://bugs.webkit.org/show_bug.cgi?id=217584
+ rdar://70168426
+
+ Patch by Luming Yin <luming_...@apple.com> on 2020-10-11
+ Reviewed by Darin Adler.
+
+ Stop using MACOSX_DEPLOYMENT_TARGET:suffix:identifier to compute major OS versions.
+ Only use the deployment target base for macOS Big Sur and newer. Keep the manual
+ definitions for legacy versions of macOS.
+
+ * Configurations/Base.xcconfig:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268327 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-10-11 Luming Yin <luming_...@apple.com>
+
+ Ignore deployment suffix and identifier when computing major OS version for macOS
+ Big Sur and newer
+ https://bugs.webkit.org/show_bug.cgi?id=217584
+ rdar://70168426
+
+ Reviewed by Darin Adler.
+
+ Stop using MACOSX_DEPLOYMENT_TARGET:suffix:identifier to compute major OS versions.
+ Only use the deployment target base for macOS Big Sur and newer. Keep the manual
+ definitions for legacy versions of macOS.
+
+ * Configurations/Base.xcconfig:
+
2020-10-09 Russell Epstein <repst...@apple.com>
Cherry-pick r268003. rdar://problem/70142496
Modified: branches/safari-610.2.11.51-branch/Source/WebCore/Configurations/Base.xcconfig (268344 => 268345)
--- branches/safari-610.2.11.51-branch/Source/WebCore/Configurations/Base.xcconfig 2020-10-12 08:04:04 UTC (rev 268344)
+++ branches/safari-610.2.11.51-branch/Source/WebCore/Configurations/Base.xcconfig 2020-10-12 08:08:24 UTC (rev 268345)
@@ -92,13 +92,15 @@
GCC_WARN_UNUSED_VARIABLE = YES;
WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wconditional-uninitialized -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wvla -Wno-unknown-warning-option -Wliteral-conversion;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MACOSX_DEPLOYMENT_TARGET:base)$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
-TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER = $(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_$(MACOSX_DEPLOYMENT_TARGET:base))
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER))
+TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base)0000
+TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300
+TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400
+TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500
+
WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
WK_TARGET_TVOS_VERSION_MAJOR = $(TVOS_DEPLOYMENT_TARGET:base);
WK_TARGET_WATCHOS_VERSION_MAJOR = $(WATCHOS_DEPLOYMENT_TARGET:base);
Modified: branches/safari-610.2.11.51-branch/Source/WebCore/PAL/ChangeLog (268344 => 268345)
--- branches/safari-610.2.11.51-branch/Source/WebCore/PAL/ChangeLog 2020-10-12 08:04:04 UTC (rev 268344)
+++ branches/safari-610.2.11.51-branch/Source/WebCore/PAL/ChangeLog 2020-10-12 08:08:24 UTC (rev 268345)
@@ -1,3 +1,38 @@
+2020-10-12 Babak Shafiei <bshaf...@apple.com>
+
+ Cherry-pick r268327. rdar://problem/70189401
+
+ Ignore deployment suffix and identifier when computing major OS version for macOS
+ Big Sur and newer
+ https://bugs.webkit.org/show_bug.cgi?id=217584
+ rdar://70168426
+
+ Patch by Luming Yin <luming_...@apple.com> on 2020-10-11
+ Reviewed by Darin Adler.
+
+ Stop using MACOSX_DEPLOYMENT_TARGET:suffix:identifier to compute major OS versions.
+ Only use the deployment target base for macOS Big Sur and newer. Keep the manual
+ definitions for legacy versions of macOS.
+
+ * Configurations/Base.xcconfig:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268327 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-10-11 Luming Yin <luming_...@apple.com>
+
+ Ignore deployment suffix and identifier when computing major OS version for macOS
+ Big Sur and newer
+ https://bugs.webkit.org/show_bug.cgi?id=217584
+ rdar://70168426
+
+ Reviewed by Darin Adler.
+
+ Stop using MACOSX_DEPLOYMENT_TARGET:suffix:identifier to compute major OS versions.
+ Only use the deployment target base for macOS Big Sur and newer. Keep the manual
+ definitions for legacy versions of macOS.
+
+ * Configurations/Base.xcconfig:
+
2020-10-05 Alan Coon <alanc...@apple.com>
Cherry-pick r267602. rdar://problem/69904386
Modified: branches/safari-610.2.11.51-branch/Source/WebCore/PAL/Configurations/Base.xcconfig (268344 => 268345)
--- branches/safari-610.2.11.51-branch/Source/WebCore/PAL/Configurations/Base.xcconfig 2020-10-12 08:04:04 UTC (rev 268344)
+++ branches/safari-610.2.11.51-branch/Source/WebCore/PAL/Configurations/Base.xcconfig 2020-10-12 08:08:24 UTC (rev 268345)
@@ -90,13 +90,15 @@
GCC_WARN_UNUSED_VARIABLE = YES;
WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wconditional-uninitialized -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wvla -Wno-unknown-warning-option -Wliteral-conversion;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MACOSX_DEPLOYMENT_TARGET:base)$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
-TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER = $(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_$(MACOSX_DEPLOYMENT_TARGET:base))
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER))
+TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base)0000
+TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300
+TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400
+TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500
+
WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // iOS 9.3 => 9
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
Modified: branches/safari-610.2.11.51-branch/Source/WebInspectorUI/ChangeLog (268344 => 268345)
--- branches/safari-610.2.11.51-branch/Source/WebInspectorUI/ChangeLog 2020-10-12 08:04:04 UTC (rev 268344)
+++ branches/safari-610.2.11.51-branch/Source/WebInspectorUI/ChangeLog 2020-10-12 08:08:24 UTC (rev 268345)
@@ -1,3 +1,38 @@
+2020-10-12 Babak Shafiei <bshaf...@apple.com>
+
+ Cherry-pick r268327. rdar://problem/70189401
+
+ Ignore deployment suffix and identifier when computing major OS version for macOS
+ Big Sur and newer
+ https://bugs.webkit.org/show_bug.cgi?id=217584
+ rdar://70168426
+
+ Patch by Luming Yin <luming_...@apple.com> on 2020-10-11
+ Reviewed by Darin Adler.
+
+ Stop using MACOSX_DEPLOYMENT_TARGET:suffix:identifier to compute major OS versions.
+ Only use the deployment target base for macOS Big Sur and newer. Keep the manual
+ definitions for legacy versions of macOS.
+
+ * Configurations/Base.xcconfig:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268327 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-10-11 Luming Yin <luming_...@apple.com>
+
+ Ignore deployment suffix and identifier when computing major OS version for macOS
+ Big Sur and newer
+ https://bugs.webkit.org/show_bug.cgi?id=217584
+ rdar://70168426
+
+ Reviewed by Darin Adler.
+
+ Stop using MACOSX_DEPLOYMENT_TARGET:suffix:identifier to compute major OS versions.
+ Only use the deployment target base for macOS Big Sur and newer. Keep the manual
+ definitions for legacy versions of macOS.
+
+ * Configurations/Base.xcconfig:
+
2020-09-17 Alan Coon <alanc...@apple.com>
Cherry-pick r267031. rdar://problem/69101165
Modified: branches/safari-610.2.11.51-branch/Source/WebInspectorUI/Configurations/Base.xcconfig (268344 => 268345)
--- branches/safari-610.2.11.51-branch/Source/WebInspectorUI/Configurations/Base.xcconfig 2020-10-12 08:04:04 UTC (rev 268344)
+++ branches/safari-610.2.11.51-branch/Source/WebInspectorUI/Configurations/Base.xcconfig 2020-10-12 08:08:24 UTC (rev 268345)
@@ -72,13 +72,15 @@
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
SUPPORTS_MACCATALYST = YES;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MACOSX_DEPLOYMENT_TARGET:base)$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
-TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER = $(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_$(MACOSX_DEPLOYMENT_TARGET:base))
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER))
+TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base)0000
+TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300
+TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400
+TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500
+
SDKROOT = macosx.internal;
COMBINE_INSPECTOR_RESOURCES = YES;
Modified: branches/safari-610.2.11.51-branch/Source/WebKit/ChangeLog (268344 => 268345)
--- branches/safari-610.2.11.51-branch/Source/WebKit/ChangeLog 2020-10-12 08:04:04 UTC (rev 268344)
+++ branches/safari-610.2.11.51-branch/Source/WebKit/ChangeLog 2020-10-12 08:08:24 UTC (rev 268345)
@@ -1,3 +1,38 @@
+2020-10-12 Babak Shafiei <bshaf...@apple.com>
+
+ Cherry-pick r268327. rdar://problem/70189401
+
+ Ignore deployment suffix and identifier when computing major OS version for macOS
+ Big Sur and newer
+ https://bugs.webkit.org/show_bug.cgi?id=217584
+ rdar://70168426
+
+ Patch by Luming Yin <luming_...@apple.com> on 2020-10-11
+ Reviewed by Darin Adler.
+
+ Stop using MACOSX_DEPLOYMENT_TARGET:suffix:identifier to compute major OS versions.
+ Only use the deployment target base for macOS Big Sur and newer. Keep the manual
+ definitions for legacy versions of macOS.
+
+ * Configurations/Base.xcconfig:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268327 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-10-11 Luming Yin <luming_...@apple.com>
+
+ Ignore deployment suffix and identifier when computing major OS version for macOS
+ Big Sur and newer
+ https://bugs.webkit.org/show_bug.cgi?id=217584
+ rdar://70168426
+
+ Reviewed by Darin Adler.
+
+ Stop using MACOSX_DEPLOYMENT_TARGET:suffix:identifier to compute major OS versions.
+ Only use the deployment target base for macOS Big Sur and newer. Keep the manual
+ definitions for legacy versions of macOS.
+
+ * Configurations/Base.xcconfig:
+
2020-10-09 Russell Epstein <repst...@apple.com>
Cherry-pick r268003. rdar://problem/70142496
Modified: branches/safari-610.2.11.51-branch/Source/WebKit/Configurations/Base.xcconfig (268344 => 268345)
--- branches/safari-610.2.11.51-branch/Source/WebKit/Configurations/Base.xcconfig 2020-10-12 08:04:04 UTC (rev 268344)
+++ branches/safari-610.2.11.51-branch/Source/WebKit/Configurations/Base.xcconfig 2020-10-12 08:08:24 UTC (rev 268345)
@@ -88,13 +88,15 @@
PREBINDING = NO;
WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wconditional-uninitialized -Wextra-tokens -Wformat-security -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wvla -Wliteral-conversion;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MACOSX_DEPLOYMENT_TARGET:base)$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
-TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER = $(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_$(MACOSX_DEPLOYMENT_TARGET:base))
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER))
+TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base)0000
+TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300
+TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400
+TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500
+
WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
WK_TARGET_TVOS_VERSION_MAJOR = $(TVOS_DEPLOYMENT_TARGET:base);
WK_TARGET_WATCHOS_VERSION_MAJOR = $(WATCHOS_DEPLOYMENT_TARGET:base);
Modified: branches/safari-610.2.11.51-branch/Source/WebKitLegacy/mac/ChangeLog (268344 => 268345)
--- branches/safari-610.2.11.51-branch/Source/WebKitLegacy/mac/ChangeLog 2020-10-12 08:04:04 UTC (rev 268344)
+++ branches/safari-610.2.11.51-branch/Source/WebKitLegacy/mac/ChangeLog 2020-10-12 08:08:24 UTC (rev 268345)
@@ -1,3 +1,38 @@
+2020-10-12 Babak Shafiei <bshaf...@apple.com>
+
+ Cherry-pick r268327. rdar://problem/70189401
+
+ Ignore deployment suffix and identifier when computing major OS version for macOS
+ Big Sur and newer
+ https://bugs.webkit.org/show_bug.cgi?id=217584
+ rdar://70168426
+
+ Patch by Luming Yin <luming_...@apple.com> on 2020-10-11
+ Reviewed by Darin Adler.
+
+ Stop using MACOSX_DEPLOYMENT_TARGET:suffix:identifier to compute major OS versions.
+ Only use the deployment target base for macOS Big Sur and newer. Keep the manual
+ definitions for legacy versions of macOS.
+
+ * Configurations/Base.xcconfig:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268327 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-10-11 Luming Yin <luming_...@apple.com>
+
+ Ignore deployment suffix and identifier when computing major OS version for macOS
+ Big Sur and newer
+ https://bugs.webkit.org/show_bug.cgi?id=217584
+ rdar://70168426
+
+ Reviewed by Darin Adler.
+
+ Stop using MACOSX_DEPLOYMENT_TARGET:suffix:identifier to compute major OS versions.
+ Only use the deployment target base for macOS Big Sur and newer. Keep the manual
+ definitions for legacy versions of macOS.
+
+ * Configurations/Base.xcconfig:
+
2020-10-02 Alan Coon <alanc...@apple.com>
Cherry-pick r266028. rdar://problem/69904377
Modified: branches/safari-610.2.11.51-branch/Source/WebKitLegacy/mac/Configurations/Base.xcconfig (268344 => 268345)
--- branches/safari-610.2.11.51-branch/Source/WebKitLegacy/mac/Configurations/Base.xcconfig 2020-10-12 08:04:04 UTC (rev 268344)
+++ branches/safari-610.2.11.51-branch/Source/WebKitLegacy/mac/Configurations/Base.xcconfig 2020-10-12 08:08:24 UTC (rev 268345)
@@ -90,13 +90,15 @@
PREBINDING = NO;
WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wconditional-uninitialized -Wextra-tokens -Wformat-security -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wvla -Wliteral-conversion;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MACOSX_DEPLOYMENT_TARGET:base)$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
-TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER = $(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_$(MACOSX_DEPLOYMENT_TARGET:base))
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER))
+TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base)0000
+TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300
+TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400
+TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500
+
WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
WK_TARGET_TVOS_VERSION_MAJOR = $(TVOS_DEPLOYMENT_TARGET:base);
WK_TARGET_WATCHOS_VERSION_MAJOR = $(WATCHOS_DEPLOYMENT_TARGET:base);
Modified: branches/safari-610.2.11.51-branch/Source/bmalloc/ChangeLog (268344 => 268345)
--- branches/safari-610.2.11.51-branch/Source/bmalloc/ChangeLog 2020-10-12 08:04:04 UTC (rev 268344)
+++ branches/safari-610.2.11.51-branch/Source/bmalloc/ChangeLog 2020-10-12 08:08:24 UTC (rev 268345)
@@ -1,3 +1,38 @@
+2020-10-12 Babak Shafiei <bshaf...@apple.com>
+
+ Cherry-pick r268327. rdar://problem/70189401
+
+ Ignore deployment suffix and identifier when computing major OS version for macOS
+ Big Sur and newer
+ https://bugs.webkit.org/show_bug.cgi?id=217584
+ rdar://70168426
+
+ Patch by Luming Yin <luming_...@apple.com> on 2020-10-11
+ Reviewed by Darin Adler.
+
+ Stop using MACOSX_DEPLOYMENT_TARGET:suffix:identifier to compute major OS versions.
+ Only use the deployment target base for macOS Big Sur and newer. Keep the manual
+ definitions for legacy versions of macOS.
+
+ * Configurations/Base.xcconfig:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268327 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-10-11 Luming Yin <luming_...@apple.com>
+
+ Ignore deployment suffix and identifier when computing major OS version for macOS
+ Big Sur and newer
+ https://bugs.webkit.org/show_bug.cgi?id=217584
+ rdar://70168426
+
+ Reviewed by Darin Adler.
+
+ Stop using MACOSX_DEPLOYMENT_TARGET:suffix:identifier to compute major OS versions.
+ Only use the deployment target base for macOS Big Sur and newer. Keep the manual
+ definitions for legacy versions of macOS.
+
+ * Configurations/Base.xcconfig:
+
2020-08-07 Saam Barati <sbar...@apple.com>
Use thread_switch instead of switch_pri to drop priority to zero for 1ms instead of 10
Modified: branches/safari-610.2.11.51-branch/Source/bmalloc/Configurations/Base.xcconfig (268344 => 268345)
--- branches/safari-610.2.11.51-branch/Source/bmalloc/Configurations/Base.xcconfig 2020-10-12 08:04:04 UTC (rev 268344)
+++ branches/safari-610.2.11.51-branch/Source/bmalloc/Configurations/Base.xcconfig 2020-10-12 08:08:24 UTC (rev 268345)
@@ -96,13 +96,15 @@
PREBINDING = NO;
WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wconditional-uninitialized -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wvla -Wliteral-conversion;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MACOSX_DEPLOYMENT_TARGET:base)$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
-TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER = $(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_$(MACOSX_DEPLOYMENT_TARGET:base))
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER))
+TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base)0000
+TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300
+TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400
+TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500
+
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
SUPPORTS_MACCATALYST = YES;
