procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

testsuite, Darwin: Remove an unnecessary flags addition.

Browse source 
The addition of the multiply_defined suppress flag has been handled for some
considerable time now in the Darwin specs; remove it from the testsuite libs.
Avoid duplicates in the specs.

Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>

gcc/ChangeLog:

	* config/darwin.h: Avoid duplicate multiply_defined specs on
	earlier Darwin versions with shared libgcc.

libstdc++-v3/ChangeLog:

	* testsuite/lib/libstdc++.exp: Remove additional flag handled
	by Darwin specs.

gcc/testsuite/ChangeLog:

	* lib/g++.exp: Remove additional flag handled by Darwin specs.
	* lib/obj-c++.exp: Likewise.
This commit is contained in:
Iain Sandoe 2022-06-19 20:47:43 +01:00
parent 9a856f67ee
commit 3c776fdf1a
4 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/config/darwin.h
View file

@ -217,8 +217,7 @@ extern GTY(()) int darwin_ms_struct;
"%{image_base*:-Xlinker -image_base -Xlinker %*} %<image_base*", \
"%{init*:-Xlinker -init -Xlinker %*} %<init*", \
"%{multi_module:-Xlinker -multi_module} %<multi_module", \
"%{multiply_defined*:-Xlinker -multiply_defined -Xlinker %*} \
%<multiply_defined* ", \
"%{multiply_defined*:-Xlinker -multiply_defined -Xlinker %*} ", \
"%{multiplydefinedunused*:\
-Xlinker -multiply_defined_unused -Xlinker %*} \
%<multiplydefinedunused* ", \
@ -294,7 +293,7 @@ extern GTY(()) int darwin_ms_struct;
%:version-compare(>= 10.7 mmacosx-version-min= -no_pie) }"
#define DARWIN_CC1_SPEC \
"%<dynamic %<dynamiclib %<force_cpusubtype_ALL "
"%<dynamic %<dynamiclib %<force_cpusubtype_ALL %<multiply_defined* "
#define SUBSUBTARGET_OVERRIDE_OPTIONS \
do { \

4
gcc/testsuite/lib/g++.exp
View file

@ -285,10 +285,6 @@ proc g++_init { args } {
set gcc_warning_prefix "warning:"
set gcc_error_prefix "(fatal )?error:"
if { [istarget *-*-darwin*] } {
lappend ALWAYS_CXXFLAGS "ldflags=-multiply_defined suppress"
}
verbose -log "ALWAYS_CXXFLAGS set to $ALWAYS_CXXFLAGS"
verbose "g++ is initialized" 3

4
gcc/testsuite/lib/obj-c++.exp
View file

@ -277,10 +277,6 @@ proc obj-c++_init { args } {
set gcc_warning_prefix "warning:"
set gcc_error_prefix "(fatal )?error:"
if { [istarget *-*-darwin*] } {
lappend ALWAYS_OBJCXXFLAGS "ldflags=-multiply_defined suppress"
}
verbose -log "ALWAYS_OBJCXXFLAGS set to $ALWAYS_OBJCXXFLAGS"
verbose "obj-c++ is initialized" 3

3
libstdc++-v3/testsuite/lib/libstdc++.exp
View file

@ -133,9 +133,6 @@ proc libstdc++_init { testfile } {
if ![info exists DEFAULT_CXXFLAGS] then {
set DEFAULT_CXXFLAGS ""
# Host specific goo here.
if { [string match "powerpc-*-darwin*" $target_triplet] } {
append DEFAULT_CXXFLAGS " -multiply_defined suppress"
}
if { [string match "powerpc-ibm-aix*" $target_triplet] } {
append DEFAULT_CXXFLAGS " -Wl,-bmaxdata:0x20000000"
}