diff options
| author | Iain Sandoe <iain@sandoe.co.uk> | 2022-06-19 20:47:43 +0100 |
|---|---|---|
| committer | Iain Sandoe <iains@gcc.gnu.org> | 2025-07-07 13:18:06 +0100 |
| commit | 3290af072f4c6798988e8325084cd0e969ad28d8 (patch) | |
| tree | 7902cb90a182a4ac1e0a84db4904cf5d00a41e14 | |
| parent | 486c32501aafce188649da2c234229dfbd2fd202 (diff) | |
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 <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.
(cherry picked from commit 3c776fdf1a825818ad7248d442e846f532574ff7)
| -rw-r--r-- | gcc/config/darwin.h | 3 | ||||
| -rw-r--r-- | gcc/testsuite/lib/g++.exp | 4 | ||||
| -rw-r--r-- | gcc/testsuite/lib/obj-c++.exp | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/lib/libstdc++.exp | 3 |
4 files changed, 1 insertions, 13 deletions
diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h index a967f7bb814..23708861166 100644 --- a/gcc/config/darwin.h +++ b/gcc/config/darwin.h @@ -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* ", \ diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp index 24ef068b239..f9ec9a1904d 100644 --- a/gcc/testsuite/lib/g++.exp +++ b/gcc/testsuite/lib/g++.exp @@ -281,10 +281,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 diff --git a/gcc/testsuite/lib/obj-c++.exp b/gcc/testsuite/lib/obj-c++.exp index fe941587841..103c04a88e6 100644 --- a/gcc/testsuite/lib/obj-c++.exp +++ b/gcc/testsuite/lib/obj-c++.exp @@ -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 diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index 789d0fce549..b5efe1695fa 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -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" } |