Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (153755 => 153756)
--- trunk/Source/_javascript_Core/ChangeLog 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-08-06 17:43:57 UTC (rev 153756)
@@ -1,3 +1,17 @@
+2013-07-23 David Farler <[email protected]>
+
+ Provide optional OTHER_CFLAGS, OTHER_CPPFLAGS, OTHER_LDFLAGS additions for building with ASAN
+ https://bugs.webkit.org/show_bug.cgi?id=117762
+
+ Reviewed by Mark Rowe.
+
+ * Configurations/DebugRelease.xcconfig:
+ Add ASAN_OTHER_CFLAGS, CPLUSPLUSFLAGS, LDFLAGS.
+ * Configurations/_javascript_Core.xcconfig:
+ Add ASAN_OTHER_LDFLAGS.
+ * Configurations/ToolExecutable.xcconfig:
+ Don't use ASAN for build tools.
+
2013-08-06 Patrick Gansterer <[email protected]>
Build fix for ARM MSVC after r153222 and r153648.
Modified: trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig (153755 => 153756)
--- trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -42,3 +42,7 @@
DEBUG_INFORMATION_FORMAT = dwarf;
SECTORDER_FLAGS = ;
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig (153755 => 153756)
--- trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -42,7 +42,7 @@
OTHER_LDFLAGS_BASE = -lobjc -Wl,-Y,3 $(OTHER_LDFLAGS_HIDE_SYMBOLS);
-OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_BASE);
OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) $(OTHER_LDFLAGS_LLVM) -sub_library libobjc -framework CoreServices;
Modified: trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig (153755 => 153756)
--- trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -37,3 +37,7 @@
CLANG_ENABLE_OBJC_ARC_x86_64 = YES;
CLANG_ENABLE_OBJC_ARC_armv7 = YES;
CLANG_ENABLE_OBJC_ARC_armv7s = YES;
+
+OTHER_CFLAGS = ;
+OTHER_CPLUSPLUSFLAGS = ;
+OTHER_LDFLAGS = ;
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (153755 => 153756)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-08-06 17:43:57 UTC (rev 153756)
@@ -1,3 +1,13 @@
+2013-07-23 David Farler <[email protected]>
+
+ Provide optional OTHER_CFLAGS, OTHER_CPPFLAGS, OTHER_LDFLAGS additions for building with ASAN
+ https://bugs.webkit.org/show_bug.cgi?id=117762
+
+ Reviewed by Mark Rowe.
+
+ * Configurations/DebugRelease.xcconfig:
+ Add ASAN_OTHER_CFLAGS, CPLUSPLUSFLAGS.
+
2013-08-06 Zan Dobersek <[email protected]>
webkit-gtk fails to build with bison-3.0
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig (153755 => 153756)
--- trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -11,3 +11,5 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
Modified: trunk/Source/ThirdParty/ChangeLog (153755 => 153756)
--- trunk/Source/ThirdParty/ChangeLog 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Source/ThirdParty/ChangeLog 2013-08-06 17:43:57 UTC (rev 153756)
@@ -1,3 +1,15 @@
+2013-07-23 David Farler <[email protected]>
+
+ Provide optional OTHER_CFLAGS, OTHER_CPPFLAGS, OTHER_LDFLAGS additions for building with ASAN
+ https://bugs.webkit.org/show_bug.cgi?id=117762
+
+ Reviewed by Mark Rowe.
+
+ * gtest/xcode/Config/General.xcconfig:
+ Add ASAN_OTHER_CFLAGS, CPLUSPLUSFLAGS, LDFLAGS.
+ * gtest/xcode/Config/StaticLibraryTarget.xcconfig:
+ Add ASAN_OTHER_CFLAGS, CPLUSPLUSFLAGS.
+
2013-07-27 Mark Rowe <[email protected]>
Fix builds against an SDK.
Modified: trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig (153755 => 153756)
--- trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -52,3 +52,6 @@
// VERSIONING BUILD SETTINGS (used in Info.plist)
GTEST_VERSIONINFO_ABOUT = © 2008 Google Inc.
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Source/ThirdParty/gtest/xcode/Config/StaticLibraryTarget.xcconfig (153755 => 153756)
--- trunk/Source/ThirdParty/gtest/xcode/Config/StaticLibraryTarget.xcconfig 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/StaticLibraryTarget.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -16,3 +16,5 @@
// Let the user install by specifying the $DSTROOT with xcodebuild
SKIP_INSTALL = NO
+
+OTHER_LDFLAGS = ;
Modified: trunk/Source/WTF/ChangeLog (153755 => 153756)
--- trunk/Source/WTF/ChangeLog 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Source/WTF/ChangeLog 2013-08-06 17:43:57 UTC (rev 153756)
@@ -1,3 +1,12 @@
+2013-07-23 David Farler <[email protected]>
+ Provide optional OTHER_CFLAGS, OTHER_CPPFLAGS, OTHER_LDFLAGS additions for building with ASAN
+ https://bugs.webkit.org/show_bug.cgi?id=117762
+
+ Reviewed by Mark Rowe.
+
+ * Configurations/DebugRelease.xcconfig:
+ Add ASAN_OTHER_CFLAGS, CPLUSPLUSFLAGS.
+
2013-08-05 Mark Rowe <[email protected]>
Build fix for Qt Windows.
Modified: trunk/Source/WTF/Configurations/DebugRelease.xcconfig (153755 => 153756)
--- trunk/Source/WTF/Configurations/DebugRelease.xcconfig 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Source/WTF/Configurations/DebugRelease.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -36,3 +36,5 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
Modified: trunk/Source/WebCore/ChangeLog (153755 => 153756)
--- trunk/Source/WebCore/ChangeLog 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Source/WebCore/ChangeLog 2013-08-06 17:43:57 UTC (rev 153756)
@@ -1,3 +1,23 @@
+2013-07-23 David Farler <[email protected]>
+
+ Provide optional OTHER_CFLAGS, OTHER_CPPFLAGS, OTHER_LDFLAGS additions for building with ASAN
+ https://bugs.webkit.org/show_bug.cgi?id=117762
+
+ Reviewed by Mark Rowe.
+
+ No new tests necessary.
+
+ * Configurations/DebugRelease.xcconfig:
+ Add ASAN_OTHER_CFLAGS, CPLUSPLUSFLAGS, LDFLAGS.
+ * Configurations/WebCore.xcconfig:
+ Add ASAN_OTHER_LDFLAGS.
+ * Configurations/WebCoreTestShim.xcconfig:
+ Add ASAN_OTHER_LDFLAGS.
+ * Configurations/WebCoreTestSupport.xcconfig:
+ Add ASAN_OTHER_LDFLAGS.
+ * WebCore.xcodeproj/project.pbxproj:
+ Don't use ASAN for build tools.
+
2013-08-05 Rob Buis <[email protected]>
SVG stroke-dasharray is not animatable
Modified: trunk/Source/WebCore/Configurations/DebugRelease.xcconfig (153755 => 153756)
--- trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -19,7 +19,7 @@
// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "Base.xcconfig"
@@ -44,3 +44,7 @@
SECTORDER_FLAGS = ;
WEBCORE_SQLITE3_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/WebCoreSQLite3;
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (153755 => 153756)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -62,7 +62,7 @@
INSTALLHDRS_SCRIPT_PHASE = YES;
PRODUCT_NAME = WebCore;
OTHER_LDFLAGS_BASE = -lsqlite3 -lobjc -lANGLE -allowable_client WebCoreTestSupport;
-OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework QuartzCore;
OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -umbrella WebKit -allowable_client WebKit2 -framework IOSurface;
Modified: trunk/Source/WebCore/Configurations/WebCoreTestShim.xcconfig (153755 => 153756)
--- trunk/Source/WebCore/Configurations/WebCoreTestShim.xcconfig 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Source/WebCore/Configurations/WebCoreTestShim.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -37,5 +37,5 @@
PRODUCT_NAME = WebCoreTestShim;
EXECUTABLE_PREFIX = lib;
EXPORTED_SYMBOLS_FILE = ;
-OTHER_LDFLAGS = ;
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
SECTORDER_FLAGS = ;
Modified: trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig (153755 => 153756)
--- trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -44,5 +44,5 @@
PRODUCT_NAME = WebCoreTestSupport;
EXECUTABLE_PREFIX = lib;
EXPORTED_SYMBOLS_FILE = ;
-OTHER_LDFLAGS = ;
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
SECTORDER_FLAGS = ;
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (153755 => 153756)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-08-06 17:43:57 UTC (rev 153756)
@@ -27231,6 +27231,8 @@
EXPORTED_SYMBOLS_FILE = "";
GCC_OPTIMIZATION_LEVEL = 0;
INSTALL_PATH = /usr/local/bin;
+ OTHER_CFLAGS = "";
+ OTHER_CPLUSPLUSFLAGS = "";
OTHER_LDFLAGS = "";
PRODUCT_NAME = WebCoreExportFileGenerator;
SKIP_INSTALL = YES;
@@ -27243,6 +27245,8 @@
buildSettings = {
EXPORTED_SYMBOLS_FILE = "";
INSTALL_PATH = /usr/local/bin;
+ OTHER_CFLAGS = "";
+ OTHER_CPLUSPLUSFLAGS = "";
OTHER_LDFLAGS = "";
PRODUCT_NAME = WebCoreExportFileGenerator;
SKIP_INSTALL = YES;
Modified: trunk/Source/WebInspectorUI/ChangeLog (153755 => 153756)
--- trunk/Source/WebInspectorUI/ChangeLog 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Source/WebInspectorUI/ChangeLog 2013-08-06 17:43:57 UTC (rev 153756)
@@ -1,3 +1,13 @@
+2013-07-23 David Farler <[email protected]>
+
+ Provide optional OTHER_CFLAGS, OTHER_CPPFLAGS, OTHER_LDFLAGS additions for building with ASAN
+ https://bugs.webkit.org/show_bug.cgi?id=117762
+
+ Reviewed by Mark Rowe.
+
+ * Configurations/DebugRelease.xcconfig:
+ Add ASAN_OTHER_CFLAGS, CPLUSPLUSFLAGS, LDFLAGS.
+
2013-07-30 Roland Takács <[email protected]>
Web Inspector: doesn't use localized user interface at remote inspector
Modified: trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig (153755 => 153756)
--- trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -16,3 +16,7 @@
RUN_CLANG_STATIC_ANALYZER = YES;
WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(BUILT_PRODUCTS_DIR);
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Source/WebKit/mac/ChangeLog (153755 => 153756)
--- trunk/Source/WebKit/mac/ChangeLog 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-08-06 17:43:57 UTC (rev 153756)
@@ -1,3 +1,15 @@
+2013-07-23 David Farler <[email protected]>
+
+ Provide optional OTHER_CFLAGS, OTHER_CPPFLAGS, OTHER_LDFLAGS additions for building with ASAN
+ https://bugs.webkit.org/show_bug.cgi?id=117762
+
+ Reviewed by Mark Rowe.
+
+ * Configurations/DebugRelease.xcconfig:
+ Add ASAN_OTHER_CFLAGS, CPLUSPLUSFLAGS, LDFLAGS.
+ * Configurations/WebKit.xcconfig:
+ Add ASAN_OTHER_LDFLAGS.
+
2013-07-26 Mark Rowe <[email protected]>
Logging should be configurable using human-readable channel names rather than crazy bitmasks
Modified: trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig (153755 => 153756)
--- trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -50,3 +50,7 @@
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1070 = WebKitSystemInterfaceLion;
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1080 = WebKitSystemInterfaceMountainLion;
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMountainLion;
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig (153755 => 153756)
--- trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -67,7 +67,7 @@
UMBRELLA_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
OTHER_LDFLAGS_BASE = -licucore -framework _javascript_Core -framework QuartzCore -framework WebCore;
-OTHER_LDFLAGS = $(OTHER_LDFLAGS_BASE) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_BASE) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
OTHER_LDFLAGS_iphoneos = -lobjc -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO;
OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
OTHER_LDFLAGS_macosx = -sub_umbrella WebCore -framework Carbon -framework Cocoa -framework DiskArbitration -framework IOKit -framework OpenGL -framework Security;
Modified: trunk/Source/WebKit2/ChangeLog (153755 => 153756)
--- trunk/Source/WebKit2/ChangeLog 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Source/WebKit2/ChangeLog 2013-08-06 17:43:57 UTC (rev 153756)
@@ -1,3 +1,17 @@
+2013-07-23 David Farler <[email protected]>
+
+ Provide optional OTHER_CFLAGS, OTHER_CPPFLAGS, OTHER_LDFLAGS additions for building with ASAN
+ https://bugs.webkit.org/show_bug.cgi?id=117762
+
+ Reviewed by Mark Rowe.
+
+ * Configurations/DebugRelease.xcconfig:
+ Add ASAN_OTHER_CFLAGS, CPLUSPLUSFLAGS, LDFLAGS.
+ * Configurations/WebContentProcess.xcconfig:
+ Add ASAN_OTHER_LDFLAGS.
+ * Configurations/WebKit2.xcconfig:
+ Add ASAN_OTHER_LDFLAGS.
+
2013-08-06 Andreas Kling <[email protected]>
REGRESSION(r151403): Resizing is extremely laggy on many sites when plugins are disallowed.
Modified: trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig (153755 => 153756)
--- trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -42,4 +42,8 @@
WEBKIT_SYSTEM_INTERFACE_LIBRARY_1080 = WebKitSystemInterfaceMountainLion;
WEBKIT_SYSTEM_INTERFACE_LIBRARY_1090 = WebKitSystemInterfaceMountainLion;
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
+
DEBUG_OR_RELEASE = YES;
Modified: trunk/Source/WebKit2/Configurations/WebContentProcess.xcconfig (153755 => 153756)
--- trunk/Source/WebKit2/Configurations/WebContentProcess.xcconfig 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Source/WebKit2/Configurations/WebContentProcess.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -26,7 +26,7 @@
PRODUCT_NAME = WebProcess;
INFOPLIST_FILE = WebProcess/EntryPoint/mac/LegacyProcess/Info.plist;
-OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
OTHER_LDFLAGS_macosx_1070 = -framework VideoDecodeAcceleration;
OTHER_LDFLAGS_macosx_1080 = ;
Modified: trunk/Source/WebKit2/Configurations/WebKit2.xcconfig (153755 => 153756)
--- trunk/Source/WebKit2/Configurations/WebKit2.xcconfig 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Source/WebKit2/Configurations/WebKit2.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -31,7 +31,7 @@
FRAMEWORK_AND_LIBRARY_LDFLAGS = -framework ApplicationServices -framework Carbon -framework Cocoa -framework CoreServices -framework IOKit -framework _javascript_Core -licucore -framework QuartzCore -framework Security -framework WebCore -framework CoreAudio;
-OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(PLATFORM_NAME)) $(OTHER_LDFLAGS);
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
OTHER_LDFLAGS_macosx = $(FRAMEWORK_AND_LIBRARY_LDFLAGS);
EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
Modified: trunk/Tools/ChangeLog (153755 => 153756)
--- trunk/Tools/ChangeLog 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Tools/ChangeLog 2013-08-06 17:43:57 UTC (rev 153756)
@@ -1,3 +1,33 @@
+2013-07-23 David Farler <[email protected]>
+
+ Provide optional OTHER_CFLAGS, OTHER_CPPFLAGS, OTHER_LDFLAGS additions for building with ASAN
+ https://bugs.webkit.org/show_bug.cgi?id=117762
+
+ Reviewed by Mark Rowe.
+
+ * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
+ Add ASAN_OTHER_CFLAGS, CPLUSPLUSFLAGS, LDFLAGS.
+ * DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig:
+ Add ASAN_OTHER_LDFLAGS.
+ * MiniBrowser/Configurations/DebugRelease.xcconfig:
+ Add ASAN_OTHER_CFLAGS, CPLUSPLUSFLAGS, LDFLAGS.
+ * Scripts/check-for-weak-vtables-and-externals:
+ Ignore ___asan externals, these are populated by compiler-rt.
+ * TestWebKitAPI/Configurations/DebugRelease.xcconfig:
+ Add ASAN_OTHER_CFLAGS, CPLUSPLUSFLAGS, LDFLAGS.
+ * TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig:
+ Add ASAN_OTHER_LDFLAGS.
+ * WebKitLauncher/Configurations/Base.xcconfig:
+ Add ASAN_OTHER_CFLAGS, CPLUSPLUSFLAGS, LDFLAGS.
+ * WebKitLauncher/Configurations/WebKitNightlyEnabler.xcconfig:
+ Add ASAN_OTHER_LDFLAGS.
+ * WebKitTestRunner/Configurations/DebugRelease.xcconfig:
+ Add ASAN_OTHER_CFLAGS, CPLUSPLUSFLAGS, LDFLAGS.
+ * WebKitTestRunner/Configurations/InjectedBundle.xcconfig:
+ Add ASAN_OTHER_LDFLAGS.
+ * asan/asan.xcconfig: Added.
+ * asan/webkit-asan-ignore.txt: Added.
+
2013-08-05 Brian Holt <[email protected]>
[GTK] Implement leak checking with valgrind
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig (153755 => 153756)
--- trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -39,3 +39,6 @@
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1070 = WebKitSystemInterfaceLion;
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1080 = WebKitSystemInterfaceMountainLion;
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMountainLion;
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig (153755 => 153756)
--- trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -21,7 +21,7 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-OTHER_LDFLAGS = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)
+OTHER_LDFLAGS = $(inherited) -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)
LD_RUNPATH_SEARCH_PATHS = "@loader_path/.";
PRODUCT_NAME = DumpRenderTree
GCC_ENABLE_OBJC_EXCEPTIONS = YES
Modified: trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig (153755 => 153756)
--- trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -31,3 +31,7 @@
MACOSX_DEPLOYMENT_TARGET_1070 = 10.7;
MACOSX_DEPLOYMENT_TARGET_1080 = 10.8;
MACOSX_DEPLOYMENT_TARGET_1090 = 10.9;
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Tools/Scripts/check-for-weak-vtables-and-externals (153755 => 153756)
--- trunk/Tools/Scripts/check-for-weak-vtables-and-externals 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Tools/Scripts/check-for-weak-vtables-and-externals 2013-08-06 17:43:57 UTC (rev 153756)
@@ -69,6 +69,9 @@
# Ignore undefined, RTTI and typeinfo symbols.
next if /\bundefined\b/ or /\b__ZT[IS]/;
+ # ASan compiler-rt calls into __asan_mapping_offset and __asan_mapping_scale
+ next if /\b___asan/;
+
if (/weak external vtable for (.*)$/) {
push @weakVTableClasses, $1;
} elsif (/weak external (.*)$/) {
Modified: trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig (153755 => 153756)
--- trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -33,3 +33,7 @@
MACOSX_DEPLOYMENT_TARGET_1090 = 10.9;
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);
Modified: trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig (153755 => 153756)
--- trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -24,7 +24,7 @@
PRODUCT_NAME = TestWebKitAPI;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-OTHER_LDFLAGS = -lgtest -framework _javascript_Core -framework WebKit $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS = $(inherited) -lgtest -framework _javascript_Core -framework WebKit $(OTHER_LDFLAGS_$(PLATFORM_NAME));
OTHER_LDFLAGS_iphoneos = -framework WebCore;
OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
OTHER_LDFLAGS_macosx = -framework Cocoa -framework Carbon -framework WebKit2;
Modified: trunk/Tools/WebKitLauncher/Configurations/Base.xcconfig (153755 => 153756)
--- trunk/Tools/WebKitLauncher/Configurations/Base.xcconfig 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Tools/WebKitLauncher/Configurations/Base.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -35,3 +35,7 @@
WARNING_CFLAGS = -Wall;
ENABLE_SPARKLE = 0;
+
+OTHER_CFLAGS = $(inherited) $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(inherited) $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(inherited) $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Tools/WebKitLauncher/Configurations/WebKitNightlyEnabler.xcconfig (153755 => 153756)
--- trunk/Tools/WebKitLauncher/Configurations/WebKitNightlyEnabler.xcconfig 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Tools/WebKitLauncher/Configurations/WebKitNightlyEnabler.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -24,6 +24,6 @@
PRODUCT_NAME = WebKitNightlyEnabler;
INSTALL_PATH = @executable_path/../Resources;
-OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(ENABLE_SPARKLE));
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(ENABLE_SPARKLE));
OTHER_LDFLAGS_0 = ;
OTHER_LDFLAGS_1 = -framework Sparkle;
Modified: trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig (153755 => 153756)
--- trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -41,3 +41,7 @@
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1070 = WebKitSystemInterfaceLion;
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1080 = WebKitSystemInterfaceMountainLion;
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMountainLion;
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig (153755 => 153756)
--- trunk/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig 2013-08-06 16:16:27 UTC (rev 153755)
+++ trunk/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -26,4 +26,4 @@
INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Resources;
SKIP_INSTALL = NO;
-OTHER_LDFLAGS = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)
+OTHER_LDFLAGS = $(inherited) -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY);
Added: trunk/Tools/asan/asan.xcconfig (0 => 153756)
--- trunk/Tools/asan/asan.xcconfig (rev 0)
+++ trunk/Tools/asan/asan.xcconfig 2013-08-06 17:43:57 UTC (rev 153756)
@@ -0,0 +1,5 @@
+GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+
+ASAN_OTHER_CFLAGS = -fsanitize=address -O1 -mllvm -asan-blacklist=$(ASAN_IGNORE) -Wno-error -fno-omit-frame-pointer -g -DUSE_SYSTEM_MALLOC=1;
+ASAN_OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CFLAGS);
+ASAN_OTHER_LDFLAGS = -fsanitize=address -lclang_rt.asan_osx_dynamic;
Added: trunk/Tools/asan/webkit-asan-ignore.txt (0 => 153756)
--- trunk/Tools/asan/webkit-asan-ignore.txt (rev 0)
+++ trunk/Tools/asan/webkit-asan-ignore.txt 2013-08-06 17:43:57 UTC (rev 153756)
@@ -0,0 +1,4 @@
+fun:*genericAddSpan*
+fun:*gatherFromCurrentThread*ConservativeRoots*
+fun:*SetCookieStoragePrivateBrowsingEnabled*
+fun:*HTMLTreeBuilder*finished*
