From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id D78DE385828D for ; Fri, 14 Oct 2022 11:10:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D78DE385828D Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 18DD41F383 for ; Fri, 14 Oct 2022 11:10:58 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id F036D13451 for ; Fri, 14 Oct 2022 11:10:57 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id W412OcFDSWOeWgAAMHmgww (envelope-from ) for ; Fri, 14 Oct 2022 11:10:57 +0000 Date: Fri, 14 Oct 2022 13:10:56 +0200 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [committed][gdb/testsuite] Fix gdb.base/infoline-reloc-main-from-zero.exp with clang Message-ID: <20221014111054.GA11236@delia.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Oct 2022 11:11:02 -0000 Hi, 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. Committed to trunk. Thanks, - Tom [gdb/testsuite] Fix gdb.base/infoline-reloc-main-from-zero.exp with clang --- 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 1f6ef667a87..e1b7bb616b7 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 b1c93f61c8c..3435c8f19ff 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 357472ee9fc..209da0366b4 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 f56fec05d94..c7dd1b139fc 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 6417ac5b143..4530a9d094a 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 672ae85a218..3fbf237c71c 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 8ccd2288d7f..6073a64d0a1 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 f96a13ae176..5ecfca3c216 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 35c2db00c07..c1391ee22c9 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 7716e7c8ace..ac41b55ffdc 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 b547b8efd35..d0c8583ebf0 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 0f2ce7e1ad8..9af39d829c0 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 b3ec3f58e38..85e79367f8d 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 18179a5b03f..67bb52addeb 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 d9820d635a0..748831ed28e 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 1167aa73e2c..bfa9fec628e 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] }