Commit 80801e7b authored by aestes@apple.com's avatar aestes@apple.com

<https://webkit.org/b/120180> Fix issues with OTHER_LDFLAGS in various .xcconfig files

Reviewed by David Kilzer.

Source/WebKit2:

Adding ld flags for ASAN overwrote the unexported symbol flags we were
previously specifying. Since the unexported symbol ld flags are only
needed for the framework target, move them to WebKit2.xcconfig where we
can add them to OTHER_LDFLAGS along with the ASAN values inherited from
DebugRelease.xcconfig (and other values).

* Configurations/Base.xcconfig: Removed the unexported symbol ld flags.
* Configurations/WebKit2.xcconfig: ... and moved them here.

Tools:

* TestWebKitAPI/Configurations/Base.xcconfig: Removed the definition of
OTHER_CPLUSPLUSFLAGS since -ftemplate-depth=256 is already set in
DebugRelease.xcconfig and TestWebKitAPI isn't built in Production.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154467 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 6962a520
2013-08-22 Andy Estes <aestes@apple.com>
<https://webkit.org/b/120180> Fix issues with OTHER_LDFLAGS in various .xcconfig files
Reviewed by David Kilzer.
Adding ld flags for ASAN overwrote the unexported symbol flags we were
previously specifying. Since the unexported symbol ld flags are only
needed for the framework target, move them to WebKit2.xcconfig where we
can add them to OTHER_LDFLAGS along with the ASAN values inherited from
DebugRelease.xcconfig (and other values).
* Configurations/Base.xcconfig: Removed the unexported symbol ld flags.
* Configurations/WebKit2.xcconfig: ... and moved them here.
2013-08-21 Tim Horton <timothy_horton@apple.com>
Another null-deref under WebDragClient::startDrag
......
......@@ -57,9 +57,6 @@ PREBINDING = NO;
VALID_ARCHS = i386 x86_64;
WARNING_CFLAGS = -Wall -Wextra -Wchar-subscripts -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;
// Prevent C++ standard library operator new, delete and their related exception types from being exported as weak symbols.
OTHER_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv -Wl,-unexported_symbol -Wl,__Znwm;
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
......
......@@ -31,7 +31,10 @@ DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
FRAMEWORK_AND_LIBRARY_LDFLAGS = -framework ApplicationServices -framework Carbon -framework Cocoa -framework CoreServices -framework IOKit -framework JavaScriptCore -licucore -framework QuartzCore -framework Security -framework WebCore -framework CoreAudio;
OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
// Prevent C++ standard library operator new, delete and their related exception types from being exported as weak symbols.
UNEXPORTED_SYMBOL_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv -Wl,-unexported_symbol -Wl,__Znwm;
OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
OTHER_LDFLAGS_macosx = $(FRAMEWORK_AND_LIBRARY_LDFLAGS);
EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
......
2013-08-22 Andy Estes <aestes@apple.com>
<https://webkit.org/b/120180> Fix issues with OTHER_LDFLAGS in various .xcconfig files
Reviewed by David Kilzer.
* TestWebKitAPI/Configurations/Base.xcconfig: Removed the definition of
OTHER_CPLUSPLUSFLAGS since -ftemplate-depth=256 is already set in
DebugRelease.xcconfig and TestWebKitAPI isn't built in Production.
2013-08-22 Ryosuke Niwa <rniwa@webkit.org>
NRWT: Add the ability to upload test results to new test results server
......
......@@ -43,7 +43,6 @@ GCC_WARN_UNUSED_FUNCTION = YES
GCC_WARN_UNUSED_VARIABLE = YES
WARNING_CFLAGS = -Wall -W -Wno-unused-parameter
LINKER_DISPLAYS_MANGLED_NAMES = YES;
OTHER_CPLUSPLUSFLAGS = $(OTHER_CPLUSPLUSFLAGS) -ftemplate-depth=256;
// 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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment