diff options
author | Andreas K. Hüttel <dilfridge@gentoo.org> | 2024-06-29 18:13:27 +0200 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2024-06-29 18:13:27 +0200 |
commit | 2d1ba2fd5386f25f0f8940e470bc02edef4e4e1d (patch) | |
tree | ff14c9851e123e5347ca955991a7632f4d16a56f | |
parent | Revert "Gentoo: gold/ld: add support for poisoned system directories" (diff) | |
download | binutils-gdb-2d1ba2fd5386f25f0f8940e470bc02edef4e4e1d.tar.gz binutils-gdb-2d1ba2fd5386f25f0f8940e470bc02edef4e4e1d.tar.bz2 binutils-gdb-2d1ba2fd5386f25f0f8940e470bc02edef4e4e1d.zip |
Revert "Gentoo: Pass --hash-style=sysv to ld in the testsuite"gentoo/binutils-2.42-5
Hopefully not needed anymore
This reverts commit 936328451bc6cc46a3077a9b4eece4033edd5eec.
-rw-r--r-- | binutils/testsuite/lib/binutils-common.exp | 2 | ||||
-rw-r--r-- | ld/testsuite/lib/ld-lib.exp | 16 |
2 files changed, 3 insertions, 15 deletions
diff --git a/binutils/testsuite/lib/binutils-common.exp b/binutils/testsuite/lib/binutils-common.exp index 0e1fc925441..dc140f8a922 100644 --- a/binutils/testsuite/lib/binutils-common.exp +++ b/binutils/testsuite/lib/binutils-common.exp @@ -1340,7 +1340,7 @@ proc run_dump_test { name {extra_options {}} } { # Add -L$srcdir/$subdir so that the linker command can use # linker scripts in the source directory. - set cmd "$LD --hash-style=sysv $ld_extra_opt $LDFLAGS -L$srcdir/$subdir \ + set cmd "$LD $ld_extra_opt $LDFLAGS -L$srcdir/$subdir \ $opts(ld) -o $objfile $objfiles $opts(ld_after_inputfiles)" # If needed then check for, or add a -Map option. diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index b1164e9a96f..e6e643ca3ca 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp @@ -171,7 +171,7 @@ proc default_ld_relocate { ld target objects } { global HOSTING_EMU remote_file host delete $target - return [run_host_cmd_yesno "$ld" "$HOSTING_EMU --hash-style=sysv -o $target -r $objects"] + return [run_host_cmd_yesno "$ld" "$HOSTING_EMU -o $target -r $objects"] } # Check to see if ld is being invoked with a non-endian output format @@ -202,20 +202,8 @@ proc default_ld_link { ld target objects } { set flags [big_or_little_endian] } - # Hilariously, this procedure is called sometimes with $CC and sometimes - # with $ld as parameter. If we want to change the default behaviour, we - # need to take the different option formats into account. - # We check the $ld parameter for - # - ld-new -> we're working with the new linker - # - otherwise -> we're likely working with the system compiler - if {[regexp {ld-new$} $ld]} { - set gentoosysv "--hash-style=sysv" - } else { - set gentoosysv "-Wl,--hash-style=sysv" - } - remote_file host delete $target - set exec_output [run_host_cmd "$ld" "$gentoosysv $flags -o $target $objects"] + set exec_output [run_host_cmd "$ld" "$flags -o $target $objects"] set exec_output [prune_warnings $exec_output] # We don't care if we get a warning about a non-existent start |