diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2021-07-20 21:15:24 +0200 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2023-07-30 17:08:00 +0200 |
| commit | 6c1949bf6986f9b270acf5fb15526e530148ed22 (patch) | |
| tree | a938d7fe6fe4ee4507297c8ca46f76121d4653e4 | |
| parent | Gentoo: add --with-extra-soversion-suffix= option (diff) | |
| download | binutils-gdb-6c1949bf6986f9b270acf5fb15526e530148ed22.tar.gz binutils-gdb-6c1949bf6986f9b270acf5fb15526e530148ed22.tar.bz2 binutils-gdb-6c1949bf6986f9b270acf5fb15526e530148ed22.zip | |
Gentoo: Pass --hash-style=sysv to ld in the testsuite
| -rw-r--r-- | binutils/testsuite/lib/binutils-common.exp | 2 | ||||
| -rw-r--r-- | ld/testsuite/lib/ld-lib.exp | 16 |
2 files changed, 15 insertions, 3 deletions
diff --git a/binutils/testsuite/lib/binutils-common.exp b/binutils/testsuite/lib/binutils-common.exp index 7e6bf16ee6e..0491fff2883 100644 --- a/binutils/testsuite/lib/binutils-common.exp +++ b/binutils/testsuite/lib/binutils-common.exp @@ -1354,7 +1354,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 $ld_extra_opt $LDFLAGS -L$srcdir/$subdir \ + set cmd "$LD --hash-style=sysv $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 918464069a9..7d22ee70b27 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 -o $target -r $objects"] + return [run_host_cmd_yesno "$ld" "$HOSTING_EMU --hash-style=sysv -o $target -r $objects"] } # Check to see if ld is being invoked with a non-endian output format @@ -202,8 +202,20 @@ 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" "$flags -o $target $objects"] + set exec_output [run_host_cmd "$ld" "$gentoosysv $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 |