diff options
6 files changed, 69 insertions, 69 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 1a03757..c9a15e1 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 eaf58344eafc9b9943a0bd7e9e00130965b10274 Mon Sep 17 00:00:00 2001 +From febeab1e92e6aaf19a3a67a8729cbe0a444ddf59 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/6] 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, 150 insertions(+), 2 deletions(-) diff --git a/gold/options.cc b/gold/options.cc -index 04be98a3e39..64439f8af7a 100644 +index c9834b66159..bd3e948a61b 100644 --- a/gold/options.cc +++ b/gold/options.cc @@ -1355,6 +1355,39 @@ General_options::finalize() @@ -88,7 +88,7 @@ index 04be98a3e39..64439f8af7a 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 17236eb9cb9..dad649870bf 100644 +index 1aa451c7711..524c7c859df 100644 --- a/gold/options.h +++ b/gold/options.h @@ -1398,6 +1398,13 @@ class General_options @@ -106,10 +106,10 @@ index 17236eb9cb9..dad649870bf 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 3916740eee4..7e70b0179ea 100644 +index ad0dc6a106c..d21edaddce7 100644 --- a/ld/config.in +++ b/ld/config.in -@@ -55,6 +55,9 @@ +@@ -58,6 +58,9 @@ language is requested. */ #undef ENABLE_NLS @@ -120,10 +120,10 @@ index 3916740eee4..7e70b0179ea 100644 #undef EXTRA_SHLIB_EXTENSION diff --git a/ld/configure b/ld/configure -index 9dd3ed5f1e7..a9a67a8babe 100755 +index 03b9e46f56d..091d5913ee4 100755 --- a/ld/configure +++ b/ld/configure -@@ -838,6 +838,7 @@ with_lib_path +@@ -839,6 +839,7 @@ with_lib_path enable_targets enable_64_bit_bfd with_sysroot @@ -131,7 +131,7 @@ index 9dd3ed5f1e7..a9a67a8babe 100755 enable_gold enable_got enable_compressed_debug_sections -@@ -1519,6 +1520,8 @@ Optional Features: +@@ -1521,6 +1522,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,25 +140,25 @@ index 9dd3ed5f1e7..a9a67a8babe 100755 --enable-gold[=ARG] build gold [ARG={default,yes,no}] --enable-got=<type> GOT handling scheme (target, single, negative, multigot) -@@ -11620,7 +11623,7 @@ else +@@ -11625,7 +11628,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11623 "configure" +-#line 11628 "configure" +#line 11626 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11726,7 +11729,7 @@ else +@@ -11731,7 +11734,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11729 "configure" +-#line 11734 "configure" +#line 11732 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -15478,6 +15481,19 @@ fi +@@ -15483,6 +15486,19 @@ fi @@ -179,7 +179,7 @@ index 9dd3ed5f1e7..a9a67a8babe 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 f1b2f9897f8..1927d79e728 100644 +index 77edac3258c..a74dac63038 100644 --- a/ld/configure.ac +++ b/ld/configure.ac @@ -103,6 +103,16 @@ AC_SUBST(use_sysroot) @@ -200,10 +200,10 @@ index f1b2f9897f8..1927d79e728 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 f3086bf30de..90cf1ca51e5 100644 +index 05649ff61b8..ce9e8229ac5 100644 --- a/ld/ld.h +++ b/ld/ld.h -@@ -162,6 +162,13 @@ typedef struct +@@ -163,6 +163,13 @@ typedef struct in the linker script. */ bool force_group_allocation; @@ -218,10 +218,10 @@ index f3086bf30de..90cf1ca51e5 100644 enum endian_enum endian; diff --git a/ld/ld.texi b/ld/ld.texi -index 9daed2e7e9f..d76b534a456 100644 +index db3a9f09b45..5b543914e67 100644 --- a/ld/ld.texi +++ b/ld/ld.texi -@@ -2952,6 +2952,24 @@ creation of the metadata note, if one had been enabled by an earlier +@@ -2960,6 +2960,24 @@ creation of the metadata note, if one had been enabled by an earlier occurrence of the --package-metdata option. If the linker has been built with libjansson, then the JSON string will be validated. @@ -247,7 +247,7 @@ index 9daed2e7e9f..d76b534a456 100644 @c man end diff --git a/ld/ldfile.c b/ld/ldfile.c -index 731ae5f7aed..6b67e29041b 100644 +index b8fd4e5d8e0..639204f4c29 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c @@ -117,6 +117,26 @@ ldfile_add_library_path (const char *name, bool cmdline) @@ -278,10 +278,10 @@ index 731ae5f7aed..6b67e29041b 100644 /* Try to open a BFD for a lang_input_statement. */ diff --git a/ld/ldlex.h b/ld/ldlex.h -index 57ade1f754b..b35a6122e09 100644 +index 0538f0a06a1..82685348055 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h -@@ -149,6 +149,9 @@ enum option_values +@@ -151,6 +151,9 @@ enum option_values OPTION_PRINT_OUTPUT_FORMAT, OPTION_PRINT_SYSROOT, OPTION_IGNORE_UNRESOLVED_SYMBOL, @@ -292,7 +292,7 @@ index 57ade1f754b..b35a6122e09 100644 OPTION_POP_STATE, OPTION_DISABLE_MULTIPLE_DEFS_ABS, diff --git a/ld/ldmain.c b/ld/ldmain.c -index d63002c994a..55364ef5773 100644 +index 9290a189b0d..da25dbb13b7 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c @@ -321,6 +321,13 @@ main (int argc, char **argv) @@ -310,10 +310,10 @@ index d63002c994a..55364ef5773 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 299371fb775..02816ebb1b6 100644 +index c5960385572..950b6969cb8 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c -@@ -579,6 +579,18 @@ static const struct ld_option ld_options[] = +@@ -584,6 +584,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 }, @@ -332,7 +332,7 @@ index 299371fb775..02816ebb1b6 100644 { {"push-state", no_argument, NULL, OPTION_PUSH_STATE}, '\0', NULL, N_("Push state of flags governing input file handling"), TWO_DASHES }, -@@ -1679,6 +1691,18 @@ parse_args (unsigned argc, char **argv) +@@ -1692,6 +1704,18 @@ parse_args (unsigned argc, char **argv) } break; @@ -352,5 +352,5 @@ index 299371fb775..02816ebb1b6 100644 input_flags.pushed = xmemdup (&input_flags, sizeof (input_flags), -- -2.38.0 +2.38.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 9a5590e..f5936c6 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 14210956fa30806c5316ede3db67cac94420bb96 Mon Sep 17 00:00:00 2001 +From 041fec351bca1ec30fa639ee80c0810a413b2d89 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/6] 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 abef3c4601b..9dfb6b6d2b0 100644 +index f9fbba23e2c..d37488d1bf8 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in @@ -258,6 +258,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) @@ -30,5 +30,5 @@ index abef3c4601b..9dfb6b6d2b0 100644 else true; fi; \ if [ x"$(NOASANFLAG)" != x ]; then \ -- -2.38.0 +2.38.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 81265e4..8921582 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 96aa5434285fe8006fd671634fe753cf69451043 Mon Sep 17 00:00:00 2001 +From b1e693934cde0f00e0b2fea50753e0f965bf7f88 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/6] 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 794d992310d..34b71212d75 100644 +index 75d21db88d1..9137f025b87 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -64,6 +64,8 @@ bfdinclude_HEADERS += $(INCDIR)/plugin-api.h @@ -46,7 +46,7 @@ index 794d992310d..34b71212d75 100644 # bfd.h goes here, for now BFD_H = bfd.h -@@ -992,6 +994,9 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in +@@ -994,6 +996,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,7 +57,7 @@ index 794d992310d..34b71212d75 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 bdf12c99cfd..e4c613d7406 100644 +index 0b0bb1a950e..0ee27ecc111 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -355,6 +355,7 @@ ECHO_T = @ECHO_T@ @@ -68,7 +68,7 @@ index bdf12c99cfd..e4c613d7406 100644 FGREP = @FGREP@ GENCAT = @GENCAT@ GMSGFMT = @GMSGFMT@ -@@ -2471,6 +2472,9 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in +@@ -2474,6 +2475,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,7 +79,7 @@ index bdf12c99cfd..e4c613d7406 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 b72e885f711..b464614592d 100755 +index 5af8af2ee37..42bd8f32145 100755 --- a/bfd/configure +++ b/bfd/configure @@ -695,6 +695,7 @@ WARN_CFLAGS @@ -124,7 +124,7 @@ index b72e885f711..b464614592d 100755 # Check whether --with-pkgversion was given. diff --git a/bfd/configure.ac b/bfd/configure.ac -index 7a0ad0ffe33..2910cc9121f 100644 +index 82a3d1f832e..2b882c735d4 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac @@ -168,6 +168,13 @@ AC_ARG_WITH(separate-debug-dir, @@ -142,5 +142,5 @@ index 7a0ad0ffe33..2910cc9121f 100644 ACX_BUGURL([https://sourceware.org/bugzilla/]) -- -2.38.0 +2.38.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 484c657..4411e88 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 eeb95d2a0cda143dad4d905429ced8a339c486e3 Mon Sep 17 00:00:00 2001 +From c45749c4cc5750db631e16b301133f15adfb94c7 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/6] Gentoo: Pass --hash-style=sysv to ld in the testsuite @@ -9,10 +9,10 @@ Subject: [PATCH 4/6] 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 ccc33a827b4..f7aecf7edc2 100644 +index b0190ac51ac..aeef8e55b87 100644 --- a/binutils/testsuite/lib/binutils-common.exp +++ b/binutils/testsuite/lib/binutils-common.exp -@@ -1310,7 +1310,7 @@ proc run_dump_test { name {extra_options {}} } { +@@ -1308,7 +1308,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 ccc33a827b4..f7aecf7edc2 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 ec27388a72e..fc7292a40a7 100644 +index 47e86a7b27c..55192a05f35 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 ec27388a72e..fc7292a40a7 100644 # We don't care if we get a warning about a non-existent start -- -2.38.0 +2.38.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 2133994..3ac7217 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 ee4de1adb09cbfcad39e544e2f05392b210b550a Mon Sep 17 00:00:00 2001 +From ffb569acc3bfa5a22cc6581338108f79fd3d8c55 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/6] Gentoo: Give also libctf optionally a gentoo-specific @@ -12,7 +12,7 @@ Subject: [PATCH 5/6] Gentoo: Give also libctf optionally a gentoo-specific 4 files changed, 64 insertions(+), 4 deletions(-) diff --git a/libctf/Makefile.am b/libctf/Makefile.am -index 27e90f0ba36..4990a20efa3 100644 +index c4809f70bae..5571eef8aa1 100644 --- a/libctf/Makefile.am +++ b/libctf/Makefile.am @@ -26,6 +26,9 @@ info_TEXINFOS = @@ -45,10 +45,10 @@ index 27e90f0ba36..4990a20efa3 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 036a63fa720..e971f0b31bb 100644 +index f2b852e3fae..14fc79bf5a9 100644 --- a/libctf/Makefile.in +++ b/libctf/Makefile.in -@@ -383,6 +383,7 @@ AUTOCONF = @AUTOCONF@ +@@ -381,6 +381,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ @@ -56,7 +56,7 @@ index 036a63fa720..e971f0b31bb 100644 CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ -@@ -405,6 +406,7 @@ EXEEXT = @EXEEXT@ +@@ -403,6 +404,7 @@ EXEEXT = @EXEEXT@ # Setup the testing framework, if you have one EXPECT = expect @@ -64,7 +64,7 @@ index 036a63fa720..e971f0b31bb 100644 FGREP = @FGREP@ GENCAT = @GENCAT@ GMSGFMT = @GMSGFMT@ -@@ -547,8 +549,13 @@ AM_CFLAGS = -std=gnu99 @ac_libctf_warn_cflags@ @warn@ @c_warn@ @WARN_PEDANTIC@ @ +@@ -540,8 +542,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,7 +80,7 @@ index 036a63fa720..e971f0b31bb 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 176b3d6b918..31fe5f72a90 100755 +index 17463a74cca..b0b5c78a7a6 100755 --- a/libctf/configure +++ b/libctf/configure @@ -646,6 +646,10 @@ BUILD_INFO_FALSE @@ -93,43 +93,43 @@ index 176b3d6b918..31fe5f72a90 100755 +EXTRA_SOVERSION_SUFFIX ENABLE_LIBCTF_HASH_DEBUGGING_FALSE ENABLE_LIBCTF_HASH_DEBUGGING_TRUE - ZSTD_LIBS -@@ -813,6 +817,7 @@ enable_install_libbfd + zlibinc +@@ -807,6 +811,7 @@ enable_maintainer_mode + enable_install_libbfd with_system_zlib - with_zstd enable_libctf_hash_debugging +with_extra_soversion_suffix ' ac_precious_vars='build_alias host_alias -@@ -1477,6 +1482,8 @@ Optional Packages: +@@ -1464,6 +1469,8 @@ Optional Packages: + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-system-zlib use installed libz - --with-zstd support zstd compressed debug sections - (default=auto) + --with-extra-soversion-suffix=SUFFIX + Append '.SUFFIX' to SONAME [[default=]] Some influential environment variables: CC C compiler command -@@ -11655,7 +11662,7 @@ else +@@ -11632,7 +11639,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11658 "configure" +-#line 11635 "configure" +#line 11665 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11761,7 +11768,7 @@ else +@@ -11738,7 +11745,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11764 "configure" +-#line 11741 "configure" +#line 11771 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -13209,6 +13216,26 @@ else +@@ -14305,6 +14312,26 @@ else fi @@ -156,7 +156,7 @@ index 176b3d6b918..31fe5f72a90 100755 # Similar to GDB_AC_CHECK_BFD. OLD_CFLAGS=$CFLAGS OLD_LDFLAGS=$LDFLAGS -@@ -14101,6 +14128,10 @@ if test -z "${ENABLE_LIBCTF_HASH_DEBUGGING_TRUE}" && test -z "${ENABLE_LIBCTF_HA +@@ -15199,6 +15226,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 @@ -168,10 +168,10 @@ index 176b3d6b918..31fe5f72a90 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 2e2ccf4b624..fbe5f27241b 100644 +index a0148a4c328..1901ade381d 100644 --- a/libctf/configure.ac +++ b/libctf/configure.ac -@@ -79,6 +79,16 @@ if test "${enable_libctf_hash_debugging}" = yes; then +@@ -76,6 +76,16 @@ if test "${enable_libctf_hash_debugging}" = yes; then fi AM_CONDITIONAL(ENABLE_LIBCTF_HASH_DEBUGGING, test "${enable_libctf_hash_debugging}" = yes) @@ -189,5 +189,5 @@ index 2e2ccf4b624..fbe5f27241b 100644 OLD_CFLAGS=$CFLAGS OLD_LDFLAGS=$LDFLAGS -- -2.38.0 +2.38.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 23e7576..303942b 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 85c162be0eea0006c9d73fae243d771f7d0c9756 Mon Sep 17 00:00:00 2001 +From a5ae5bca2b691999092655fe0df9b6c22e76ffaa 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/6] 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 843fd0d197c..4940119c190 100644 +index df9405c1aac..749921633b2 100644 --- a/gold/testsuite/Makefile.am +++ b/gold/testsuite/Makefile.am @@ -1,5 +1,11 @@ @@ -32,7 +32,7 @@ index 843fd0d197c..4940119c190 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 21804df6573..6a4e2b5c5bb 100644 +index fb0eb12553b..b506a7f8da7 100644 --- a/gold/testsuite/Makefile.in +++ b/gold/testsuite/Makefile.in @@ -15,10 +15,6 @@ @@ -61,7 +61,7 @@ index 21804df6573..6a4e2b5c5bb 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) \ -@@ -2757,6 +2761,10 @@ top_srcdir = @top_srcdir@ +@@ -2759,6 +2763,10 @@ top_srcdir = @top_srcdir@ zlibdir = @zlibdir@ zlibinc = @zlibinc@ @@ -73,5 +73,5 @@ index 21804df6573..6a4e2b5c5bb 100644 AUTOMAKE_OPTIONS = foreign -Wno-portability -- -2.38.0 +2.38.2 |