diff options
6 files changed, 81 insertions, 70 deletions
diff --git a/9999/0003-Gentoo-gold-ld-add-support-for-poisoned-system-direc.patch b/9999/0003-Gentoo-gold-ld-add-support-for-poisoned-system-direc.patch index 964946c..f7443bf 100644 --- a/9999/0003-Gentoo-gold-ld-add-support-for-poisoned-system-direc.patch +++ b/9999/0003-Gentoo-gold-ld-add-support-for-poisoned-system-direc.patch @@ -1,8 +1,11 @@ -From c251ab646d98b3f0e8f8b1ae5e94c672325477e2 Mon Sep 17 00:00:00 2001 +From 8a82f64de912f26e840b20eec9d8a463fd0e242b Mon Sep 17 00:00:00 2001 From: Mike Frysinger <vapier@gentoo.org> -Date: Tue, 10 Oct 2017 22:53:53 +0200 -Subject: [PATCH 3/9] Gentoo: gold/ld: add support for poisoned system +Date: Tue, 20 Jul 2021 21:08:31 +0200 +Subject: [PATCH 1/6] Gentoo: gold/ld: add support for poisoned system directories +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit This is based on the old CodeSourcery patch written by Joseph Myers to add support to the link for detecting & rejecting bad -L paths when using a @@ -23,6 +26,8 @@ TEST=x86_64-cros-linux-gnu-ld throws warnings when using -L/lib (gold & bfd) Reviewed-on: https://chromium-review.googlesource.com/272083 (cherry picked from commit f92dbf35c00ab13cee36f6be8ae5ca46454d9000) + +Ported to binutils 2.37 Andreas K. Hütte <dilfridge@gentoo.org> --- gold/options.cc | 33 +++++++++++++++++++++++++++++++++ gold/options.h | 7 +++++++ @@ -38,10 +43,10 @@ Reviewed-on: https://chromium-review.googlesource.com/272083 11 files changed, 146 insertions(+) diff --git a/gold/options.cc b/gold/options.cc -index 94867b361a..704d5d089e 100644 +index 5a55bd8ba6d..f7940c75f5a 100644 --- a/gold/options.cc +++ b/gold/options.cc -@@ -1290,6 +1290,39 @@ General_options::finalize() +@@ -1355,6 +1355,39 @@ General_options::finalize() // in the path, as appropriate. this->add_sysroot(); @@ -82,10 +87,10 @@ index 94867b361a..704d5d089e 100644 if (this->shared() && this->is_static()) gold_fatal(_("-shared and -static are incompatible")); diff --git a/gold/options.h b/gold/options.h -index b2059d984c..b60f802754 100644 +index 757ebf18fec..490b4cbd7d4 100644 --- a/gold/options.h +++ b/gold/options.h -@@ -1375,6 +1375,13 @@ class General_options +@@ -1394,6 +1394,13 @@ class General_options DEFINE_bool(warn_multiple_gp, options::TWO_DASHES, '\0', false, N_("Ignored"), NULL); @@ -100,10 +105,10 @@ index b2059d984c..b60f802754 100644 N_("Warn when skipping an incompatible library"), N_("Don't warn when skipping an incompatible library")); diff --git a/ld/config.in b/ld/config.in -index d93c9b0830..5da2742bea 100644 +index 26d55a00d47..ffad464783c 100644 --- a/ld/config.in +++ b/ld/config.in -@@ -31,6 +31,9 @@ +@@ -43,6 +43,9 @@ language is requested. */ #undef ENABLE_NLS @@ -114,10 +119,10 @@ index d93c9b0830..5da2742bea 100644 #undef EXTRA_SHLIB_EXTENSION diff --git a/ld/configure b/ld/configure -index e1dbc95747..460078f6e8 100755 +index c197aaef3cb..882263aa43f 100755 --- a/ld/configure +++ b/ld/configure -@@ -826,6 +826,7 @@ with_lib_path +@@ -829,6 +829,7 @@ with_lib_path enable_targets enable_64_bit_bfd with_sysroot @@ -125,8 +130,8 @@ index e1dbc95747..460078f6e8 100755 enable_gold enable_got enable_compressed_debug_sections -@@ -1491,6 +1492,8 @@ Optional Features: - --disable-largefile omit support for large files +@@ -1498,6 +1499,8 @@ Optional Features: + --enable-checking enable run-time checks --enable-targets alternative target configurations --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) + --enable-poison-system-directories @@ -134,7 +139,7 @@ index e1dbc95747..460078f6e8 100755 --enable-gold[=ARG] build gold [ARG={default,yes,no}] --enable-got=<type> GOT handling scheme (target, single, negative, multigot) -@@ -15809,7 +15812,18 @@ else +@@ -15236,7 +15239,18 @@ else fi @@ -154,10 +159,10 @@ index e1dbc95747..460078f6e8 100755 # Check whether --enable-got was given. if test "${enable_got+set}" = set; then : diff --git a/ld/configure.ac b/ld/configure.ac -index b5e849d84a..22e022ec03 100644 +index 8ea97c43cd4..0f246db67d8 100644 --- a/ld/configure.ac +++ b/ld/configure.ac -@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) +@@ -106,6 +106,16 @@ AC_SUBST(use_sysroot) AC_SUBST(TARGET_SYSTEM_ROOT) AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) @@ -175,10 +180,10 @@ index b5e849d84a..22e022ec03 100644 dnl "install_as_default" is set to false if gold is the default linker. dnl "installed_linker" is the installed BFD linker name. diff --git a/ld/ld.h b/ld/ld.h -index 71fd781267..a6ea2ae69e 100644 +index 35fafebfaed..4152278b8f4 100644 --- a/ld/ld.h +++ b/ld/ld.h -@@ -166,6 +166,13 @@ typedef struct +@@ -162,6 +162,13 @@ typedef struct in the linker script. */ bool force_group_allocation; @@ -193,10 +198,10 @@ index 71fd781267..a6ea2ae69e 100644 enum endian_enum endian; diff --git a/ld/ld.texi b/ld/ld.texi -index 621d05dc05..cbbbc687d0 100644 +index dd8f571d4e4..0aee4a4e9f1 100644 --- a/ld/ld.texi +++ b/ld/ld.texi -@@ -2609,6 +2609,24 @@ string identifying the original linked file does not change. +@@ -2863,6 +2863,24 @@ string identifying the original linked file does not change. Passing @code{none} for @var{style} disables the setting from any @code{--build-id} options earlier on the command line. @@ -222,7 +227,7 @@ index 621d05dc05..cbbbc687d0 100644 @c man end diff --git a/ld/ldfile.c b/ld/ldfile.c -index 53112c8694..eb357e66a9 100644 +index 9d0af06f1f6..f4a83acca93 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c @@ -117,6 +117,26 @@ ldfile_add_library_path (const char *name, bool cmdline) @@ -253,10 +258,10 @@ index 53112c8694..eb357e66a9 100644 /* Try to open a BFD for a lang_input_statement. */ diff --git a/ld/ldlex.h b/ld/ldlex.h -index aeaea4dfee..b8d43da37f 100644 +index 9e8bf5fb835..3baed822a22 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h -@@ -142,6 +142,9 @@ enum option_values +@@ -148,6 +148,9 @@ enum option_values OPTION_PRINT_OUTPUT_FORMAT, OPTION_PRINT_SYSROOT, OPTION_IGNORE_UNRESOLVED_SYMBOL, @@ -267,10 +272,10 @@ index aeaea4dfee..b8d43da37f 100644 OPTION_POP_STATE, OPTION_DISABLE_MULTIPLE_DEFS_ABS, diff --git a/ld/ldmain.c b/ld/ldmain.c -index c3f473f661..c45012dbbd 100644 +index 42660eb9a3c..c78009b760c 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c -@@ -273,6 +273,13 @@ main (int argc, char **argv) +@@ -321,6 +321,13 @@ main (int argc, char **argv) command_line.warn_mismatch = true; command_line.warn_search_mismatch = true; command_line.check_section_addresses = -1; @@ -285,10 +290,10 @@ index c3f473f661..c45012dbbd 100644 /* We initialize DEMANGLING based on the environment variable COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the diff --git a/ld/lexsup.c b/ld/lexsup.c -index c5edc25793..c20c0bb0d8 100644 +index 00274c500d0..a19cce9967c 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c -@@ -540,6 +540,18 @@ static const struct ld_option ld_options[] = +@@ -566,6 +566,18 @@ static const struct ld_option ld_options[] = OPTION_IGNORE_UNRESOLVED_SYMBOL}, '\0', N_("SYMBOL"), N_("Unresolved SYMBOL will not cause an error or warning"), TWO_DASHES }, @@ -307,7 +312,7 @@ index c5edc25793..c20c0bb0d8 100644 { {"push-state", no_argument, NULL, OPTION_PUSH_STATE}, '\0', NULL, N_("Push state of flags governing input file handling"), TWO_DASHES }, -@@ -1563,6 +1575,18 @@ parse_args (unsigned argc, char **argv) +@@ -1643,6 +1655,18 @@ parse_args (unsigned argc, char **argv) } break; @@ -327,5 +332,5 @@ index c5edc25793..c20c0bb0d8 100644 input_flags.pushed = xmemdup (&input_flags, sizeof (input_flags), -- -2.26.2 +2.31.1 diff --git a/9999/0004-Gentoo-libiberty-install-PIC-version-of-libiberty.a.patch b/9999/0004-Gentoo-libiberty-install-PIC-version-of-libiberty.a.patch index a7f8448..4d5ed11 100644 --- a/9999/0004-Gentoo-libiberty-install-PIC-version-of-libiberty.a.patch +++ b/9999/0004-Gentoo-libiberty-install-PIC-version-of-libiberty.a.patch @@ -1,7 +1,7 @@ -From c11463f5dbeb53c2a600a5b4a3982368ad149ba1 Mon Sep 17 00:00:00 2001 +From 6536761c1e2756ec39fdc33c400757be3744510c Mon Sep 17 00:00:00 2001 From: Mike Frysinger <vapier@gentoo.org> Date: Fri, 7 Jan 2005 00:15:53 -0500 -Subject: [PATCH 4/9] Gentoo: libiberty: install PIC version of libiberty.a +Subject: [PATCH 2/6] Gentoo: libiberty: install PIC version of libiberty.a This will install a PIC version of libiberty.a by overwriting the non-PIC version of libiberty.a while compiling. We do this because there is no @@ -18,10 +18,10 @@ general are fairly low, and we'd rather have things work for all of them. 1 file changed, 1 insertion(+) diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in -index d6b302e02f..8d84a09f1d 100644 +index d19e14a2aca..cd02be1c2fb 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in -@@ -256,6 +256,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) +@@ -257,6 +257,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) $(AR) $(AR_FLAGS) $(TARGETLIB) \ $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \ $(RANLIB) $(TARGETLIB); \ @@ -30,5 +30,5 @@ index d6b302e02f..8d84a09f1d 100644 else true; fi; \ if [ x"$(NOASANFLAG)" != x ]; then \ -- -2.26.2 +2.31.1 diff --git a/9999/0005-Gentoo-opcodes-link-against-libbfd.la-for-rpath-deps.patch b/9999/0005-Gentoo-opcodes-link-against-libbfd.la-for-rpath-deps.patch index d236727..f3c9f8e 100644 --- a/9999/0005-Gentoo-opcodes-link-against-libbfd.la-for-rpath-deps.patch +++ b/9999/0005-Gentoo-opcodes-link-against-libbfd.la-for-rpath-deps.patch @@ -1,7 +1,7 @@ -From b4c9e06c3fb0ede497bcc51dde6c9756efe124ad Mon Sep 17 00:00:00 2001 +From c55536c61ec7e4c2e983e15f51f56f7a7c340889 Mon Sep 17 00:00:00 2001 From: Mike Frysinger <vapier@gentoo.org> Date: Tue, 5 Jul 2016 20:24:00 +0545 -Subject: [PATCH 5/9] Gentoo: opcodes: link against libbfd.la for rpath deps +Subject: [PATCH 3/6] Gentoo: opcodes: link against libbfd.la for rpath deps The reason opcodes doesn't link against libbfd.la is to workaround a libtool bug where it uses installed -L paths ahead of DESTDIR paths. @@ -19,10 +19,10 @@ URL: https://bugs.gentoo.org/563934 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opcodes/configure b/opcodes/configure -index 42be5febad..7b8ee51cc3 100755 +index a3da5987f1b..22a05245286 100755 --- a/opcodes/configure +++ b/opcodes/configure -@@ -12797,7 +12797,7 @@ if test "$enable_shared" = "yes"; then +@@ -12142,7 +12142,7 @@ if test "$enable_shared" = "yes"; then SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.sl ${SHARED_LIBADD}" ;; *) @@ -32,10 +32,10 @@ index 42be5febad..7b8ee51cc3 100755 esac SHARED_DEPENDENCIES="../bfd/libbfd.la" diff --git a/opcodes/configure.ac b/opcodes/configure.ac -index 00be9c88be..b7a511ac58 100644 +index e564f067334..fb6254cd69d 100644 --- a/opcodes/configure.ac +++ b/opcodes/configure.ac -@@ -188,7 +188,7 @@ changequote([,])dnl +@@ -203,7 +203,7 @@ if test "$enable_shared" = "yes"; then SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.sl ${SHARED_LIBADD}" ;; *) @@ -45,5 +45,5 @@ index 00be9c88be..b7a511ac58 100644 esac SHARED_DEPENDENCIES="../bfd/libbfd.la" -- -2.26.2 +2.31.1 diff --git a/9999/0006-Gentoo-add-with-extra-soversion-suffix-option.patch b/9999/0006-Gentoo-add-with-extra-soversion-suffix-option.patch index d7f696c..1051543 100644 --- a/9999/0006-Gentoo-add-with-extra-soversion-suffix-option.patch +++ b/9999/0006-Gentoo-add-with-extra-soversion-suffix-option.patch @@ -1,7 +1,10 @@ -From eefafabed03c163287326afaadc4cc0e5840ea7b Mon Sep 17 00:00:00 2001 +From 235f1f862fb9bf77e2b9f62c24db0ca801c4a057 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich <slyfox@gentoo.org> -Date: Wed, 12 Sep 2018 23:44:29 +0100 -Subject: [PATCH 6/9] Gentoo: add --with-extra-soversion-suffix= option +Date: Tue, 20 Jul 2021 21:12:38 +0200 +Subject: [PATCH 4/6] Gentoo: add --with-extra-soversion-suffix= option +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit --with-extra-soversion-suffix= will allow Gentoo to distinct libbfd.so and libopcodes.so to have more precise @@ -21,6 +24,8 @@ built with different flags (see https://bugs.gentoo.org/663690). Bug: https://bugs.gentoo.org/666100 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> + +Ported to binutils 2.37 Andreas K. Hüttel <dilfridge@gentoo.org> --- bfd/Makefile.am | 5 +++++ bfd/Makefile.in | 4 ++++ @@ -29,7 +34,7 @@ Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> 4 files changed, 29 insertions(+) diff --git a/bfd/Makefile.am b/bfd/Makefile.am -index b6088a3c4a..3f5cf81ca4 100644 +index ed2f701805d..dab3bfc8ed7 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -59,6 +59,8 @@ bfdinclude_HEADERS += $(INCDIR)/plugin-api.h @@ -41,7 +46,7 @@ index b6088a3c4a..3f5cf81ca4 100644 # bfd.h goes here, for now BFD_H = bfd.h -@@ -958,6 +960,9 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in +@@ -952,6 +954,9 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\ bfd_soversion="$(VERSION).$${bfd_version_date}" ;\ fi ;\ @@ -52,7 +57,7 @@ index b6088a3c4a..3f5cf81ca4 100644 -e "s,@bfd_version_string@,$$bfd_version_string," \ -e "s,@bfd_version_package@,$$bfd_version_package," \ diff --git a/bfd/Makefile.in b/bfd/Makefile.in -index dd3474d92b..911232212b 100644 +index 12807d99760..572df143487 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -318,6 +318,7 @@ ECHO_T = @ECHO_T@ @@ -63,7 +68,7 @@ index dd3474d92b..911232212b 100644 FGREP = @FGREP@ GENCAT = @GENCAT@ GMSGFMT = @GMSGFMT@ -@@ -2071,6 +2072,9 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in +@@ -2063,6 +2064,9 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\ bfd_soversion="$(VERSION).$${bfd_version_date}" ;\ fi ;\ @@ -74,7 +79,7 @@ index dd3474d92b..911232212b 100644 -e "s,@bfd_version_string@,$$bfd_version_string," \ -e "s,@bfd_version_package@,$$bfd_version_package," \ diff --git a/bfd/configure b/bfd/configure -index 59b867bbbf..fa34069f2a 100755 +index 41586f00f93..f0acf160913 100755 --- a/bfd/configure +++ b/bfd/configure @@ -696,6 +696,7 @@ WARN_CFLAGS @@ -85,7 +90,7 @@ index 59b867bbbf..fa34069f2a 100755 DEBUGDIR PLUGINS_FALSE PLUGINS_TRUE -@@ -833,6 +834,7 @@ enable_secureplt +@@ -835,6 +836,7 @@ enable_secureplt enable_separate_code enable_leading_mingw64_underscores with_separate_debug_dir @@ -93,7 +98,7 @@ index 59b867bbbf..fa34069f2a 100755 with_pkgversion with_bugurl enable_werror -@@ -1508,6 +1510,8 @@ Optional Packages: +@@ -1511,6 +1513,8 @@ Optional Packages: --with-separate-debug-dir=DIR Look for global separate debug info in DIR [[default=LIBDIR/debug]] @@ -102,7 +107,7 @@ index 59b867bbbf..fa34069f2a 100755 --with-pkgversion=PKG Use PKG in the version string in place of "GNU Binutils" --with-bugurl=URL Direct users to URL to report a bug -@@ -12516,6 +12520,15 @@ fi +@@ -11913,6 +11917,15 @@ fi @@ -119,10 +124,10 @@ index 59b867bbbf..fa34069f2a 100755 # Check whether --with-pkgversion was given. diff --git a/bfd/configure.ac b/bfd/configure.ac -index 0528e54c3b..50b2b4e06e 100644 +index fec067b2135..8c9ef9a04c0 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac -@@ -133,6 +133,13 @@ AC_ARG_WITH(separate-debug-dir, +@@ -169,6 +169,13 @@ AC_ARG_WITH(separate-debug-dir, [DEBUGDIR="${withval}"]) AC_SUBST(DEBUGDIR) @@ -134,8 +139,8 @@ index 0528e54c3b..50b2b4e06e 100644 +AC_SUBST(EXTRA_SOVERSION_SUFFIX) + ACX_PKGVERSION([GNU Binutils]) - ACX_BUGURL([http://www.sourceware.org/bugzilla/]) + ACX_BUGURL([https://www.sourceware.org/bugzilla/]) -- -2.26.2 +2.31.1 diff --git a/9999/0007-Gentoo-ld-enable-new-dtags-by-default-for-linux-gnu-.patch b/9999/0007-Gentoo-ld-enable-new-dtags-by-default-for-linux-gnu-.patch index f16e13d..c6e5299 100644 --- a/9999/0007-Gentoo-ld-enable-new-dtags-by-default-for-linux-gnu-.patch +++ b/9999/0007-Gentoo-ld-enable-new-dtags-by-default-for-linux-gnu-.patch @@ -1,7 +1,8 @@ -From 7cefac2aa8ff79d6e2eff1fb4c94346314563fc8 Mon Sep 17 00:00:00 2001 +From f4ecba77ec1eb0576b8731c749336ea3889eba73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org> Date: Sun, 13 Oct 2019 05:25:28 +0200 -Subject: [PATCH] Gentoo: ld: enable new dtags by default for linux/gnu targets +Subject: [PATCH 5/6] Gentoo: ld: enable new dtags by default for linux/gnu + targets Original author: Mike Frysinger <vapier@gentoo.org> @@ -23,7 +24,7 @@ and GNU targets, enable them by default. 1 file changed, 10 insertions(+) diff --git a/ld/emultempl/elf.em b/ld/emultempl/elf.em -index 356f34538b..579e52253e 100644 +index bfaf8130a3e..c4c42b7371a 100644 --- a/ld/emultempl/elf.em +++ b/ld/emultempl/elf.em @@ -81,6 +81,16 @@ gld${EMULATION_NAME}_before_parse (void) @@ -44,5 +45,5 @@ index 356f34538b..579e52253e 100644 EOF if test -n "$COMMONPAGESIZE"; then -- -2.26.2 +2.31.1 diff --git a/9999/0009-Gentoo-Pass-hash-style-sysv.patch b/9999/0009-Gentoo-Pass-hash-style-sysv.patch index 7610d78..41b6a33 100644 --- a/9999/0009-Gentoo-Pass-hash-style-sysv.patch +++ b/9999/0009-Gentoo-Pass-hash-style-sysv.patch @@ -1,7 +1,7 @@ -From 2055e278cb6e984760dbf8627efef2158e215449 Mon Sep 17 00:00:00 2001 +From 905bf3c180f4f7fd07024eb9ff7851898593f3f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org> -Date: Wed, 18 Oct 2017 00:44:49 +0200 -Subject: Gentoo: Pass --hash-style=sysv to ld in the testsuite +Date: Tue, 20 Jul 2021 21:15:24 +0200 +Subject: [PATCH 6/6] Gentoo: Pass --hash-style=sysv to ld in the testsuite --- binutils/testsuite/lib/binutils-common.exp | 2 +- @@ -9,10 +9,10 @@ Subject: Gentoo: Pass --hash-style=sysv to ld in the testsuite 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/binutils/testsuite/lib/binutils-common.exp b/binutils/testsuite/lib/binutils-common.exp -index b9e3c6d817..bb4ef987b3 100644 +index 59e25df99b0..401a05b5c32 100644 --- a/binutils/testsuite/lib/binutils-common.exp +++ b/binutils/testsuite/lib/binutils-common.exp -@@ -1125,7 +1125,7 @@ proc run_dump_test { name {extra_options {}} } { +@@ -1279,7 +1279,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. @@ -20,12 +20,12 @@ index b9e3c6d817..bb4ef987b3 100644 + 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. + # 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 015eda6eb9..0b945b539d 100644 +index 8fd14afc63e..adbeaa3bd08 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp -@@ -165,7 +165,7 @@ proc default_ld_relocate { ld target objects } { +@@ -167,7 +167,7 @@ proc default_ld_relocate { ld target objects } { global HOSTING_EMU remote_file host delete $target @@ -34,7 +34,7 @@ index 015eda6eb9..0b945b539d 100644 } # Check to see if ld is being invoked with a non-endian output format -@@ -196,8 +196,20 @@ proc default_ld_link { ld target objects } { +@@ -198,8 +198,20 @@ proc default_ld_link { ld target objects } { set flags [big_or_little_endian] } @@ -57,5 +57,5 @@ index 015eda6eb9..0b945b539d 100644 # We don't care if we get a warning about a non-existent start -- -2.26.2 +2.31.1 |