diff options
author | 2024-06-28 23:48:16 +0200 | |
---|---|---|
committer | 2024-06-28 23:48:16 +0200 | |
commit | cf4082117e6e8e456dd2e4d92b3d1a50d38ce2c5 (patch) | |
tree | 12da69abdfcf50220e43fb481c4fda1b7c43cec7 | |
parent | 9999: rebase patches (diff) | |
download | binutils-patches-cf4082117e6e8e456dd2e4d92b3d1a50d38ce2c5.tar.gz binutils-patches-cf4082117e6e8e456dd2e4d92b3d1a50d38ce2c5.tar.bz2 binutils-patches-cf4082117e6e8e456dd2e4d92b3d1a50d38ce2c5.zip |
Rebase patches for master
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
7 files changed, 89 insertions, 89 deletions
diff --git a/9999/0001-Gentoo-gold-ld-add-support-for-poisoned-system-direc.patch b/9999/0001-Gentoo-gold-ld-add-support-for-poisoned-system-direc.patch index e054415..f11678e 100644 --- a/9999/0001-Gentoo-gold-ld-add-support-for-poisoned-system-direc.patch +++ b/9999/0001-Gentoo-gold-ld-add-support-for-poisoned-system-direc.patch @@ -1,4 +1,4 @@ -From 7b47d0be518ef97bb5259a5dbb70d6b3f22011f6 Mon Sep 17 00:00:00 2001 +From 68b26b5bf2047d71fac89ee321c0f9231c85903e Mon Sep 17 00:00:00 2001 From: Mike Frysinger <vapier@gentoo.org> Date: Tue, 20 Jul 2021 21:08:31 +0200 Subject: [PATCH 1/7] Gentoo: gold/ld: add support for poisoned system @@ -44,7 +44,7 @@ Ported to binutils 2.39 by WANG Xuerui <xen0n@gentoo.org> 11 files changed, 148 insertions(+) diff --git a/gold/options.cc b/gold/options.cc -index c9834b66159..bd3e948a61b 100644 +index 46f067fa72f..a07ba1c82ed 100644 --- a/gold/options.cc +++ b/gold/options.cc @@ -1355,6 +1355,39 @@ General_options::finalize() @@ -88,7 +88,7 @@ index c9834b66159..bd3e948a61b 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 46f658f23ea..8f9b8c177ad 100644 +index 446e8d42614..464863b45fa 100644 --- a/gold/options.h +++ b/gold/options.h @@ -1402,6 +1402,13 @@ class General_options @@ -106,10 +106,10 @@ index 46f658f23ea..8f9b8c177ad 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 a453c7f7241..a0bc2a56013 100644 +index f7c9da3d02a..e4fdbf6db5b 100644 --- a/ld/config.in +++ b/ld/config.in -@@ -58,6 +58,9 @@ +@@ -74,6 +74,9 @@ language is requested. */ #undef ENABLE_NLS @@ -120,10 +120,10 @@ index a453c7f7241..a0bc2a56013 100644 #undef EXTRA_SHLIB_EXTENSION diff --git a/ld/configure b/ld/configure -index d2cdf256b89..0f32e98bc34 100755 +index 4e8de840418..f6d3069133e 100755 --- a/ld/configure +++ b/ld/configure -@@ -838,6 +838,7 @@ with_lib_path +@@ -844,6 +844,7 @@ with_lib_path enable_targets enable_64_bit_bfd with_sysroot @@ -131,7 +131,7 @@ index d2cdf256b89..0f32e98bc34 100755 enable_gold enable_got enable_compressed_debug_sections -@@ -1520,6 +1521,8 @@ Optional Features: +@@ -1535,6 +1536,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) @@ -140,7 +140,7 @@ index d2cdf256b89..0f32e98bc34 100755 --enable-gold[=ARG] build gold [ARG={default,yes,no}] --enable-got=<type> GOT handling scheme (target, single, negative, multigot) -@@ -15538,6 +15541,19 @@ fi +@@ -15566,6 +15569,19 @@ fi @@ -161,10 +161,10 @@ index d2cdf256b89..0f32e98bc34 100755 if test "${enable_gold+set}" = set; then : enableval=$enable_gold; case "${enableval}" in diff --git a/ld/configure.ac b/ld/configure.ac -index c3ebd3ec7e4..71790d7640f 100644 +index bdf51a062fa..3d370ff92ce 100644 --- a/ld/configure.ac +++ b/ld/configure.ac -@@ -103,6 +103,16 @@ AC_SUBST(use_sysroot) +@@ -102,6 +102,16 @@ AC_SUBST(use_sysroot) AC_SUBST(TARGET_SYSTEM_ROOT) AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) @@ -182,10 +182,10 @@ index c3ebd3ec7e4..71790d7640f 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 a0f8a15c7a9..69420b6673a 100644 +index 0dee944cf2a..a2bb9a10993 100644 --- a/ld/ld.h +++ b/ld/ld.h -@@ -163,6 +163,13 @@ typedef struct +@@ -166,6 +166,13 @@ typedef struct in the linker script. */ bool force_group_allocation; @@ -200,10 +200,10 @@ index a0f8a15c7a9..69420b6673a 100644 enum endian_enum endian; diff --git a/ld/ld.texi b/ld/ld.texi -index 1f56ded1041..1fa6bf7b225 100644 +index 89e3913317a..cd16eb9685e 100644 --- a/ld/ld.texi +++ b/ld/ld.texi -@@ -3070,6 +3070,24 @@ creation of the metadata note, if one had been enabled by an earlier +@@ -3245,6 +3245,24 @@ creation of the metadata note, if one had been enabled by an earlier occurrence of the --package-metadata option. If the linker has been built with libjansson, then the JSON string will be validated. @@ -229,15 +229,14 @@ index 1f56ded1041..1fa6bf7b225 100644 @c man end diff --git a/ld/ldfile.c b/ld/ldfile.c -index 8f869c1f19e..ee9d4bccee2 100644 +index 87be885d31a..469ab52f985 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c -@@ -327,6 +327,26 @@ ldfile_add_library_path (const char *name, bool cmdline) - new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); - else - new_dirs->name = xstrdup (name); -+ -+ if (command_line.warn_poison_system_directories +@@ -344,6 +344,26 @@ ldfile_add_library_path (const char *name, enum search_dir_source source) + search_tail_ptr = &new_dirs->next; + } + ++ if (command_line.warn_poison_system_directories + && (!strncmp (name, "/lib", 4) + /* TODO: This check is disabled for now due to a bunch of packages that + * use libtool and relink with -L/usr/lib paths (albeit after the right @@ -245,25 +244,26 @@ index 8f869c1f19e..ee9d4bccee2 100644 + * We also need to adjust it so it only rejects one or two levels deep. + * Gcc's internal paths also live below /usr/lib. + * http://crbug.com/488360 */ -+ /* || !strncmp (name, "/usr/lib", 8) */ -+ || !strncmp (name, "/usr/local/lib", 14) -+ || !strncmp (name, "/usr/X11R6/lib", 14))) ++ /* || !strncmp (name, "/usr/lib", 8) */ ++ || !strncmp (name, "/usr/local/lib", 14) ++ || !strncmp (name, "/usr/X11R6/lib", 14))) + { + if (command_line.error_poison_system_directories) -+ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); ++ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); + else -+ einfo (_("%P: warning: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); ++ einfo (_("%P: warning: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); + } ++ + return new_dirs; } - /* Try to open a BFD for a lang_input_statement. */ diff --git a/ld/ldlex.h b/ld/ldlex.h -index 87cac02141d..d79ec8faa15 100644 +index defe3fcbbb9..ab94487edc6 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h -@@ -151,6 +151,9 @@ enum option_values +@@ -153,6 +153,9 @@ enum option_values OPTION_PRINT_OUTPUT_FORMAT, OPTION_PRINT_SYSROOT, OPTION_IGNORE_UNRESOLVED_SYMBOL, @@ -274,10 +274,10 @@ index 87cac02141d..d79ec8faa15 100644 OPTION_POP_STATE, OPTION_DISABLE_MULTIPLE_DEFS_ABS, diff --git a/ld/ldmain.c b/ld/ldmain.c -index 06ac2c64fa8..5ec931a0255 100644 +index 037099b9d37..552a191a857 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c -@@ -325,6 +325,13 @@ main (int argc, char **argv) +@@ -347,6 +347,13 @@ main (int argc, char **argv) command_line.warn_mismatch = true; command_line.warn_search_mismatch = true; command_line.check_section_addresses = -1; @@ -292,10 +292,10 @@ index 06ac2c64fa8..5ec931a0255 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 49dfc13382a..b2d1d967aa0 100644 +index 4aa0124ce2f..e8e28ac7ea4 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c -@@ -594,6 +594,18 @@ static const struct ld_option ld_options[] = +@@ -613,6 +613,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 }, @@ -314,7 +314,7 @@ index 49dfc13382a..b2d1d967aa0 100644 { {"push-state", no_argument, NULL, OPTION_PUSH_STATE}, '\0', NULL, N_("Push state of flags governing input file handling"), TWO_DASHES }, -@@ -1738,6 +1750,18 @@ parse_args (unsigned argc, char **argv) +@@ -1785,6 +1797,18 @@ parse_args (unsigned argc, char **argv) } break; @@ -334,5 +334,5 @@ index 49dfc13382a..b2d1d967aa0 100644 input_flags.pushed = xmemdup (&input_flags, sizeof (input_flags), -- -2.42.0 +2.44.2 diff --git a/9999/0002-Gentoo-libiberty-install-PIC-version-of-libiberty.a.patch b/9999/0002-Gentoo-libiberty-install-PIC-version-of-libiberty.a.patch index d428c20..a36bb51 100644 --- a/9999/0002-Gentoo-libiberty-install-PIC-version-of-libiberty.a.patch +++ b/9999/0002-Gentoo-libiberty-install-PIC-version-of-libiberty.a.patch @@ -1,4 +1,4 @@ -From 1156f7b2f690654cf5810ef1e34791d18d207a9f Mon Sep 17 00:00:00 2001 +From 1594a93229b13d3c34c679e5991e64663cace1b9 Mon Sep 17 00:00:00 2001 From: Mike Frysinger <vapier@gentoo.org> Date: Fri, 7 Jan 2005 00:15:53 -0500 Subject: [PATCH 2/7] Gentoo: libiberty: install PIC version of libiberty.a @@ -18,7 +18,7 @@ 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 f9fbba23e2c..d37488d1bf8 100644 +index b77a41c781c..5e3725d16ff 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in @@ -258,6 +258,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) @@ -30,5 +30,5 @@ index f9fbba23e2c..d37488d1bf8 100644 else true; fi; \ if [ x"$(NOASANFLAG)" != x ]; then \ -- -2.42.0 +2.44.2 diff --git a/9999/0003-Gentoo-add-with-extra-soversion-suffix-option.patch b/9999/0003-Gentoo-add-with-extra-soversion-suffix-option.patch index d4d4571..3694049 100644 --- a/9999/0003-Gentoo-add-with-extra-soversion-suffix-option.patch +++ b/9999/0003-Gentoo-add-with-extra-soversion-suffix-option.patch @@ -1,4 +1,4 @@ -From 411d52402227b6e1a9c779988f6f0fc1e17c6620 Mon Sep 17 00:00:00 2001 +From 6d6cbf2ede96fd65bd7a9382c3364aaa9d0ac3bb Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich <slyfox@gentoo.org> Date: Tue, 20 Jul 2021 21:12:38 +0200 Subject: [PATCH 3/7] Gentoo: add --with-extra-soversion-suffix= option @@ -34,7 +34,7 @@ Ported to binutils 2.37 by Andreas K. Hüttel <dilfridge@gentoo.org> 4 files changed, 29 insertions(+) diff --git a/bfd/Makefile.am b/bfd/Makefile.am -index 378c13198d6..e0fa379ca8e 100644 +index 0dc733eaba9..5bd636d931a 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -64,6 +64,8 @@ bfdinclude_HEADERS += $(INCDIR)/plugin-api.h @@ -46,7 +46,7 @@ index 378c13198d6..e0fa379ca8e 100644 # bfd.h goes here, for now BFD_H = bfd.h -@@ -991,6 +993,9 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in +@@ -999,6 +1001,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 ;\ @@ -57,10 +57,10 @@ index 378c13198d6..e0fa379ca8e 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 8d09f6fa4af..d397502bb4d 100644 +index b3d97d478ea..38209d1b234 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in -@@ -342,6 +342,7 @@ ECHO_T = @ECHO_T@ +@@ -348,6 +348,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@ @@ -68,7 +68,7 @@ index 8d09f6fa4af..d397502bb4d 100644 FGREP = @FGREP@ GENCAT = @GENCAT@ GMSGFMT = @GMSGFMT@ -@@ -2454,6 +2455,9 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in +@@ -2471,6 +2472,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 ;\ @@ -79,10 +79,10 @@ index 8d09f6fa4af..d397502bb4d 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 f0a07ff675f..2322e9b61cf 100755 +index 6458974951e..b43789851cd 100755 --- a/bfd/configure +++ b/bfd/configure -@@ -695,6 +695,7 @@ WARN_CFLAGS +@@ -701,6 +701,7 @@ WARN_CFLAGS REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION @@ -90,7 +90,7 @@ index f0a07ff675f..2322e9b61cf 100755 DEBUGDIR ENABLE_BFD_64_BIT_FALSE ENABLE_BFD_64_BIT_TRUE -@@ -836,6 +837,7 @@ enable_secureplt +@@ -842,6 +843,7 @@ enable_secureplt enable_separate_code enable_leading_mingw64_underscores with_separate_debug_dir @@ -98,7 +98,7 @@ index f0a07ff675f..2322e9b61cf 100755 with_pkgversion with_bugurl enable_werror -@@ -1518,6 +1520,8 @@ Optional Packages: +@@ -1530,6 +1532,8 @@ Optional Packages: --with-separate-debug-dir=DIR Look for global separate debug info in DIR [[default=LIBDIR/debug]] @@ -107,7 +107,7 @@ index f0a07ff675f..2322e9b61cf 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 -@@ -12064,6 +12068,15 @@ fi +@@ -12082,6 +12086,15 @@ fi @@ -124,10 +124,10 @@ index f0a07ff675f..2322e9b61cf 100755 # Check whether --with-pkgversion was given. diff --git a/bfd/configure.ac b/bfd/configure.ac -index d1e7e3a4bf3..48f2d69991c 100644 +index 6bcfd1b7368..dde0a3af03e 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac -@@ -168,6 +168,13 @@ AC_ARG_WITH(separate-debug-dir, +@@ -167,6 +167,13 @@ AC_ARG_WITH(separate-debug-dir, [DEBUGDIR="${withval}"]) AC_SUBST(DEBUGDIR) @@ -142,5 +142,5 @@ index d1e7e3a4bf3..48f2d69991c 100644 ACX_BUGURL([https://sourceware.org/bugzilla/]) -- -2.42.0 +2.44.2 diff --git a/9999/0004-Gentoo-Pass-hash-style-sysv-to-ld-in-the-testsuite.patch b/9999/0004-Gentoo-Pass-hash-style-sysv-to-ld-in-the-testsuite.patch index 6d820fe..4cfd1da 100644 --- a/9999/0004-Gentoo-Pass-hash-style-sysv-to-ld-in-the-testsuite.patch +++ b/9999/0004-Gentoo-Pass-hash-style-sysv-to-ld-in-the-testsuite.patch @@ -1,4 +1,4 @@ -From 722482c5057cc921d1ab96266da29be4dc7d1354 Mon Sep 17 00:00:00 2001 +From b706ce22cbea4edb8ba06ef1b64f6b20f3502d0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org> Date: Tue, 20 Jul 2021 21:15:24 +0200 Subject: [PATCH 4/7] Gentoo: Pass --hash-style=sysv to ld in the testsuite @@ -9,10 +9,10 @@ Subject: [PATCH 4/7] 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 f89ac8a6108..2be9383b49e 100644 +index f0136577b6c..afb6f7cc9c3 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 {}} } { +@@ -1394,7 +1394,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. @@ -22,7 +22,7 @@ index f89ac8a6108..2be9383b49e 100644 # 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 aca303e0728..44f2865116f 100644 +index e6e643ca3ca..b1164e9a96f 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 } { @@ -57,5 +57,5 @@ index aca303e0728..44f2865116f 100644 # We don't care if we get a warning about a non-existent start -- -2.42.0 +2.44.2 diff --git a/9999/0005-Gentoo-Give-also-libctf-optionally-a-gentoo-specific.patch b/9999/0005-Gentoo-Give-also-libctf-optionally-a-gentoo-specific.patch index ab34ef9..6964aab 100644 --- a/9999/0005-Gentoo-Give-also-libctf-optionally-a-gentoo-specific.patch +++ b/9999/0005-Gentoo-Give-also-libctf-optionally-a-gentoo-specific.patch @@ -1,4 +1,4 @@ -From a0e9a882db04d45bf878b746a8a30c5e51619d8b Mon Sep 17 00:00:00 2001 +From a8cf14f5ea0a210928250fd1c47b4e45c39974c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org> Date: Sat, 24 Jul 2021 15:20:16 +0200 Subject: [PATCH 5/7] Gentoo: Give also libctf optionally a gentoo-specific @@ -12,10 +12,10 @@ Subject: [PATCH 5/7] Gentoo: Give also libctf optionally a gentoo-specific 4 files changed, 62 insertions(+), 2 deletions(-) diff --git a/libctf/Makefile.am b/libctf/Makefile.am -index b1dbc2f6ba4..d282ceb619a 100644 +index fb1a306c888..5fcc73bd04e 100644 --- a/libctf/Makefile.am +++ b/libctf/Makefile.am -@@ -26,6 +26,9 @@ info_TEXINFOS = +@@ -31,6 +31,9 @@ info_TEXINFOS = DISTCLEANFILES = MAINTAINERCLEANFILES = @@ -25,7 +25,7 @@ index b1dbc2f6ba4..d282ceb619a 100644 # This is where we get zlib from. zlibdir is -L../zlib and zlibinc is # -I../zlib, unless we were configured with --with-system-zlib, in which # case both are empty. -@@ -46,8 +49,17 @@ include_HEADERS = +@@ -51,8 +54,17 @@ include_HEADERS = noinst_LTLIBRARIES = libctf.la libctf-nobfd.la endif @@ -45,10 +45,10 @@ index b1dbc2f6ba4..d282ceb619a 100644 libctf_nobfd_la_CPPFLAGS = $(AM_CPPFLAGS) -DNOBFD=1 libctf_nobfd_la_SOURCES = ctf-archive.c ctf-dump.c ctf-create.c ctf-decl.c ctf-error.c \ diff --git a/libctf/Makefile.in b/libctf/Makefile.in -index 3d2696bcc47..664d6360c47 100644 +index 54f5daa79ee..b7a80edfab6 100644 --- a/libctf/Makefile.in +++ b/libctf/Makefile.in -@@ -380,6 +380,7 @@ AUTOCONF = @AUTOCONF@ +@@ -430,6 +430,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ @@ -56,7 +56,7 @@ index 3d2696bcc47..664d6360c47 100644 CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ -@@ -402,6 +403,7 @@ EXEEXT = @EXEEXT@ +@@ -452,6 +453,7 @@ EXEEXT = @EXEEXT@ # Setup the testing framework, if you have one EXPECT = expect @@ -64,7 +64,7 @@ index 3d2696bcc47..664d6360c47 100644 FGREP = @FGREP@ GENCAT = @GENCAT@ GMSGFMT = @GMSGFMT@ -@@ -540,8 +542,13 @@ AM_CFLAGS = -std=gnu99 @ac_libctf_warn_cflags@ @warn@ @c_warn@ @WARN_PEDANTIC@ @ +@@ -603,8 +605,13 @@ AM_CFLAGS = -std=gnu99 @ac_libctf_warn_cflags@ @warn@ @c_warn@ @WARN_PEDANTIC@ @ @INSTALL_LIBBFD_FALSE@include_HEADERS = @INSTALL_LIBBFD_TRUE@include_HEADERS = $(INCDIR)/ctf.h $(INCDIR)/ctf-api.h @INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libctf.la libctf-nobfd.la @@ -80,10 +80,10 @@ index 3d2696bcc47..664d6360c47 100644 libctf_nobfd_la_CPPFLAGS = $(AM_CPPFLAGS) -DNOBFD=1 libctf_nobfd_la_SOURCES = ctf-archive.c ctf-dump.c ctf-create.c \ diff --git a/libctf/configure b/libctf/configure -index 4c01c022837..07778d52be4 100755 +index 7466d56a18b..54c86592b70 100755 --- a/libctf/configure +++ b/libctf/configure -@@ -645,6 +645,10 @@ BUILD_INFO_FALSE +@@ -646,6 +646,10 @@ BUILD_INFO_FALSE BUILD_INFO_TRUE NEED_CTF_QSORT_R_FALSE NEED_CTF_QSORT_R_TRUE @@ -94,7 +94,7 @@ index 4c01c022837..07778d52be4 100755 ENABLE_LIBCTF_HASH_DEBUGGING_FALSE ENABLE_LIBCTF_HASH_DEBUGGING_TRUE zlibinc -@@ -806,6 +810,7 @@ enable_maintainer_mode +@@ -821,6 +825,7 @@ enable_maintainer_mode enable_install_libbfd with_system_zlib enable_libctf_hash_debugging @@ -102,7 +102,7 @@ index 4c01c022837..07778d52be4 100755 ' ac_precious_vars='build_alias host_alias -@@ -1463,6 +1468,8 @@ Optional Packages: +@@ -1487,6 +1492,8 @@ Optional Packages: both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-system-zlib use installed libz @@ -111,7 +111,7 @@ index 4c01c022837..07778d52be4 100755 Some influential environment variables: CC C compiler command -@@ -14335,6 +14342,26 @@ else +@@ -16274,6 +16281,26 @@ else fi @@ -138,7 +138,7 @@ index 4c01c022837..07778d52be4 100755 # Similar to GDB_AC_CHECK_BFD. OLD_CFLAGS=$CFLAGS OLD_LDFLAGS=$LDFLAGS -@@ -15227,6 +15254,10 @@ if test -z "${ENABLE_LIBCTF_HASH_DEBUGGING_TRUE}" && test -z "${ENABLE_LIBCTF_HA +@@ -17177,6 +17204,10 @@ if test -z "${ENABLE_LIBCTF_HASH_DEBUGGING_TRUE}" && test -z "${ENABLE_LIBCTF_HA as_fn_error $? "conditional \"ENABLE_LIBCTF_HASH_DEBUGGING\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -150,7 +150,7 @@ index 4c01c022837..07778d52be4 100755 if test -z "${NEED_CTF_QSORT_R_TRUE}" && test -z "${NEED_CTF_QSORT_R_FALSE}"; then as_fn_error $? "conditional \"NEED_CTF_QSORT_R\" was never defined. diff --git a/libctf/configure.ac b/libctf/configure.ac -index 6a5eade1855..a0e65a4aeda 100644 +index 64544b83a9f..1ce43327c25 100644 --- a/libctf/configure.ac +++ b/libctf/configure.ac @@ -76,6 +76,16 @@ if test "${enable_libctf_hash_debugging}" = yes; then @@ -171,5 +171,5 @@ index 6a5eade1855..a0e65a4aeda 100644 OLD_CFLAGS=$CFLAGS OLD_LDFLAGS=$LDFLAGS -- -2.42.0 +2.44.2 diff --git a/9999/0006-Gentoo-XFAIL-15-broken-ld.gold-tests.patch b/9999/0006-Gentoo-XFAIL-15-broken-ld.gold-tests.patch index 2934cd3..fe6da95 100644 --- a/9999/0006-Gentoo-XFAIL-15-broken-ld.gold-tests.patch +++ b/9999/0006-Gentoo-XFAIL-15-broken-ld.gold-tests.patch @@ -1,4 +1,4 @@ -From 9bf3571ddf788d8986d1e45d54df356867bd23d9 Mon Sep 17 00:00:00 2001 +From d826b80fe902aefd77465be3650ab2d62af5e099 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org> Date: Sat, 31 Jul 2021 01:18:18 +0200 Subject: [PATCH 6/7] Gentoo: XFAIL 15 broken ld.gold tests @@ -16,7 +16,7 @@ Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=27303 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am -index df9405c1aac..749921633b2 100644 +index 2f1348fd6e2..1206460f191 100644 --- a/gold/testsuite/Makefile.am +++ b/gold/testsuite/Makefile.am @@ -1,5 +1,11 @@ @@ -32,7 +32,7 @@ index df9405c1aac..749921633b2 100644 # system and the host system are the same. So these tests will not # work when building with a cross-compiler. diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in -index fb0eb12553b..b506a7f8da7 100644 +index 9cf21df8d7d..df14333c558 100644 --- a/gold/testsuite/Makefile.in +++ b/gold/testsuite/Makefile.in @@ -15,10 +15,6 @@ @@ -61,7 +61,7 @@ index fb0eb12553b..b506a7f8da7 100644 check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \ $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \ $(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \ -@@ -2759,6 +2763,10 @@ top_srcdir = @top_srcdir@ +@@ -2782,6 +2786,10 @@ top_srcdir = @top_srcdir@ zlibdir = @zlibdir@ zlibinc = @zlibinc@ @@ -73,5 +73,5 @@ index fb0eb12553b..b506a7f8da7 100644 AUTOMAKE_OPTIONS = foreign -Wno-portability -- -2.42.0 +2.44.2 diff --git a/9999/0007-Apply-a-similar-libiberty-fix-as-in-7d53105d-for-lib.patch b/9999/0007-Apply-a-similar-libiberty-fix-as-in-7d53105d-for-lib.patch index 2331b5c..6eebb98 100644 --- a/9999/0007-Apply-a-similar-libiberty-fix-as-in-7d53105d-for-lib.patch +++ b/9999/0007-Apply-a-similar-libiberty-fix-as-in-7d53105d-for-lib.patch @@ -1,4 +1,4 @@ -From 51b418fda84420da6d2c0e830435ad61409daffb Mon Sep 17 00:00:00 2001 +From bbaa9fafb08385e5ad836bc30a2db3af47d1cc5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org> Date: Wed, 22 Feb 2023 20:05:35 +0100 Subject: [PATCH 7/7] Apply a similar libiberty fix as in 7d53105d for @@ -18,7 +18,7 @@ Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org> 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gprofng/src/Makefile.am b/gprofng/src/Makefile.am -index 20c8b0022e4..96dbc8e0e94 100644 +index fb4b8a0fafa..3d7cb18ff71 100644 --- a/gprofng/src/Makefile.am +++ b/gprofng/src/Makefile.am @@ -144,7 +144,8 @@ libgprofng_la_LDFLAGS = -version-info 0:0:0 @@ -32,7 +32,7 @@ index 20c8b0022e4..96dbc8e0e94 100644 $(GPROFNG_LIBADD) \ -lpthread -ldl diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in -index 47da873b80c..52a22279cf7 100644 +index cef4b275305..295fd3ee2df 100644 --- a/gprofng/src/Makefile.in +++ b/gprofng/src/Makefile.in @@ -552,7 +552,8 @@ libgprofng_la_LDFLAGS = -version-info 0:0:0 @@ -46,10 +46,10 @@ index 47da873b80c..52a22279cf7 100644 $(GPROFNG_LIBADD) \ -lpthread -ldl diff --git a/opcodes/configure b/opcodes/configure -index a65b0a2f95b..f412c1a6c96 100755 +index 050fd5ff0ff..4b68211dea6 100755 --- a/opcodes/configure +++ b/opcodes/configure -@@ -12479,10 +12479,10 @@ if test "$enable_shared" = "yes"; then +@@ -14379,10 +14379,10 @@ if test "$enable_shared" = "yes"; then case "${host}" in *-*-cygwin*) SHARED_LDFLAGS="-no-undefined" @@ -63,10 +63,10 @@ index a65b0a2f95b..f412c1a6c96 100755 ;; esac diff --git a/opcodes/configure.ac b/opcodes/configure.ac -index cae2a67ff10..5cb194779e9 100644 +index 4d918e3ef9b..9692e69693e 100644 --- a/opcodes/configure.ac +++ b/opcodes/configure.ac -@@ -196,10 +196,10 @@ if test "$enable_shared" = "yes"; then +@@ -195,10 +195,10 @@ if test "$enable_shared" = "yes"; then case "${host}" in *-*-cygwin*) SHARED_LDFLAGS="-no-undefined" @@ -80,5 +80,5 @@ index cae2a67ff10..5cb194779e9 100644 ;; esac -- -2.42.0 +2.44.2 |