diff options
| author | Iain Sandoe <iain@sandoe.co.uk> | 2022-06-19 20:47:43 +0100 |
|---|---|---|
| committer | Iain Sandoe <iain@sandoe.co.uk> | 2023-07-03 20:15:14 +0100 |
| commit | 3c776fdf1a825818ad7248d442e846f532574ff7 (patch) | |
| tree | b84e106c4c3750de56db500130f3c1e536adf6ae /gcc | |
| parent | 9a856f67ee2f13ea1b17ca79e71b1d10ca03afa4 (diff) | |
| download | gcc-3c776fdf1a825818ad7248d442e846f532574ff7.zip gcc-3c776fdf1a825818ad7248d442e846f532574ff7.tar.gz gcc-3c776fdf1a825818ad7248d442e846f532574ff7.tar.bz2 | |
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.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/config/darwin.h | 5 | ||||
| -rw-r--r-- | gcc/testsuite/lib/g++.exp | 4 | ||||
| -rw-r--r-- | gcc/testsuite/lib/obj-c++.exp | 4 |
3 files changed, 2 insertions, 11 deletions
diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h index e6f76e5..714d3d5 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* ", \ @@ -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 { \ diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp index e759f76..db6e5b8 100644 --- a/gcc/testsuite/lib/g++.exp +++ b/gcc/testsuite/lib/g++.exp @@ -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 diff --git a/gcc/testsuite/lib/obj-c++.exp b/gcc/testsuite/lib/obj-c++.exp index 51268fd..98f1e5c 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 |