diff options
author | 2023-06-30 17:19:42 +0800 | |
---|---|---|
committer | 2023-06-30 17:19:50 +0800 | |
commit | 73a506ab573568d06b30206258b2d4875b5450fb (patch) | |
tree | 6cff6f7bac2786a87fec9e7cd9540e8e7ff7df7d | |
parent | Apply build fix for libiberty to libopcodes and libgprofng (diff) | |
download | binutils-patches-73a506ab573568d06b30206258b2d4875b5450fb.tar.gz binutils-patches-73a506ab573568d06b30206258b2d4875b5450fb.tar.bz2 binutils-patches-73a506ab573568d06b30206258b2d4875b5450fb.zip |
Rebase on top of upstream commit 6637ae9232f0ba44
Signed-off-by: WANG Xuerui <xen0n@gentoo.org>
7 files changed, 66 insertions, 66 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 c9a15e1..716fa9b 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,7 +1,7 @@ -From febeab1e92e6aaf19a3a67a8729cbe0a444ddf59 Mon Sep 17 00:00:00 2001 +From 38cf5d1565c113e64a5cdfc9d55d554919bc10d7 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 +Subject: [PATCH 1/7] Gentoo: gold/ld: add support for poisoned system directories MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -88,10 +88,10 @@ 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 1aa451c7711..524c7c859df 100644 +index 46f658f23ea..8f9b8c177ad 100644 --- a/gold/options.h +++ b/gold/options.h -@@ -1398,6 +1398,13 @@ class General_options +@@ -1402,6 +1402,13 @@ class General_options DEFINE_bool(warn_multiple_gp, options::TWO_DASHES, '\0', false, N_("Ignored"), NULL); @@ -200,7 +200,7 @@ index 77edac3258c..a74dac63038 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 05649ff61b8..ce9e8229ac5 100644 +index a0f8a15c7a9..69420b6673a 100644 --- a/ld/ld.h +++ b/ld/ld.h @@ -163,6 +163,13 @@ typedef struct @@ -218,10 +218,10 @@ index 05649ff61b8..ce9e8229ac5 100644 enum endian_enum endian; diff --git a/ld/ld.texi b/ld/ld.texi -index db3a9f09b45..5b543914e67 100644 +index aa8b1aa86eb..b57b0d5c9f5 100644 --- a/ld/ld.texi +++ b/ld/ld.texi -@@ -2960,6 +2960,24 @@ creation of the metadata note, if one had been enabled by an earlier +@@ -3059,6 +3059,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,10 +247,10 @@ index db3a9f09b45..5b543914e67 100644 @c man end diff --git a/ld/ldfile.c b/ld/ldfile.c -index b8fd4e5d8e0..639204f4c29 100644 +index c8a6874978b..6ba20992b66 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c -@@ -117,6 +117,26 @@ ldfile_add_library_path (const char *name, bool cmdline) +@@ -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); @@ -278,7 +278,7 @@ index b8fd4e5d8e0..639204f4c29 100644 /* Try to open a BFD for a lang_input_statement. */ diff --git a/ld/ldlex.h b/ld/ldlex.h -index 0538f0a06a1..82685348055 100644 +index 87cac02141d..d79ec8faa15 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h @@ -151,6 +151,9 @@ enum option_values @@ -292,10 +292,10 @@ index 0538f0a06a1..82685348055 100644 OPTION_POP_STATE, OPTION_DISABLE_MULTIPLE_DEFS_ABS, diff --git a/ld/ldmain.c b/ld/ldmain.c -index 9290a189b0d..da25dbb13b7 100644 +index 25cc89b72f9..9c81fd6f539 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c -@@ -321,6 +321,13 @@ main (int argc, char **argv) +@@ -325,6 +325,13 @@ main (int argc, char **argv) command_line.warn_mismatch = true; command_line.warn_search_mismatch = true; command_line.check_section_addresses = -1; @@ -310,10 +310,10 @@ index 9290a189b0d..da25dbb13b7 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 c5960385572..950b6969cb8 100644 +index fe8722313fe..5fd7350efc5 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c -@@ -584,6 +584,18 @@ static const struct ld_option ld_options[] = +@@ -594,6 +594,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 c5960385572..950b6969cb8 100644 { {"push-state", no_argument, NULL, OPTION_PUSH_STATE}, '\0', NULL, N_("Push state of flags governing input file handling"), TWO_DASHES }, -@@ -1692,6 +1704,18 @@ parse_args (unsigned argc, char **argv) +@@ -1738,6 +1750,18 @@ parse_args (unsigned argc, char **argv) } break; @@ -352,5 +352,5 @@ index c5960385572..950b6969cb8 100644 input_flags.pushed = xmemdup (&input_flags, sizeof (input_flags), -- -2.38.2 +2.40.0 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 f5936c6..550f0a1 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,7 +1,7 @@ -From 041fec351bca1ec30fa639ee80c0810a413b2d89 Mon Sep 17 00:00:00 2001 +From 0486446fa828245f0ac260d170ebe3e7123932c4 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 +Subject: [PATCH 2/7] 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 @@ -30,5 +30,5 @@ index f9fbba23e2c..d37488d1bf8 100644 else true; fi; \ if [ x"$(NOASANFLAG)" != x ]; then \ -- -2.38.2 +2.40.0 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 8921582..0597531 100644 --- a/9999/0003-Gentoo-add-with-extra-soversion-suffix-option.patch +++ b/9999/0003-Gentoo-add-with-extra-soversion-suffix-option.patch @@ -1,7 +1,7 @@ -From b1e693934cde0f00e0b2fea50753e0f965bf7f88 Mon Sep 17 00:00:00 2001 +From 36fef3463cc9273249699cf372bf9cb59744df36 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 +Subject: [PATCH 3/7] Gentoo: add --with-extra-soversion-suffix= option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -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 75d21db88d1..9137f025b87 100644 +index 5c5fdefd3b8..fe26bbf4f0f 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -64,6 +64,8 @@ bfdinclude_HEADERS += $(INCDIR)/plugin-api.h @@ -46,7 +46,7 @@ index 75d21db88d1..9137f025b87 100644 # bfd.h goes here, for now BFD_H = bfd.h -@@ -994,6 +996,9 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in +@@ -976,6 +978,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 75d21db88d1..9137f025b87 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 0b0bb1a950e..0ee27ecc111 100644 +index 4edfedee924..70a2442957e 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in -@@ -355,6 +355,7 @@ ECHO_T = @ECHO_T@ +@@ -342,6 +342,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@ @@ -68,7 +68,7 @@ index 0b0bb1a950e..0ee27ecc111 100644 FGREP = @FGREP@ GENCAT = @GENCAT@ GMSGFMT = @GMSGFMT@ -@@ -2474,6 +2475,9 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in +@@ -2435,6 +2436,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 0b0bb1a950e..0ee27ecc111 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 5af8af2ee37..42bd8f32145 100755 +index 41d280ef461..18e7e3acdbd 100755 --- a/bfd/configure +++ b/bfd/configure @@ -695,6 +695,7 @@ WARN_CFLAGS @@ -124,7 +124,7 @@ index 5af8af2ee37..42bd8f32145 100755 # Check whether --with-pkgversion was given. diff --git a/bfd/configure.ac b/bfd/configure.ac -index 82a3d1f832e..2b882c735d4 100644 +index f044616f4d9..f22a87f8f54 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac @@ -168,6 +168,13 @@ AC_ARG_WITH(separate-debug-dir, @@ -142,5 +142,5 @@ index 82a3d1f832e..2b882c735d4 100644 ACX_BUGURL([https://sourceware.org/bugzilla/]) -- -2.38.2 +2.40.0 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 4411e88..4242ba8 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,7 +1,7 @@ -From c45749c4cc5750db631e16b301133f15adfb94c7 Mon Sep 17 00:00:00 2001 +From 50af4f7750d537ada9cdb9946804f12e19bb6842 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 +Subject: [PATCH 4/7] Gentoo: Pass --hash-style=sysv to ld in the testsuite --- binutils/testsuite/lib/binutils-common.exp | 2 +- @@ -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 b0190ac51ac..aeef8e55b87 100644 +index 7e6bf16ee6e..0491fff2883 100644 --- a/binutils/testsuite/lib/binutils-common.exp +++ b/binutils/testsuite/lib/binutils-common.exp -@@ -1308,7 +1308,7 @@ proc run_dump_test { name {extra_options {}} } { +@@ -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. @@ -22,7 +22,7 @@ index b0190ac51ac..aeef8e55b87 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 47e86a7b27c..55192a05f35 100644 +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 } { @@ -57,5 +57,5 @@ index 47e86a7b27c..55192a05f35 100644 # We don't care if we get a warning about a non-existent start -- -2.38.2 +2.40.0 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 3ac7217..e5342b3 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,7 +1,7 @@ -From ffb569acc3bfa5a22cc6581338108f79fd3d8c55 Mon Sep 17 00:00:00 2001 +From c7ff4b542556d68004ccc30e2da25c56380dcea2 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 +Subject: [PATCH 5/7] Gentoo: Give also libctf optionally a gentoo-specific soversion --- @@ -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 c4809f70bae..5571eef8aa1 100644 +index b1dbc2f6ba4..d282ceb619a 100644 --- a/libctf/Makefile.am +++ b/libctf/Makefile.am @@ -26,6 +26,9 @@ info_TEXINFOS = @@ -45,10 +45,10 @@ index c4809f70bae..5571eef8aa1 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 f2b852e3fae..14fc79bf5a9 100644 +index 3d2696bcc47..664d6360c47 100644 --- a/libctf/Makefile.in +++ b/libctf/Makefile.in -@@ -381,6 +381,7 @@ AUTOCONF = @AUTOCONF@ +@@ -380,6 +380,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ @@ -56,7 +56,7 @@ index f2b852e3fae..14fc79bf5a9 100644 CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ -@@ -403,6 +404,7 @@ EXEEXT = @EXEEXT@ +@@ -402,6 +403,7 @@ EXEEXT = @EXEEXT@ # Setup the testing framework, if you have one EXPECT = expect @@ -80,10 +80,10 @@ index f2b852e3fae..14fc79bf5a9 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 17463a74cca..b0b5c78a7a6 100755 +index a0e40f49a80..356503f689f 100755 --- a/libctf/configure +++ b/libctf/configure -@@ -646,6 +646,10 @@ BUILD_INFO_FALSE +@@ -645,6 +645,10 @@ BUILD_INFO_FALSE BUILD_INFO_TRUE NEED_CTF_QSORT_R_FALSE NEED_CTF_QSORT_R_TRUE @@ -94,7 +94,7 @@ index 17463a74cca..b0b5c78a7a6 100755 ENABLE_LIBCTF_HASH_DEBUGGING_FALSE ENABLE_LIBCTF_HASH_DEBUGGING_TRUE zlibinc -@@ -807,6 +811,7 @@ enable_maintainer_mode +@@ -806,6 +810,7 @@ enable_maintainer_mode enable_install_libbfd with_system_zlib enable_libctf_hash_debugging @@ -102,7 +102,7 @@ index 17463a74cca..b0b5c78a7a6 100755 ' ac_precious_vars='build_alias host_alias -@@ -1464,6 +1469,8 @@ Optional Packages: +@@ -1463,6 +1468,8 @@ Optional Packages: both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-system-zlib use installed libz @@ -111,25 +111,25 @@ index 17463a74cca..b0b5c78a7a6 100755 Some influential environment variables: CC C compiler command -@@ -11632,7 +11639,7 @@ else +@@ -11631,7 +11638,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11635 "configure" -+#line 11665 "configure" +-#line 11634 "configure" ++#line 11641 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11738,7 +11745,7 @@ else +@@ -11737,7 +11744,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11741 "configure" -+#line 11771 "configure" +-#line 11740 "configure" ++#line 11747 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -14305,6 +14312,26 @@ else +@@ -14304,6 +14311,26 @@ else fi @@ -156,7 +156,7 @@ index 17463a74cca..b0b5c78a7a6 100755 # Similar to GDB_AC_CHECK_BFD. OLD_CFLAGS=$CFLAGS OLD_LDFLAGS=$LDFLAGS -@@ -15199,6 +15226,10 @@ if test -z "${ENABLE_LIBCTF_HASH_DEBUGGING_TRUE}" && test -z "${ENABLE_LIBCTF_HA +@@ -15196,6 +15223,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,7 +168,7 @@ index 17463a74cca..b0b5c78a7a6 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 a0148a4c328..1901ade381d 100644 +index 6a5eade1855..a0e65a4aeda 100644 --- a/libctf/configure.ac +++ b/libctf/configure.ac @@ -76,6 +76,16 @@ if test "${enable_libctf_hash_debugging}" = yes; then @@ -189,5 +189,5 @@ index a0148a4c328..1901ade381d 100644 OLD_CFLAGS=$CFLAGS OLD_LDFLAGS=$LDFLAGS -- -2.38.2 +2.40.0 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 303942b..eb2c2b0 100644 --- a/9999/0006-Gentoo-XFAIL-15-broken-ld.gold-tests.patch +++ b/9999/0006-Gentoo-XFAIL-15-broken-ld.gold-tests.patch @@ -1,7 +1,7 @@ -From a5ae5bca2b691999092655fe0df9b6c22e76ffaa Mon Sep 17 00:00:00 2001 +From 15971356d40e17c2409f729d376237a6d1a980c6 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 +Subject: [PATCH 6/7] Gentoo: XFAIL 15 broken ld.gold tests It seems like either the tests or ld.gold in general cannot handle compilers built with --enable-default-pie. No fix yet, so let's ignore @@ -73,5 +73,5 @@ index fb0eb12553b..b506a7f8da7 100644 AUTOMAKE_OPTIONS = foreign -Wno-portability -- -2.38.2 +2.40.0 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 d915528..808d877 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,8 +1,8 @@ -From afc5e9fab399c9164f7355b69d0e23318d0559a5 Mon Sep 17 00:00:00 2001 +From d76981d4b7bb9bc31825a3ccf5a075ac2694a4c0 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] Apply a similar libiberty fix as in 7d53105d for libopcodes - and libgprofng +Subject: [PATCH 7/7] Apply a similar libiberty fix as in 7d53105d for + libopcodes and libgprofng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -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 ab90bb08c5f..96256faf788 100644 +index 219367fb9ce..d9365260e8d 100644 --- a/gprofng/src/Makefile.am +++ b/gprofng/src/Makefile.am @@ -131,7 +131,8 @@ libgprofng_la_LDFLAGS = -version-info 0:0:0 @@ -32,10 +32,10 @@ index ab90bb08c5f..96256faf788 100644 $(GPROFNG_LIBADD) \ -lpthread -ldl diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in -index 605fa4f6fd4..f968d8d6e59 100644 +index b881268b0d9..0e8b707f7d7 100644 --- a/gprofng/src/Makefile.in +++ b/gprofng/src/Makefile.in -@@ -555,7 +555,8 @@ libgprofng_la_LDFLAGS = -version-info 0:0:0 +@@ -552,7 +552,8 @@ libgprofng_la_LDFLAGS = -version-info 0:0:0 # Pass -lpthread instead of $(PTHREAD_LIBS) due to $(PTHREAD_LIBS) being empty # when -nostdlib is passed to libtool. # See bug 29364 - libgprofng.so: needs to link against -pthread @@ -46,7 +46,7 @@ index 605fa4f6fd4..f968d8d6e59 100644 $(GPROFNG_LIBADD) \ -lpthread -ldl diff --git a/opcodes/configure b/opcodes/configure -index d2364991ee8..1f483e37fc9 100755 +index 8717d99ca26..fbdf41f87be 100755 --- a/opcodes/configure +++ b/opcodes/configure @@ -12445,10 +12445,10 @@ if test "$enable_shared" = "yes"; then @@ -80,5 +80,5 @@ index 1beb72e87e0..79310916f7d 100644 ;; esac -- -2.39.2 +2.40.0 |