Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (179268 => 179269)
--- trunk/Source/_javascript_Core/ChangeLog 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-01-28 18:28:22 UTC (rev 179269)
@@ -1,3 +1,13 @@
+2015-01-28 Dana Burkart <dburk...@apple.com>
+
+ Move ASan flag settings from DebugRelease.xcconfig to Base.xcconfig
+ https://bugs.webkit.org/show_bug.cgi?id=136765
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/DebugRelease.xcconfig:
+
2015-01-27 Filip Pizlo <fpi...@apple.com>
ExitSiteData saying m_takesSlowPath shouldn't mean early returning takesSlowPath() since for the non-LLInt case we later set m_couldTakeSlowPath, which is more precise
Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (179268 => 179269)
--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2015-01-28 18:28:22 UTC (rev 179269)
@@ -143,3 +143,7 @@
TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig (179268 => 179269)
--- trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig 2015-01-28 18:28:22 UTC (rev 179269)
@@ -36,10 +36,6 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
-
SDKROOT[sdk=iphone*] = $(SDKROOT);
SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
SDKROOT_macosx_ = macosx;
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (179268 => 179269)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2015-01-28 18:28:22 UTC (rev 179269)
@@ -1,3 +1,13 @@
+2015-01-28 Dana Burkart <dburk...@apple.com>
+
+ Move ASan flag settings from DebugRelease.xcconfig to Base.xcconfig
+ https://bugs.webkit.org/show_bug.cgi?id=136765
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/DebugRelease.xcconfig:
+
2014-12-26 Dan Bernstein <m...@apple.com>
<rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (179268 => 179269)
--- trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2015-01-28 18:28:22 UTC (rev 179269)
@@ -58,3 +58,7 @@
TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig (179268 => 179269)
--- trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig 2015-01-28 18:28:22 UTC (rev 179269)
@@ -12,8 +12,6 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
SDKROOT[sdk=iphone*] = $(SDKROOT);
SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
Modified: trunk/Source/WTF/ChangeLog (179268 => 179269)
--- trunk/Source/WTF/ChangeLog 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/WTF/ChangeLog 2015-01-28 18:28:22 UTC (rev 179269)
@@ -1,3 +1,13 @@
+2015-01-28 Dana Burkart <dburk...@apple.com>
+
+ Move ASan flag settings from DebugRelease.xcconfig to Base.xcconfig
+ https://bugs.webkit.org/show_bug.cgi?id=136765
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/DebugRelease.xcconfig:
+
2015-01-28 Darin Adler <da...@apple.com>
Fix small leak in Collator
Modified: trunk/Source/WTF/Configurations/Base.xcconfig (179268 => 179269)
--- trunk/Source/WTF/Configurations/Base.xcconfig 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/WTF/Configurations/Base.xcconfig 2015-01-28 18:28:22 UTC (rev 179269)
@@ -120,3 +120,7 @@
TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Source/WTF/Configurations/DebugRelease.xcconfig (179268 => 179269)
--- trunk/Source/WTF/Configurations/DebugRelease.xcconfig 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/WTF/Configurations/DebugRelease.xcconfig 2015-01-28 18:28:22 UTC (rev 179269)
@@ -34,8 +34,6 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
SDKROOT[sdk=iphone*] = $(SDKROOT);
SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
Modified: trunk/Source/WebCore/ChangeLog (179268 => 179269)
--- trunk/Source/WebCore/ChangeLog 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/WebCore/ChangeLog 2015-01-28 18:28:22 UTC (rev 179269)
@@ -1,3 +1,14 @@
+2015-01-28 Dana Burkart <dburk...@apple.com>
+
+ Move ASan flag settings from DebugRelease.xcconfig to Base.xcconfig
+ https://bugs.webkit.org/show_bug.cgi?id=136765
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/DebugRelease.xcconfig:
+ * WebCore.xcodeproj/project.pbxproj:
+
2015-01-28 Chris Dumez <cdu...@apple.com>
Use an enum class for createFontFamilyValue()'s fromSystemFontID argument
Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (179268 => 179269)
--- trunk/Source/WebCore/Configurations/Base.xcconfig 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig 2015-01-28 18:28:22 UTC (rev 179269)
@@ -117,3 +117,7 @@
TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Source/WebCore/Configurations/DebugRelease.xcconfig (179268 => 179269)
--- trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2015-01-28 18:28:22 UTC (rev 179269)
@@ -39,10 +39,6 @@
CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.8*] = default;
CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.9*] = default;
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
-
SDKROOT[sdk=iphone*] = $(SDKROOT);
SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
SDKROOT_macosx_ = macosx;
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (179268 => 179269)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-01-28 18:28:22 UTC (rev 179269)
@@ -30362,7 +30362,7 @@
buildSettings = {
EXPORTED_SYMBOLS_FILE = "";
INSTALL_PATH = /usr/local/bin;
- OTHER_LDFLAGS = "";
+ OTHER_LDFLAGS = "$(ASAN_OTHER_LDFLAGS)";
PRODUCT_NAME = WebCoreExportFileGenerator;
SKIP_INSTALL = YES;
};
Modified: trunk/Source/WebInspectorUI/ChangeLog (179268 => 179269)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-01-28 18:28:22 UTC (rev 179269)
@@ -1,3 +1,13 @@
+2015-01-28 Dana Burkart <dburk...@apple.com>
+
+ Move ASan flag settings from DebugRelease.xcconfig to Base.xcconfig
+ https://bugs.webkit.org/show_bug.cgi?id=136765
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/DebugRelease.xcconfig:
+
2015-01-23 Joseph Pecoraro <pecor...@apple.com>
Web Inspector: Object Previews in the Console
Modified: trunk/Source/WebInspectorUI/Configurations/Base.xcconfig (179268 => 179269)
--- trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2015-01-28 18:28:22 UTC (rev 179269)
@@ -66,3 +66,7 @@
TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig (179268 => 179269)
--- trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig 2015-01-28 18:28:22 UTC (rev 179269)
@@ -15,10 +15,6 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
-
SDKROOT[sdk=iphone*] = $(SDKROOT);
SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
SDKROOT_macosx_ = macosx;
Modified: trunk/Source/WebKit/mac/ChangeLog (179268 => 179269)
--- trunk/Source/WebKit/mac/ChangeLog 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-01-28 18:28:22 UTC (rev 179269)
@@ -1,3 +1,13 @@
+2015-01-28 Dana Burkart <dburk...@apple.com>
+
+ Move ASan flag settings from DebugRelease.xcconfig to Base.xcconfig
+ https://bugs.webkit.org/show_bug.cgi?id=136765
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/DebugRelease.xcconfig:
+
2015-01-28 Chris Dumez <cdu...@apple.com>
Fix typo in markPagesForVistedLinkStyleRecalc()
Modified: trunk/Source/WebKit/mac/Configurations/Base.xcconfig (179268 => 179269)
--- trunk/Source/WebKit/mac/Configurations/Base.xcconfig 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/WebKit/mac/Configurations/Base.xcconfig 2015-01-28 18:28:22 UTC (rev 179269)
@@ -108,3 +108,7 @@
TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig (179268 => 179269)
--- trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig 2015-01-28 18:28:22 UTC (rev 179269)
@@ -44,10 +44,6 @@
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000);
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
-
SDKROOT[sdk=iphone*] = $(SDKROOT);
SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
SDKROOT_macosx_ = macosx;
Modified: trunk/Source/WebKit2/ChangeLog (179268 => 179269)
--- trunk/Source/WebKit2/ChangeLog 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-28 18:28:22 UTC (rev 179269)
@@ -1,3 +1,13 @@
+2015-01-28 Dana Burkart <dburk...@apple.com>
+
+ Move ASan flag settings from DebugRelease.xcconfig to Base.xcconfig
+ https://bugs.webkit.org/show_bug.cgi?id=136765
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/DebugRelease.xcconfig:
+
2015-01-28 Chris Dumez <cdu...@apple.com>
Fix typo in markPagesForVistedLinkStyleRecalc()
Modified: trunk/Source/WebKit2/Configurations/Base.xcconfig (179268 => 179269)
--- trunk/Source/WebKit2/Configurations/Base.xcconfig 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/WebKit2/Configurations/Base.xcconfig 2015-01-28 18:28:22 UTC (rev 179269)
@@ -79,7 +79,6 @@
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
-
// DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.
// We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant.
DEBUG_DEFINES_debug = DISABLE_THREAD_CHECK;
@@ -115,3 +114,7 @@
SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator;
FRAMEWORK_CONTENT_DIRECTORY[sdk=macosx*] = Versions/A;
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig (179268 => 179269)
--- trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig 2015-01-28 18:28:22 UTC (rev 179269)
@@ -44,10 +44,6 @@
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000);
-OTHER_CFLAGS = $(inherited) $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(inherited) $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(inherited) $(ASAN_OTHER_LDFLAGS);
-
DEBUG_OR_RELEASE = YES;
SDKROOT[sdk=iphone*] = $(SDKROOT);
Modified: trunk/Source/bmalloc/ChangeLog (179268 => 179269)
--- trunk/Source/bmalloc/ChangeLog 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/bmalloc/ChangeLog 2015-01-28 18:28:22 UTC (rev 179269)
@@ -1,3 +1,13 @@
+2015-01-28 Dana Burkart <dburk...@apple.com>
+
+ Move ASan flag settings from DebugRelease.xcconfig to Base.xcconfig
+ https://bugs.webkit.org/show_bug.cgi?id=136765
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/DebugRelease.xcconfig:
+
2015-01-21 Geoffrey Garen <gga...@apple.com>
bmalloc: support aligned allocation
Modified: trunk/Source/bmalloc/Configurations/Base.xcconfig (179268 => 179269)
--- trunk/Source/bmalloc/Configurations/Base.xcconfig 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/bmalloc/Configurations/Base.xcconfig 2015-01-28 18:28:22 UTC (rev 179269)
@@ -115,3 +115,7 @@
TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig (179268 => 179269)
--- trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig 2015-01-28 18:28:22 UTC (rev 179269)
@@ -34,8 +34,6 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
SDKROOT[sdk=iphone*] = $(SDKROOT);
SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
Modified: trunk/Tools/ChangeLog (179268 => 179269)
--- trunk/Tools/ChangeLog 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Tools/ChangeLog 2015-01-28 18:28:22 UTC (rev 179269)
@@ -1,3 +1,22 @@
+2015-01-28 Dana Burkart <dburk...@apple.com>
+
+ Move ASan flag settings from DebugRelease.xcconfig to Base.xcconfig
+ https://bugs.webkit.org/show_bug.cgi?id=136765
+
+ Reviewed by Alexey Proskuryakov.
+
+ * DumpRenderTree/mac/Configurations/Base.xcconfig:
+ * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
+ * LayoutTestRelay/Configurations/Base.xcconfig:
+ * LayoutTestRelay/Configurations/DebugRelease.xcconfig:
+ * MiniBrowser/Configurations/Base.xcconfig:
+ * MiniBrowser/Configurations/DebugRelease.xcconfig:
+ * TestWebKitAPI/Configurations/Base.xcconfig:
+ * TestWebKitAPI/Configurations/DebugRelease.xcconfig:
+ * WebKitLauncher/Configurations/Base.xcconfig:
+ * WebKitTestRunner/Configurations/Base.xcconfig:
+ * WebKitTestRunner/Configurations/DebugRelease.xcconfig:
+
2015-01-28 Joanmarie Diggs <jdi...@igalia.com>
AX: [ATK] Implement support for new AtkRole types for MathML
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (179268 => 179269)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2015-01-28 18:28:22 UTC (rev 179269)
@@ -1215,7 +1215,6 @@
COPY_PHASE_STRIP = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
- OTHER_CFLAGS = "";
OTHER_REZFLAGS = "";
PRODUCT_NAME = All;
SECTORDER_FLAGS = "";
@@ -1233,7 +1232,6 @@
COPY_PHASE_STRIP = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_OPTIMIZATION_LEVEL = 0;
- OTHER_CFLAGS = "";
OTHER_REZFLAGS = "";
PRODUCT_NAME = All;
SECTORDER_FLAGS = "";
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (179268 => 179269)
--- trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2015-01-28 18:28:22 UTC (rev 179269)
@@ -59,7 +59,6 @@
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
-
SDKROOT = macosx.internal;
WEBKIT_SYSTEM_INTERFACE_LIBRARY = WebKitSystemInterface
@@ -74,3 +73,7 @@
TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator;
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig (179268 => 179269)
--- trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2015-01-28 18:28:22 UTC (rev 179269)
@@ -45,9 +45,6 @@
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMavericks;
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000);
-OTHER_CFLAGS = $(inherited) $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(inherited) $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(inherited) $(ASAN_OTHER_LDFLAGS);
SDKROOT = $(SDKROOT_$(PLATFORM_NAME));
SDKROOT_iphoneos = $(SDKROOT);
Modified: trunk/Tools/LayoutTestRelay/Configurations/Base.xcconfig (179268 => 179269)
--- trunk/Tools/LayoutTestRelay/Configurations/Base.xcconfig 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Tools/LayoutTestRelay/Configurations/Base.xcconfig 2015-01-28 18:28:22 UTC (rev 179269)
@@ -61,3 +61,7 @@
TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
SUPPORTED_PLATFORMS = macosx;
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
\ No newline at end of file
Modified: trunk/Tools/MiniBrowser/Configurations/Base.xcconfig (179268 => 179269)
--- trunk/Tools/MiniBrowser/Configurations/Base.xcconfig 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Tools/MiniBrowser/Configurations/Base.xcconfig 2015-01-28 18:28:22 UTC (rev 179269)
@@ -60,3 +60,7 @@
TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig (179268 => 179269)
--- trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig 2015-01-28 18:28:22 UTC (rev 179269)
@@ -36,10 +36,6 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
-
SDKROOT = $(SDKROOT_$(PLATFORM_NAME));
SDKROOT_iphoneos = $(SDKROOT);
SDKROOT_iphonesimulator = $(SDKROOT);
Modified: trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig (179268 => 179269)
--- trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2015-01-28 18:28:22 UTC (rev 179269)
@@ -75,3 +75,7 @@
TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig (179268 => 179269)
--- trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig 2015-01-28 18:28:22 UTC (rev 179269)
@@ -36,13 +36,11 @@
WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(BUILT_PRODUCTS_DIR);
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = -ftemplate-depth=256 $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
-
SDKROOT = $(SDKROOT_$(PLATFORM_NAME));
SDKROOT_iphoneos = $(SDKROOT);
SDKROOT_iphonesimulator = $(SDKROOT);
SDKROOT_macosx = $(SDKROOT_macosx_$(USE_INTERNAL_SDK));
SDKROOT_macosx_ = macosx;
SDKROOT_macosx_YES = macosx.internal;
+
+OTHER_CPLUSPLUSFLAGS = $(inherited) -ftemplate-depth=256;
Modified: trunk/Tools/WebKitLauncher/Configurations/Base.xcconfig (179268 => 179269)
--- trunk/Tools/WebKitLauncher/Configurations/Base.xcconfig 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Tools/WebKitLauncher/Configurations/Base.xcconfig 2015-01-28 18:28:22 UTC (rev 179269)
@@ -36,10 +36,6 @@
ENABLE_SPARKLE = 0;
-OTHER_CFLAGS = $(inherited) $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(inherited) $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(inherited) $(ASAN_OTHER_LDFLAGS);
-
TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME));
TOOLCHAINS_iphoneos = $(TOOLCHAINS);
TOOLCHAINS_iphonesimulator = $(TOOLCHAINS);
@@ -48,3 +44,7 @@
TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
+
+OTHER_CFLAGS = $(inherited) $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(inherited) $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(inherited) $(ASAN_OTHER_LDFLAGS);
\ No newline at end of file
Modified: trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig (179268 => 179269)
--- trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2015-01-28 18:28:22 UTC (rev 179269)
@@ -69,4 +69,8 @@
TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
+
SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator;
Modified: trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig (179268 => 179269)
--- trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2015-01-28 18:28:22 UTC (rev 179269)
@@ -45,10 +45,6 @@
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000);
-OTHER_CFLAGS = $(inherited) $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(inherited) $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(inherited) $(ASAN_OTHER_LDFLAGS);
-
SDKROOT = $(SDKROOT_$(PLATFORM_NAME));
SDKROOT_iphoneos = $(SDKROOT);
SDKROOT_iphonesimulator = $(SDKROOT);
