From 21f507efad6bf16edf2432b65b763e7686349b8a Mon Sep 17 00:00:00 2001
From: Tom de Vries <tdevries@suse.de>
Date: Fri, 14 Oct 2022 13:09:51 +0200
Subject: [gdb/testsuite] Fix gdb.base/infoline-reloc-main-from-zero.exp with
 clang

With test-case gdb.base/infoline-reloc-main-from-zero.exp and clang I run into:
...
gdb compile failed, clang-13.0: warning: -e main: 'linker' input unused \
  [-Wunused-command-line-argument]
clang-13.0: warning: -Wl,-Ttext=0x00: 'linker' input unused \
  [-Wunused-command-line-argument]
clang-13.0: warning: -Wl,-N: 'linker' input unused \
  [-Wunused-command-line-argument]
UNTESTED: gdb.base/infoline-reloc-main-from-zero.exp: \
  infoline-reloc-main-from-zero.exp
UNTESTED: gdb.base/infoline-reloc-main-from-zero.exp: failed to compile
...

Fix this by using ldflags instead of additional_flags.

Likewise, fix all occurrences of:
...
$ find gdb/testsuite -name *.exp | xargs grep additional_flags.*Wl
...

Tested on x86_64-linux.
---
 gdb/testsuite/gdb.ada/inline-section-gc.exp              |  6 +++---
 gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp  |  2 +-
 gdb/testsuite/gdb.base/code_elim.exp                     |  4 ++--
 gdb/testsuite/gdb.base/dump.exp                          |  2 +-
 gdb/testsuite/gdb.base/gcore-relro.exp                   |  2 +-
 gdb/testsuite/gdb.base/gnu-ifunc.exp                     |  4 ++--
 gdb/testsuite/gdb.base/gold-gdb-index.exp                |  2 +-
 gdb/testsuite/gdb.base/index-cache.exp                   |  2 +-
 gdb/testsuite/gdb.base/infoline-reloc-main-from-zero.exp |  4 ++--
 gdb/testsuite/gdb.base/nested-subp2.exp                  |  2 +-
 gdb/testsuite/gdb.base/nested-subp3.exp                  |  2 +-
 gdb/testsuite/gdb.base/skip-solib.exp                    |  2 +-
 gdb/testsuite/gdb.dwarf2/per-bfd-sharing.exp             |  2 +-
 gdb/testsuite/gdb.reverse/solib-precsave.exp             |  2 +-
 gdb/testsuite/gdb.threads/gcore-thread.exp               |  2 +-
 gdb/testsuite/lib/gdb.exp                                | 12 ++++++------
 16 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/gdb/testsuite/gdb.ada/inline-section-gc.exp b/gdb/testsuite/gdb.ada/inline-section-gc.exp
index 1f6ef66..e1b7bb6 100644
--- a/gdb/testsuite/gdb.ada/inline-section-gc.exp
+++ b/gdb/testsuite/gdb.ada/inline-section-gc.exp
@@ -23,9 +23,9 @@ set options {
     debug
     optimize=-O2
     additional_flags=-ffunction-sections
-    additional_flags=-largs
-    additional_flags=-Wl,--gc-sections
-    additional_flags=-margs
+    ldflags=-largs
+    ldflags=-Wl,--gc-sections
+    ldflags=-margs
     additional_flags=-gnatn
 }
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable $options] != ""} {
diff --git a/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp b/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp
index b1c93f6..3435c8f 100644
--- a/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp
+++ b/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp
@@ -28,7 +28,7 @@ if { [skip_cplus_tests] } { continue }
 standard_testfile .cc
 
 if {[build_executable_from_specs $testfile.exp $testfile \
-       {c++ additional_flags=-Wl,--gc-sections} \
+       {c++ ldflags=-Wl,--gc-sections} \
        $srcfile {debug c++ additional_flags=-ffunction-sections}]} {
     untested "failed to compile"
     return -1
diff --git a/gdb/testsuite/gdb.base/code_elim.exp b/gdb/testsuite/gdb.base/code_elim.exp
index 357472e..209da03 100644
--- a/gdb/testsuite/gdb.base/code_elim.exp
+++ b/gdb/testsuite/gdb.base/code_elim.exp
@@ -25,8 +25,8 @@ set binfile2 [standard_output_file ${testfile2}]
 set opts [list debug]
 lappend opts "additional_flags=-ffunction-sections"
 lappend opts "additional_flags=-fdata-sections"
-lappend opts "additional_flags=-Wl,-gc-sections"
-lappend opts "additional_flags=-Wl,-e,main"
+lappend opts "ldflags=-Wl,-gc-sections"
+lappend opts "ldflags=-Wl,-e,main"
 
 # Place variables in .data instead of .sdata.
 if {[istarget "riscv*-*-*"]} {
diff --git a/gdb/testsuite/gdb.base/dump.exp b/gdb/testsuite/gdb.base/dump.exp
index f56fec0..c7dd1b1 100644
--- a/gdb/testsuite/gdb.base/dump.exp
+++ b/gdb/testsuite/gdb.base/dump.exp
@@ -29,7 +29,7 @@ set formats {binary ihex srec tekhex  verilog}
 if [istarget "alpha*-*-*"] then {
     # SREC etc cannot handle 64-bit addresses.  Force the test
     # program into the low 31 bits of the address space.
-    lappend options "additional_flags=-Wl,-taso"
+    lappend options "ldflags=-Wl,-taso"
 }
 
 # Runs the command 'print zero_all ()'.  Uses the PRINT_ZERO_ALL_COUNT
diff --git a/gdb/testsuite/gdb.base/gcore-relro.exp b/gdb/testsuite/gdb.base/gcore-relro.exp
index 6417ac5..4530a9d 100644
--- a/gdb/testsuite/gdb.base/gcore-relro.exp
+++ b/gdb/testsuite/gdb.base/gcore-relro.exp
@@ -29,7 +29,7 @@ set objfile [standard_output_file ${testfile}.o]
       untested "failed to compile"
       return -1
  }
- set opts [list debug shlib=${binfile_lib} additional_flags=-Wl,-z,relro]
+ set opts [list debug shlib=${binfile_lib} ldflags=-Wl,-z,relro]
  if { [gdb_compile ${objfile} ${binfile} executable $opts] != "" } {
       unsupported "-Wl,-z,relro compilation failed"
       return -1
diff --git a/gdb/testsuite/gdb.base/gnu-ifunc.exp b/gdb/testsuite/gdb.base/gnu-ifunc.exp
index 672ae85..3fbf237 100644
--- a/gdb/testsuite/gdb.base/gnu-ifunc.exp
+++ b/gdb/testsuite/gdb.base/gnu-ifunc.exp
@@ -61,8 +61,8 @@ proc build {resolver_attr resolver_debug final_debug} {
     set final_opts {}
 
     # Force lazy binding so we don't resolve everything at process startup.
-    lappend exec_opts "additional_flags=-Wl,-z,lazy"
-    lappend lib_opts "additional_flags=-Wl,-z,lazy"
+    lappend exec_opts "ldflags=-Wl,-z,lazy"
+    lappend lib_opts "ldflags=-Wl,-z,lazy"
 
     if {$resolver_attr} {
 	lappend lib_opts "additional_flags=-DIFUNC_RESOLVER_ATTR"
diff --git a/gdb/testsuite/gdb.base/gold-gdb-index.exp b/gdb/testsuite/gdb.base/gold-gdb-index.exp
index 8ccd228..6073a64 100644
--- a/gdb/testsuite/gdb.base/gold-gdb-index.exp
+++ b/gdb/testsuite/gdb.base/gold-gdb-index.exp
@@ -23,7 +23,7 @@ if { [have_fuse_ld_gold] == 0} {
 
 if {[prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2" \
 	 {debug c++ additional_flags=-fuse-ld=gold \
-	      additional_flags=-Wl,--gdb-index \
+	      ldflags=-Wl,--gdb-index \
 	      additional_flags=-ggnu-pubnames}]} {
     return -1
 }
diff --git a/gdb/testsuite/gdb.base/index-cache.exp b/gdb/testsuite/gdb.base/index-cache.exp
index f96a13a..5ecfca3 100644
--- a/gdb/testsuite/gdb.base/index-cache.exp
+++ b/gdb/testsuite/gdb.base/index-cache.exp
@@ -19,7 +19,7 @@
 standard_testfile
 
 if { [build_executable "failed to prepare" $testfile $srcfile \
-	  {debug additional_flags=-Wl,--build-id}] } {
+	  {debug ldflags=-Wl,--build-id}] } {
     return
 }
 
diff --git a/gdb/testsuite/gdb.base/infoline-reloc-main-from-zero.exp b/gdb/testsuite/gdb.base/infoline-reloc-main-from-zero.exp
index 35c2db0..c1391ee 100644
--- a/gdb/testsuite/gdb.base/infoline-reloc-main-from-zero.exp
+++ b/gdb/testsuite/gdb.base/infoline-reloc-main-from-zero.exp
@@ -27,9 +27,9 @@ standard_testfile .c
 
 set opts {}
 lappend opts debug
-lappend opts "additional_flags=-nostdlib -emain -Wl,-Ttext=0x00 -Wl,-N"
+lappend opts "ldflags=-nostdlib -emain -Wl,-Ttext=0x00 -Wl,-N"
 
-set ld_flags additional_flags=-Wl,--no-warn-rwx-segments
+set ld_flags ldflags=-Wl,--no-warn-rwx-segments
 if { [gdb_can_simple_compile ld-flags {int main () { return 0; }} executable \
 	  $ld_flags] } {
     lappend opts $ld_flags
diff --git a/gdb/testsuite/gdb.base/nested-subp2.exp b/gdb/testsuite/gdb.base/nested-subp2.exp
index 7716e7c..ac41b55 100644
--- a/gdb/testsuite/gdb.base/nested-subp2.exp
+++ b/gdb/testsuite/gdb.base/nested-subp2.exp
@@ -33,7 +33,7 @@ set flags {}
 lappend flags debug
 lappend flags additional_flags=-std=gnu99
 
-set ld_flags additional_flags=-Wl,--no-warn-execstack
+set ld_flags ldflags=-Wl,--no-warn-execstack
 if { [gdb_can_simple_compile ld-flags {int main () { return 0; }} executable \
 	  $ld_flags] } {
     lappend flags $ld_flags
diff --git a/gdb/testsuite/gdb.base/nested-subp3.exp b/gdb/testsuite/gdb.base/nested-subp3.exp
index b547b8e..d0c8583 100644
--- a/gdb/testsuite/gdb.base/nested-subp3.exp
+++ b/gdb/testsuite/gdb.base/nested-subp3.exp
@@ -33,7 +33,7 @@ set flags {}
 lappend flags debug
 lappend flags additional_flags=-std=gnu99
 
-set ld_flags additional_flags=-Wl,--no-warn-execstack
+set ld_flags ldflags=-Wl,--no-warn-execstack
 if { [gdb_can_simple_compile ld-flags {int main () { return 0; }} executable \
 	  $ld_flags] } {
     lappend flags $ld_flags
diff --git a/gdb/testsuite/gdb.base/skip-solib.exp b/gdb/testsuite/gdb.base/skip-solib.exp
index 0f2ce7e..9af39d8 100644
--- a/gdb/testsuite/gdb.base/skip-solib.exp
+++ b/gdb/testsuite/gdb.base/skip-solib.exp
@@ -54,7 +54,7 @@ set testobjdir [standard_output_file {}]
 if {[gdb_compile "${binfile_main}.o" "${binfile_main}" executable \
 	 [list debug "additional_flags=-L$testobjdir" \
 	      "additional_flags=-l${test}" \
-	      "additional_flags=-Wl,-rpath=$testobjdir"]] != ""} {
+	      "ldflags=-Wl,-rpath=$testobjdir"]] != ""} {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.dwarf2/per-bfd-sharing.exp b/gdb/testsuite/gdb.dwarf2/per-bfd-sharing.exp
index b3ec3f5..85e7936 100644
--- a/gdb/testsuite/gdb.dwarf2/per-bfd-sharing.exp
+++ b/gdb/testsuite/gdb.dwarf2/per-bfd-sharing.exp
@@ -19,7 +19,7 @@
 standard_testfile
 
 if { [build_executable "failed to prepare" $testfile $srcfile \
-	  {debug additional_flags=-Wl,--build-id}] == -1 } {
+	  {debug ldflags=-Wl,--build-id}] == -1 } {
     return
 }
 
diff --git a/gdb/testsuite/gdb.reverse/solib-precsave.exp b/gdb/testsuite/gdb.reverse/solib-precsave.exp
index 18179a5..67bb52a 100644
--- a/gdb/testsuite/gdb.reverse/solib-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/solib-precsave.exp
@@ -52,7 +52,7 @@ set exec_opts [list debug shlib=${library1} shlib=${library2}]
 # invalid core file.
 
 if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable \
-		     [concat $exec_opts additional_flags=-Wl,-z,norelro]] != ""
+		     [concat $exec_opts ldflags=-Wl,-z,norelro]] != ""
      && [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $exec_opts] != "" } {
     untested "failed to compile"
     return -1
diff --git a/gdb/testsuite/gdb.threads/gcore-thread.exp b/gdb/testsuite/gdb.threads/gcore-thread.exp
index d9820d6..748831e 100644
--- a/gdb/testsuite/gdb.threads/gcore-thread.exp
+++ b/gdb/testsuite/gdb.threads/gcore-thread.exp
@@ -35,7 +35,7 @@ if [istarget "*-*-linux"] then {
 
 set opts [list debug]
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${objfile}" object $opts] != ""
-    || ([gdb_compile_pthreads "${objfile}" "${binfile}" executable [concat $opts {additional_flags=-Wl,-z,norelro}] ] != ""
+    || ([gdb_compile_pthreads "${objfile}" "${binfile}" executable [concat $opts {ldflags=-Wl,-z,norelro}] ] != ""
         && [gdb_compile_pthreads "${objfile}" "${binfile}" executable $opts] != "") } {
     return -1
 }
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 1167aa7..bfa9fec 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -4589,7 +4589,7 @@ proc gdb_compile {source dest type options} {
                 set shlib_found 1
 		if { ([istarget "*-*-mingw*"]
 		      || [istarget *-*-cygwin*]) } {
-		    lappend new_options "additional_flags=-Wl,--enable-auto-import"
+		    lappend new_options "ldflags=-Wl,--enable-auto-import"
 		}
 		if { [test_compiler_info "gcc-*"] || [test_compiler_info "clang-*"] } {
 		    # Undo debian's change in the default.
@@ -4956,7 +4956,7 @@ proc gdb_compile_shlib_1 {sources dest options} {
 	    } else {
 		set name ${dest}
 	    }
-	    lappend link_options "additional_flags=-Wl,--out-implib,${name}.a"
+	    lappend link_options "ldflags=-Wl,--out-implib,${name}.a"
 	} else {
 	    # Set the soname of the library.  This causes the linker on ELF
 	    # systems to create the DT_NEEDED entry in the executable referring
@@ -4968,7 +4968,7 @@ proc gdb_compile_shlib_1 {sources dest options} {
 	    # rpath=$ORIGIN value when building the executable, so that it's
 	    # able to find the library in its own directory.
 	    set destbase [file tail $dest]
-	    lappend link_options "additional_flags=-Wl,-soname,$destbase"
+	    lappend link_options "ldflags=-Wl,-soname,$destbase"
 	}
     }
     if {[gdb_compile "${objects}" "${dest}" executable $link_options] != ""} {
@@ -8585,7 +8585,7 @@ gdb_caching_proc have_fuse_ld_gold {
 # Return 1 if linker supports -Ttext-segment, otherwise return 0.
 gdb_caching_proc linker_supports_Ttext_segment_flag {
     set me "linker_supports_Ttext_segment_flag"
-    set flags additional_flags="-Wl,-Ttext-segment=0x7000000"
+    set flags ldflags="-Wl,-Ttext-segment=0x7000000"
     set src { int main() { return 0; } }
     return [gdb_simple_compile $me $src executable $flags]
 }
@@ -8593,7 +8593,7 @@ gdb_caching_proc linker_supports_Ttext_segment_flag {
 # Return 1 if linker supports -Ttext, otherwise return 0.
 gdb_caching_proc linker_supports_Ttext_flag {
     set me "linker_supports_Ttext_flag"
-    set flags additional_flags="-Wl,-Ttext=0x7000000"
+    set flags ldflags="-Wl,-Ttext=0x7000000"
     set src { int main() { return 0; } }
     return [gdb_simple_compile $me $src executable $flags]
 }
@@ -8601,7 +8601,7 @@ gdb_caching_proc linker_supports_Ttext_flag {
 # Return 1 if linker supports --image-base, otherwise 0.
 gdb_caching_proc linker_supports_image_base_flag {
     set me "linker_supports_image_base_flag"
-    set flags additional_flags="-Wl,--image-base=0x7000000"
+    set flags ldflags="-Wl,--image-base=0x7000000"
     set src { int main() { return 0; } }
     return [gdb_simple_compile $me $src executable $flags]
 }
-- 
cgit v1.1