[gcc r11-11332] testsuite, Darwin: Remove an unnecessary flags addition.

[Iain D Sandoe via Libstdc++-cvs]

https://gcc.gnu.org/g:b4ad231ce26a66a9e11f246df2c602626d99fc6a

commit r11-11332-gb4ad231ce26a66a9e11f246df2c602626d99fc6a
Author: Iain Sandoe <i...@sandoe.co.uk>
Date:   Sun Jun 19 20:47:43 2022 +0100

    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 <i...@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)

Diff:
---
 gcc/config/darwin.h                      | 5 ++---
 gcc/testsuite/lib/g++.exp                | 4 ----
 gcc/testsuite/lib/obj-c++.exp            | 4 ----
 libstdc++-v3/testsuite/lib/libstdc++.exp | 3 ---
 4 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index 504dfcec4da..b2bd33f8d4a 100644
--- a/gcc/config/darwin.h
+++ b/gcc/config/darwin.h
@@ -215,8 +215,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* ",                                       \
@@ -288,7 +287,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 eea79001d99..70e5d8f833f 100644
--- a/gcc/testsuite/lib/g++.exp
+++ b/gcc/testsuite/lib/g++.exp
@@ -277,10 +277,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 2ba252d4277..3ba45a6dc9a 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 33ba0177db3..527d6ba0711 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"
        }