Skip to content

Commit 3c776fd

Browse files
committed
testsuite, Darwin: Remove an unnecessary flags addition.
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 <[email protected]> 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.
1 parent 9a856f6 commit 3c776fd

File tree

4 files changed

+2
-14
lines changed

4 files changed

+2
-14
lines changed

gcc/config/darwin.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,7 @@ extern GTY(()) int darwin_ms_struct;
217217
"%{image_base*:-Xlinker -image_base -Xlinker %*} %<image_base*", \
218218
"%{init*:-Xlinker -init -Xlinker %*} %<init*", \
219219
"%{multi_module:-Xlinker -multi_module} %<multi_module", \
220-
"%{multiply_defined*:-Xlinker -multiply_defined -Xlinker %*} \
221-
%<multiply_defined* ", \
220+
"%{multiply_defined*:-Xlinker -multiply_defined -Xlinker %*} ", \
222221
"%{multiplydefinedunused*:\
223222
-Xlinker -multiply_defined_unused -Xlinker %*} \
224223
%<multiplydefinedunused* ", \
@@ -294,7 +293,7 @@ extern GTY(()) int darwin_ms_struct;
294293
%:version-compare(>= 10.7 mmacosx-version-min= -no_pie) }"
295294

296295
#define DARWIN_CC1_SPEC \
297-
"%<dynamic %<dynamiclib %<force_cpusubtype_ALL "
296+
"%<dynamic %<dynamiclib %<force_cpusubtype_ALL %<multiply_defined* "
298297

299298
#define SUBSUBTARGET_OVERRIDE_OPTIONS \
300299
do { \

gcc/testsuite/lib/g++.exp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,10 +285,6 @@ proc g++_init { args } {
285285
set gcc_warning_prefix "warning:"
286286
set gcc_error_prefix "(fatal )?error:"
287287

288-
if { [istarget *-*-darwin*] } {
289-
lappend ALWAYS_CXXFLAGS "ldflags=-multiply_defined suppress"
290-
}
291-
292288
verbose -log "ALWAYS_CXXFLAGS set to $ALWAYS_CXXFLAGS"
293289

294290
verbose "g++ is initialized" 3

gcc/testsuite/lib/obj-c++.exp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -277,10 +277,6 @@ proc obj-c++_init { args } {
277277
set gcc_warning_prefix "warning:"
278278
set gcc_error_prefix "(fatal )?error:"
279279

280-
if { [istarget *-*-darwin*] } {
281-
lappend ALWAYS_OBJCXXFLAGS "ldflags=-multiply_defined suppress"
282-
}
283-
284280
verbose -log "ALWAYS_OBJCXXFLAGS set to $ALWAYS_OBJCXXFLAGS"
285281

286282
verbose "obj-c++ is initialized" 3

libstdc++-v3/testsuite/lib/libstdc++.exp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,6 @@ proc libstdc++_init { testfile } {
133133
if ![info exists DEFAULT_CXXFLAGS] then {
134134
set DEFAULT_CXXFLAGS ""
135135
# Host specific goo here.
136-
if { [string match "powerpc-*-darwin*" $target_triplet] } {
137-
append DEFAULT_CXXFLAGS " -multiply_defined suppress"
138-
}
139136
if { [string match "powerpc-ibm-aix*" $target_triplet] } {
140137
append DEFAULT_CXXFLAGS " -Wl,-bmaxdata:0x20000000"
141138
}

0 commit comments

Comments
 (0)