From 32447c33ce6d91ee878c144786f488d6936fac28 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Nov 19 2019 19:55:54 +0000 Subject: Add binutils_24267.patch, Drop non-relevant patches from native binutils package --- diff --git a/0001-Plugin-target-handling.patch b/0001-Plugin-target-handling.patch index 9a5d020..e808184 100644 --- a/0001-Plugin-target-handling.patch +++ b/0001-Plugin-target-handling.patch @@ -1,6 +1,6 @@ -diff -rupN binutils-2.32/bfd/config.bfd binutils-2.32-new/bfd/config.bfd +diff -rupN --no-dereference binutils-2.32/bfd/config.bfd binutils-2.32-new/bfd/config.bfd --- binutils-2.32/bfd/config.bfd 2019-01-19 17:01:32.000000000 +0100 -+++ binutils-2.32-new/bfd/config.bfd 2019-08-07 01:44:26.018756048 +0200 ++++ binutils-2.32-new/bfd/config.bfd 2019-11-19 20:47:16.708676031 +0100 @@ -217,11 +217,6 @@ esac # convention, else the table becomes a real mess to understand and maintain. @@ -13,9 +13,9 @@ diff -rupN binutils-2.32/bfd/config.bfd binutils-2.32-new/bfd/config.bfd # START OF targmatch.h #ifdef BFD64 aarch64-*-darwin*) -diff -rupN binutils-2.32/bfd/configure binutils-2.32-new/bfd/configure +diff -rupN --no-dereference binutils-2.32/bfd/configure binutils-2.32-new/bfd/configure --- binutils-2.32/bfd/configure 2019-02-02 16:47:56.000000000 +0100 -+++ binutils-2.32-new/bfd/configure 2019-08-07 01:44:26.020756037 +0200 ++++ binutils-2.32-new/bfd/configure 2019-11-19 20:47:16.710676043 +0100 @@ -12409,10 +12409,6 @@ else fi @@ -62,9 +62,9 @@ diff -rupN binutils-2.32/bfd/configure binutils-2.32-new/bfd/configure # Target architecture .o files. # A couple of CPUs use shorter file names to avoid problems on DOS # filesystems. -diff -rupN binutils-2.32/bfd/configure.ac binutils-2.32-new/bfd/configure.ac +diff -rupN --no-dereference binutils-2.32/bfd/configure.ac binutils-2.32-new/bfd/configure.ac --- binutils-2.32/bfd/configure.ac 2019-01-19 17:01:32.000000000 +0100 -+++ binutils-2.32-new/bfd/configure.ac 2019-08-07 01:44:26.020756037 +0200 ++++ binutils-2.32-new/bfd/configure.ac 2019-11-19 20:47:16.710676043 +0100 @@ -46,10 +46,6 @@ ACX_LARGEFILE AM_CONDITIONAL(PLUGINS, test "$plugins" = "yes") @@ -111,9 +111,9 @@ diff -rupN binutils-2.32/bfd/configure.ac binutils-2.32-new/bfd/configure.ac # Target architecture .o files. # A couple of CPUs use shorter file names to avoid problems on DOS # filesystems. -diff -rupN binutils-2.32/bfd/format.c binutils-2.32-new/bfd/format.c +diff -rupN --no-dereference binutils-2.32/bfd/format.c binutils-2.32-new/bfd/format.c --- binutils-2.32/bfd/format.c 2019-01-19 17:01:33.000000000 +0100 -+++ binutils-2.32-new/bfd/format.c 2019-08-07 01:44:26.021756031 +0200 ++++ binutils-2.32-new/bfd/format.c 2019-11-19 20:47:16.710676043 +0100 @@ -290,8 +290,15 @@ bfd_check_format_matches (bfd *abfd, bfd { const bfd_target *temp; @@ -131,9 +131,9 @@ diff -rupN binutils-2.32/bfd/format.c binutils-2.32-new/bfd/format.c || (!abfd->target_defaulted && *target == save_targ)) continue; -diff -rupN binutils-2.32/bfd/targets.c binutils-2.32-new/bfd/targets.c +diff -rupN --no-dereference binutils-2.32/bfd/targets.c binutils-2.32-new/bfd/targets.c --- binutils-2.32/bfd/targets.c 2019-01-19 17:01:33.000000000 +0100 -+++ binutils-2.32-new/bfd/targets.c 2019-08-07 01:44:26.021756031 +0200 ++++ binutils-2.32-new/bfd/targets.c 2019-11-19 20:47:16.711676049 +0100 @@ -1142,10 +1142,6 @@ static const bfd_target * const _bfd_tar &pj_elf32_vec, &pj_elf32_le_vec, diff --git a/binutils-2.20.51.0.2-libtool-lib64.patch b/binutils-2.20.51.0.2-libtool-lib64.patch deleted file mode 100644 index 142fc7e..0000000 --- a/binutils-2.20.51.0.2-libtool-lib64.patch +++ /dev/null @@ -1,236 +0,0 @@ -diff -rcp ../binutils-2.20.51.0.7.original/bfd/configure ./bfd/configure ---- a/bfd/configure 2010-04-08 14:53:48.000000000 +0100 -+++ b/bfd/configure 2010-04-08 14:56:50.000000000 +0100 -@@ -10762,10 +10762,34 @@ - # before this can be enabled. - hardcode_into_libs=yes - -+ # find out which ABI we are using -+ libsuff= -+ case "$host_cpu" in -+ x86_64*|s390*|powerpc*|ppc*|sparc*) -+ echo 'int i;' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *64-bit*) -+ libsuff=64 -+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then -+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ fi -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ esac -+ - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -diff -rcp ../binutils-2.20.51.0.7.original/binutils/configure ./binutils/configure ---- a/binutils/configure 2010-04-08 14:53:45.000000000 +0100 -+++ b/binutils/configure 2010-04-08 14:56:21.000000000 +0100 -@@ -10560,10 +10560,34 @@ - # before this can be enabled. - hardcode_into_libs=yes - -+ # find out which ABI we are using -+ libsuff= -+ case "$host_cpu" in -+ x86_64*|s390*|powerpc*|ppc*|sparc*) -+ echo 'int i;' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *64-bit*) -+ libsuff=64 -+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then -+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ fi -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ esac -+ - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -diff -rcp ../binutils-2.20.51.0.7.original/gas/configure ./gas/configure ---- a/gas/configure 2010-04-08 14:53:47.000000000 +0100 -+++ b/gas/configure 2010-04-08 14:57:24.000000000 +0100 -@@ -10547,10 +10547,34 @@ - # before this can be enabled. - hardcode_into_libs=yes - -+ # find out which ABI we are using -+ libsuff= -+ case "$host_cpu" in -+ x86_64*|s390*|powerpc*|ppc*|sparc*) -+ echo 'int i;' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *64-bit*) -+ libsuff=64 -+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then -+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ fi -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ esac -+ - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -diff -rcp ../binutils-2.20.51.0.7.original/gprof/configure ./gprof/configure ---- a/gprof/configure 2010-04-08 14:53:45.000000000 +0100 -+++ b/gprof/configure 2010-04-08 14:57:50.000000000 +0100 -@@ -10485,10 +10485,34 @@ - # before this can be enabled. - hardcode_into_libs=yes - -+ # find out which ABI we are using -+ libsuff= -+ case "$host_cpu" in -+ x86_64*|s390*|powerpc*|ppc*|sparc*) -+ echo 'int i;' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *64-bit*) -+ libsuff=64 -+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then -+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ fi -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ esac -+ - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -diff -rcp ../binutils-2.20.51.0.7.original/ld/configure ./ld/configure ---- a/ld/configure 2010-04-08 14:53:44.000000000 +0100 -+++ b/ld/configure 2010-04-08 14:58:21.000000000 +0100 -@@ -10966,10 +10966,34 @@ - # before this can be enabled. - hardcode_into_libs=yes - -+ # find out which ABI we are using -+ libsuff= -+ case "$host_cpu" in -+ x86_64*|s390*|powerpc*|ppc*|sparc*) -+ echo 'int i;' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *64-bit*) -+ libsuff=64 -+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then -+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ fi -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ esac -+ - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -Only in .: .#libtool.m4 -Only in .: #libtool.m4# -diff -rcp ../binutils-2.20.51.0.7.original/opcodes/configure ./opcodes/configure ---- a/opcodes/configure 2010-04-08 14:53:45.000000000 +0100 -+++ b/opcodes/configure 2010-04-08 14:59:10.000000000 +0100 -@@ -10496,10 +10496,34 @@ - # before this can be enabled. - hardcode_into_libs=yes - -+ # find out which ABI we are using -+ libsuff= -+ case "$host_cpu" in -+ x86_64*|s390*|powerpc*|ppc*|sparc*) -+ echo 'int i;' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *64-bit*) -+ libsuff=64 -+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then -+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ fi -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ esac -+ - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on diff --git a/binutils-2.22.52.0.4-no-config-h-check.patch b/binutils-2.22.52.0.4-no-config-h-check.patch index c89195a..caf99dd 100644 --- a/binutils-2.22.52.0.4-no-config-h-check.patch +++ b/binutils-2.22.52.0.4-no-config-h-check.patch @@ -1,6 +1,7 @@ ---- a/bfd/bfd-in.h 2012-08-02 10:56:34.561769686 +0100 -+++ b/bfd/bfd-in.h 2012-08-02 11:13:27.134797755 +0100 -@@ -25,11 +25,6 @@ +diff -rupN --no-dereference binutils-2.32/bfd/bfd-in2.h binutils-2.32-new/bfd/bfd-in2.h +--- binutils-2.32/bfd/bfd-in2.h 2019-01-19 17:01:32.000000000 +0100 ++++ binutils-2.32-new/bfd/bfd-in2.h 2019-11-19 20:46:59.623577944 +0100 +@@ -30,11 +30,6 @@ #ifndef __BFD_H_SEEN__ #define __BFD_H_SEEN__ @@ -12,9 +13,10 @@ #ifdef __cplusplus extern "C" { #endif ---- a/bfd/bfd-in2.h 2012-08-02 10:56:34.349769680 +0100 -+++ b/bfd/bfd-in2.h 2012-08-02 11:13:40.015798113 +0100 -@@ -32,11 +32,6 @@ +diff -rupN --no-dereference binutils-2.32/bfd/bfd-in.h binutils-2.32-new/bfd/bfd-in.h +--- binutils-2.32/bfd/bfd-in.h 2019-01-19 17:01:32.000000000 +0100 ++++ binutils-2.32-new/bfd/bfd-in.h 2019-11-19 20:46:59.622577938 +0100 +@@ -23,11 +23,6 @@ #ifndef __BFD_H_SEEN__ #define __BFD_H_SEEN__ diff --git a/binutils-2.25-version.patch b/binutils-2.25-version.patch index d97e81b..fb1f221 100644 --- a/binutils-2.25-version.patch +++ b/binutils-2.25-version.patch @@ -1,6 +1,7 @@ ---- binutils-2.26.orig/bfd/Makefile.am 2016-01-25 10:11:33.505289018 +0000 -+++ binutils-2.26/bfd/Makefile.am 2016-01-25 10:13:23.489964145 +0000 -@@ -1043,8 +1043,8 @@ DISTCLEANFILES = $(BUILD_CFILES) $(BUILD +diff -rupN --no-dereference binutils-2.32/bfd/Makefile.am binutils-2.32-new/bfd/Makefile.am +--- binutils-2.32/bfd/Makefile.am 2019-01-19 17:01:32.000000000 +0100 ++++ binutils-2.32-new/bfd/Makefile.am 2019-11-19 20:46:58.072569411 +0100 +@@ -953,8 +953,8 @@ DISTCLEANFILES = $(BUILD_CFILES) $(BUILD bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in @echo "creating $@" @bfd_version=`echo "$(VERSION)" | $(SED) -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\ @@ -11,7 +12,7 @@ bfd_version_package="\"$(PKGVERSION)\"" ;\ report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\ . $(srcdir)/development.sh ;\ -@@ -1055,7 +1055,7 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/ +@@ -965,7 +965,7 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/ fi ;\ $(SED) -e "s,@bfd_version@,$$bfd_version," \ -e "s,@bfd_version_string@,$$bfd_version_string," \ @@ -20,9 +21,10 @@ -e "s,@report_bugs_to@,$$report_bugs_to," \ < $(srcdir)/version.h > $@; \ echo "$${bfd_soversion}" > libtool-soversion ---- binutils-2.26.orig/bfd/Makefile.in 2016-01-25 10:11:33.505289018 +0000 -+++ binutils-2.26/bfd/Makefile.in 2016-01-25 10:14:17.818297941 +0000 -@@ -2111,8 +2111,8 @@ stmp-lcoff-h: $(LIBCOFF_H_FILES) +diff -rupN --no-dereference binutils-2.32/bfd/Makefile.in binutils-2.32-new/bfd/Makefile.in +--- binutils-2.32/bfd/Makefile.in 2019-02-02 16:47:56.000000000 +0100 ++++ binutils-2.32-new/bfd/Makefile.in 2019-11-19 20:46:58.072569411 +0100 +@@ -2068,8 +2068,8 @@ stmp-lcoff-h: $(LIBCOFF_H_FILES) bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in @echo "creating $@" @bfd_version=`echo "$(VERSION)" | $(SED) -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\ @@ -33,7 +35,7 @@ bfd_version_package="\"$(PKGVERSION)\"" ;\ report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\ . $(srcdir)/development.sh ;\ -@@ -2123,7 +2123,7 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/ +@@ -2080,7 +2080,7 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/ fi ;\ $(SED) -e "s,@bfd_version@,$$bfd_version," \ -e "s,@bfd_version_string@,$$bfd_version_string," \ diff --git a/binutils-2.27-aarch64-ifunc.patch b/binutils-2.27-aarch64-ifunc.patch deleted file mode 100644 index 562ef18..0000000 --- a/binutils-2.27-aarch64-ifunc.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -rup binutils.orig/bfd/elfnn-aarch64.c binutils-2.27/bfd/elfnn-aarch64.c ---- binutils.orig/bfd/elfnn-aarch64.c 2017-02-21 10:45:19.311956006 +0000 -+++ binutils-2.27/bfd/elfnn-aarch64.c 2017-02-21 11:55:07.517922655 +0000 -@@ -4947,6 +4947,7 @@ elfNN_aarch64_final_link_relocate (reloc - it here if it is defined in a non-shared object. */ - if (h != NULL - && h->type == STT_GNU_IFUNC -+ && (input_section->flags & SEC_ALLOC) - && h->def_regular) - { - asection *plt; diff --git a/binutils-2.29-filename-in-error-messages.patch b/binutils-2.29-filename-in-error-messages.patch index d8ce241..be81eca 100644 --- a/binutils-2.29-filename-in-error-messages.patch +++ b/binutils-2.29-filename-in-error-messages.patch @@ -1,6 +1,7 @@ ---- binutils.orig/binutils/readelf.c 2018-01-22 15:48:10.450701702 +0000 -+++ binutils-2.30.0/binutils/readelf.c 2018-01-22 15:55:26.739588657 +0000 -@@ -19019,75 +19019,85 @@ process_file (char * file_name) +diff -rupN --no-dereference binutils-2.32/binutils/readelf.c binutils-2.32-new/binutils/readelf.c +--- binutils-2.32/binutils/readelf.c 2019-01-19 17:01:33.000000000 +0100 ++++ binutils-2.32-new/binutils/readelf.c 2019-11-19 20:47:00.396582218 +0100 +@@ -19642,75 +19642,85 @@ process_file (char * file_name) Filedata * filedata = NULL; struct stat statbuf; char armag[SARMAG]; diff --git a/binutils-2.29-revert-PLT-elision.patch b/binutils-2.29-revert-PLT-elision.patch deleted file mode 100644 index c5478f0..0000000 --- a/binutils-2.29-revert-PLT-elision.patch +++ /dev/null @@ -1,266 +0,0 @@ -diff -rup binutils.orig/ld/testsuite/ld-i386/pltgot-1.d binutils-2.29.1/ld/testsuite/ld-i386/pltgot-1.d ---- binutils.orig/ld/testsuite/ld-i386/pltgot-1.d 2017-11-15 13:32:39.335065263 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-i386/pltgot-1.d 2017-11-15 15:03:55.649727195 +0000 -@@ -2,6 +2,7 @@ - #readelf: -S --wide - #as: --32 - -+#pass - #... - +\[ *[0-9]+\] \.plt +PROGBITS +[0-9a-f]+ +[0-9a-f]+ +0+10 +.* - #... -diff -rup binutils.orig/ld/testsuite/ld-i386/pltgot-2.d binutils-2.29.1/ld/testsuite/ld-i386/pltgot-2.d ---- binutils.orig/ld/testsuite/ld-i386/pltgot-2.d 2017-11-15 13:32:39.329065335 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-i386/pltgot-2.d 2017-11-15 15:04:20.803430034 +0000 -@@ -3,7 +3,6 @@ - #readelf: -d --wide - #as: --32 - --#failif - #... - +0x[0-9a-f]+ +\(PLTREL.* - #... -diff -rup binutils.orig/ld/testsuite/ld-i386/pr19636-2d.d binutils-2.29.1/ld/testsuite/ld-i386/pr19636-2d.d ---- binutils.orig/ld/testsuite/ld-i386/pr19636-2d.d 2017-11-15 13:32:39.336065251 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-i386/pr19636-2d.d 2017-11-15 15:03:00.413379749 +0000 -@@ -9,7 +9,7 @@ Relocation section '\.rel\.dyn' at offse - [0-9a-f]+ +[0-9a-f]+ +R_386_32 +0+ +func - [0-9a-f]+ +[0-9a-f]+ +R_386_PC32 +0+ +func - [0-9a-f]+ +[0-9a-f]+ +R_386_GLOB_DAT +0+ +func -- -+#... - Symbol table '\.dynsym' contains [0-9]+ entries: - +Num: +Value +Size Type +Bind +Vis +Ndx Name - #... -diff -rup binutils.orig/ld/testsuite/ld-i386/pr19636-2e.d binutils-2.29.1/ld/testsuite/ld-i386/pr19636-2e.d ---- binutils.orig/ld/testsuite/ld-i386/pr19636-2e.d 2017-11-15 13:32:39.330065323 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-i386/pr19636-2e.d 2017-11-15 15:03:28.928042882 +0000 -@@ -9,7 +9,7 @@ Relocation section '\.rel\.dyn' at offse - [0-9a-f]+ +[0-9a-f]+ +R_386_32 +0+ +func - [0-9a-f]+ +[0-9a-f]+ +R_386_PC32 +0+ +func - [0-9a-f]+ +[0-9a-f]+ +R_386_GLOB_DAT +0+ +func -- -+#... - Symbol table '\.dynsym' contains [0-9]+ entries: - +Num: +Value +Size Type +Bind +Vis +Ndx Name - #... -diff -rup binutils.orig/ld/testsuite/ld-x86-64/pltgot-1.d binutils-2.29.1/ld/testsuite/ld-x86-64/pltgot-1.d ---- binutils.orig/ld/testsuite/ld-x86-64/pltgot-1.d 2017-11-15 13:32:39.415064300 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pltgot-1.d 2017-11-15 15:08:39.333375801 +0000 -@@ -2,8 +2,4 @@ - #readelf: -S --wide - #as: --64 - --#... -- +\[ *[0-9]+\] \.plt +PROGBITS +[0-9a-f]+ +[0-9a-f]+ +0+10 +.* --#... -- +\[ *[0-9]+\] \.got\.plt +PROGBITS +[0-9a-f]+ +[0-9a-f]+ +0+18 +.* - #pass -diff -rup binutils.orig/ld/testsuite/ld-x86-64/pltgot-2.d binutils-2.29.1/ld/testsuite/ld-x86-64/pltgot-2.d ---- binutils.orig/ld/testsuite/ld-x86-64/pltgot-2.d 2017-11-15 13:32:39.404064432 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pltgot-2.d 2017-11-15 15:08:59.031143095 +0000 -@@ -3,7 +3,6 @@ - #readelf: -d --wide - #as: --64 - --#failif - #... - +0x[0-9a-f]+ +\(PLTREL.* - #... -diff -rup binutils.orig/ld/testsuite/ld-x86-64/plt-main-bnd.dd binutils-2.29.1/ld/testsuite/ld-x86-64/plt-main-bnd.dd ---- binutils.orig/ld/testsuite/ld-x86-64/plt-main-bnd.dd 2017-11-15 13:32:39.405064420 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/plt-main-bnd.dd 2017-11-15 15:06:53.694623801 +0000 -@@ -1,7 +1,4 @@ --#... --Disassembly of section .plt.got: - --[a-f0-9]+ <[a-z_]+@plt>: --[ ]*[a-f0-9]+: f2 ff 25 .. .. 20 00 bnd jmpq \*0x20....\(%rip\) # ...... <.*> -+#... - [ ]*[a-f0-9]+: 90 nop - #pass -diff -rup binutils.orig/ld/testsuite/ld-x86-64/plt-main-ibt.dd binutils-2.29.1/ld/testsuite/ld-x86-64/plt-main-ibt.dd ---- binutils.orig/ld/testsuite/ld-x86-64/plt-main-ibt.dd 2017-11-15 13:32:39.412064336 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/plt-main-ibt.dd 2017-11-15 15:06:35.148842897 +0000 -@@ -1,7 +1,3 @@ - #... --Disassembly of section .plt.got: -- --[a-f0-9]+ <[_a-z]+@plt>: - [ ]*[a-f0-9]+: f3 0f 1e fa endbr64 --[ ]*[a-f0-9]+: f2 ff 25 .. .. 20 00 bnd jmpq \*0x20....\(%rip\) # ...... <[_a-z]+> - #pass -diff -rup binutils.orig/ld/testsuite/ld-x86-64/plt-main.rd binutils-2.29.1/ld/testsuite/ld-x86-64/plt-main.rd ---- binutils.orig/ld/testsuite/ld-x86-64/plt-main.rd 2017-11-15 13:32:39.407064397 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/plt-main.rd 2017-11-15 15:06:17.244054423 +0000 -@@ -1,4 +1,3 @@ --#failif - #... - [0-9a-f ]+R_X86_64_JUMP_SLOT +0+ +bar \+ 0 - #... -diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr20830a.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830a.d ---- binutils.orig/ld/testsuite/ld-x86-64/pr20830a.d 2017-11-15 13:32:39.412064336 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830a.d 2017-11-15 15:15:09.918750288 +0000 -@@ -20,6 +20,7 @@ Contents of the .eh_frame section: - DW_CFA_offset: r16 \(rip\) at cfa-8 - DW_CFA_nop - DW_CFA_nop -+#pass - - 0+18 0000000000000014 0000001c FDE cie=00000000 pc=00000000000001c8..00000000000001d4 - DW_CFA_nop -diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr20830a-now.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830a-now.d ---- binutils.orig/ld/testsuite/ld-x86-64/pr20830a-now.d 2017-11-15 13:32:39.413064324 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830a-now.d 2017-11-15 15:16:08.227055104 +0000 -@@ -20,6 +20,7 @@ Contents of the .eh_frame section: - DW_CFA_offset: r16 \(rip\) at cfa-8 - DW_CFA_nop - DW_CFA_nop -+#pass - - 0+18 0000000000000014 0000001c FDE cie=00000000 pc=00000000000001c8..00000000000001d4 - DW_CFA_nop -diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr20830b.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830b.d ---- binutils.orig/ld/testsuite/ld-x86-64/pr20830b.d 2017-11-15 13:32:39.413064324 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830b.d 2017-11-15 15:16:20.115913358 +0000 -@@ -20,7 +20,8 @@ Contents of the .eh_frame section: - DW_CFA_offset: r16 \(rip\) at cfa-8 - DW_CFA_nop - DW_CFA_nop -- -+#pass -+ - 0+18 0000000000000010 0000001c FDE cie=00000000 pc=0000000000000138..0000000000000144 - DW_CFA_nop - DW_CFA_nop -diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr20830b-now.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830b-now.d ---- binutils.orig/ld/testsuite/ld-x86-64/pr20830b-now.d 2017-11-15 13:32:39.411064348 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830b-now.d 2017-11-15 15:16:29.012807282 +0000 -@@ -20,7 +20,8 @@ Contents of the .eh_frame section: - DW_CFA_offset: r16 \(rip\) at cfa-8 - DW_CFA_nop - DW_CFA_nop -- -+#pass -+ - 0+18 0000000000000010 0000001c FDE cie=00000000 pc=0000000000000138..0000000000000144 - DW_CFA_nop - DW_CFA_nop -diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038a.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038a.d ---- binutils.orig/ld/testsuite/ld-x86-64/pr21038a.d 2017-11-15 13:32:39.408064384 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038a.d 2017-11-15 15:19:48.097433680 +0000 -@@ -19,7 +19,8 @@ Contents of the .eh_frame section: - DW_CFA_offset: r16 \(rip\) at cfa-8 - DW_CFA_nop - DW_CFA_nop -- -+#pass -+ - 0+18 0000000000000014 0000001c FDE cie=00000000 pc=00000000000001c8..00000000000001d4 - DW_CFA_nop - DW_CFA_nop -diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038a-now.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038a-now.d ---- binutils.orig/ld/testsuite/ld-x86-64/pr21038a-now.d 2017-11-15 13:32:39.401064469 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038a-now.d 2017-11-15 15:10:56.077760324 +0000 -@@ -20,7 +20,8 @@ Contents of the .eh_frame section: - DW_CFA_offset: r16 \(rip\) at cfa-8 - DW_CFA_nop - DW_CFA_nop -- -+#pass -+ - 0+18 0000000000000014 0000001c FDE cie=00000000 pc=00000000000001c8..00000000000001d4 - DW_CFA_nop - DW_CFA_nop -diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038b.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038b.d ---- binutils.orig/ld/testsuite/ld-x86-64/pr21038b.d 2017-11-15 13:32:39.405064420 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038b.d 2017-11-15 15:10:42.828916844 +0000 -@@ -19,6 +19,7 @@ Contents of the .eh_frame section: - DW_CFA_offset: r16 \(rip\) at cfa-8 - DW_CFA_nop - DW_CFA_nop -+#pass - - 0+18 0000000000000014 0000001c FDE cie=00000000 pc=00000000000001d8..00000000000001dd - DW_CFA_nop -diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038b-now.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038b-now.d ---- binutils.orig/ld/testsuite/ld-x86-64/pr21038b-now.d 2017-11-15 13:32:39.416064288 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038b-now.d 2017-11-15 15:11:11.550577531 +0000 -@@ -20,7 +20,8 @@ Contents of the .eh_frame section: - DW_CFA_offset: r16 \(rip\) at cfa-8 - DW_CFA_nop - DW_CFA_nop -- -+#pass -+ - 0+18 0000000000000014 0000001c FDE cie=00000000 pc=00000000000001d8..00000000000001dd - DW_CFA_nop - DW_CFA_nop -diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038c.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038c.d ---- binutils.orig/ld/testsuite/ld-x86-64/pr21038c.d 2017-11-15 13:32:39.411064348 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038c.d 2017-11-15 15:09:52.664509478 +0000 -@@ -19,7 +19,8 @@ Contents of the .eh_frame section: - DW_CFA_offset: r16 \(rip\) at cfa-8 - DW_CFA_nop - DW_CFA_nop -- -+#pass -+ - 0+18 0000000000000014 0000001c FDE cie=00000000 pc=0000000000000220..0000000000000231 - DW_CFA_nop - DW_CFA_nop -diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038c-now.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038c-now.d ---- binutils.orig/ld/testsuite/ld-x86-64/pr21038c-now.d 2017-11-15 13:32:39.413064324 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038c-now.d 2017-11-15 15:11:22.975442559 +0000 -@@ -20,7 +20,8 @@ Contents of the .eh_frame section: - DW_CFA_offset: r16 \(rip\) at cfa-8 - DW_CFA_nop - DW_CFA_nop -- -+#pass -+ - 0+18 0000000000000014 0000001c FDE cie=00000000 pc=0000000000000220..0000000000000231 - DW_CFA_nop - DW_CFA_nop -diff -rup binutils.orig/ld/testsuite/ld-x86-64/tlspic2.rd binutils-2.29.1/ld/testsuite/ld-x86-64/tlspic2.rd ---- binutils.orig/ld/testsuite/ld-x86-64/tlspic2.rd 2017-11-15 13:32:39.417064276 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/tlspic2.rd 2017-11-15 15:05:02.950932110 +0000 -@@ -14,6 +14,7 @@ Section Headers: - +\[[ 0-9]+\] .dynsym +.* - +\[[ 0-9]+\] .dynstr +.* - +\[[ 0-9]+\] .rela.dyn +.* -+#pass - +\[[ 0-9]+\] .plt +.* - +\[[ 0-9]+\] .plt.got +.* - +\[[ 0-9]+\] .text +PROGBITS +0+1000 0+1000 0+31a 00 +AX +0 +0 4096 ---- binutils.orig/bfd/elfxx-x86.c 2018-01-22 15:59:25.875788033 +0000 -+++ binutils-2.30.0/bfd/elfxx-x86.c 2018-01-22 16:00:20.789146597 +0000 -@@ -107,7 +107,7 @@ elf_x86_allocate_dynrelocs (struct elf_l - plt_entry_size = htab->plt.plt_entry_size; - - resolved_to_zero = UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh); -- -+#if 0 - /* We can't use the GOT PLT if pointer equality is needed since - finish_dynamic_symbol won't clear symbol value and the dynamic - linker won't update the GOT slot. We will get into an infinite -@@ -125,7 +125,7 @@ elf_x86_allocate_dynrelocs (struct elf_l - /* Use the GOT PLT. */ - eh->plt_got.refcount = 1; - } -- -+#endif - /* Since STT_GNU_IFUNC symbol must go through PLT, we handle it - here if it is defined and referenced in a non-shared object. */ - if (h->type == STT_GNU_IFUNC ---- binutils.orig/ld/testsuite/ld-i386/pr20830.d 2018-07-09 09:49:51.277239857 +0100 -+++ binutils-2.30.90/ld/testsuite/ld-i386/pr20830.d 2018-07-09 10:32:41.113356733 +0100 -@@ -19,7 +19,7 @@ Contents of the .eh_frame section: - DW_CFA_offset: r8 \(eip\) at cfa-4 - DW_CFA_nop - DW_CFA_nop -- -+#pass - 0+18 00000010 0000001c FDE cie=00000000 pc=00000128..00000133 - DW_CFA_nop - DW_CFA_nop diff --git a/binutils-CVE-2019-1010204.patch b/binutils-CVE-2019-1010204.patch index 56434b1..fa3a250 100644 --- a/binutils-CVE-2019-1010204.patch +++ b/binutils-CVE-2019-1010204.patch @@ -1,5 +1,6 @@ ---- binutils.orig/gold/fileread.cc 2019-08-06 14:22:08.669313110 +0100 -+++ binutils-2.32/gold/fileread.cc 2019-08-06 14:22:28.799177543 +0100 +diff -rupN --no-dereference binutils-2.32/gold/fileread.cc binutils-2.32-new/gold/fileread.cc +--- binutils-2.32/gold/fileread.cc 2019-01-19 17:01:33.000000000 +0100 ++++ binutils-2.32-new/gold/fileread.cc 2019-11-19 20:47:14.475662786 +0100 @@ -381,6 +381,12 @@ File_read::do_read(off_t start, section_ ssize_t bytes; if (this->whole_file_view_ != NULL) diff --git a/binutils-CVE-2019-14250.patch b/binutils-CVE-2019-14250.patch index c37b92e..aa4c8fc 100644 --- a/binutils-CVE-2019-14250.patch +++ b/binutils-CVE-2019-14250.patch @@ -1,5 +1,6 @@ ---- binutils.orig/libiberty/simple-object-elf.c 2019-08-09 14:13:51.677330065 +0100 -+++ binutils-2.32/libiberty/simple-object-elf.c 2019-08-09 14:14:31.177076298 +0100 +diff -rupN --no-dereference binutils-2.32/libiberty/simple-object-elf.c binutils-2.32-new/libiberty/simple-object-elf.c +--- binutils-2.32/libiberty/simple-object-elf.c 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/libiberty/simple-object-elf.c 2019-11-19 20:47:15.208667119 +0100 @@ -549,6 +549,14 @@ simple_object_elf_match (unsigned char h return NULL; } diff --git a/binutils-CVE-2019-14444.patch b/binutils-CVE-2019-14444.patch index ad554f5..1a869ac 100644 --- a/binutils-CVE-2019-14444.patch +++ b/binutils-CVE-2019-14444.patch @@ -1,5 +1,6 @@ ---- binutils.orig/binutils/readelf.c 2019-08-13 10:03:33.518792590 +0100 -+++ binutils-2.32/binutils/readelf.c 2019-08-13 10:04:22.885418269 +0100 +diff -rupN --no-dereference binutils-2.32/binutils/readelf.c binutils-2.32-new/binutils/readelf.c +--- binutils-2.32/binutils/readelf.c 2019-11-19 20:47:07.833624139 +0100 ++++ binutils-2.32-new/binutils/readelf.c 2019-11-19 20:47:15.941671465 +0100 @@ -13234,7 +13234,7 @@ apply_relocations (Filedata * } diff --git a/binutils-CVE-2019-9071.patch b/binutils-CVE-2019-9071.patch index f4ef3bc..e50676b 100644 --- a/binutils-CVE-2019-9071.patch +++ b/binutils-CVE-2019-9071.patch @@ -1,6 +1,7 @@ ---- binutils.orig/libiberty/cp-demangle.c 2019-04-10 10:31:27.854997707 +0100 -+++ binutils-2.31.1/libiberty/cp-demangle.c 2019-04-10 16:00:35.820350978 +0100 -@@ -858,7 +858,7 @@ CP_STATIC_IF_GLIBCPP_V3 +diff -rupN --no-dereference binutils-2.32/libiberty/cp-demangle.c binutils-2.32-new/libiberty/cp-demangle.c +--- binutils-2.32/libiberty/cp-demangle.c 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/libiberty/cp-demangle.c 2019-11-19 20:47:08.574628396 +0100 +@@ -861,7 +861,7 @@ CP_STATIC_IF_GLIBCPP_V3 int cplus_demangle_fill_name (struct demangle_component *p, const char *s, int len) { @@ -9,7 +10,7 @@ return 0; p->d_printing = 0; p->type = DEMANGLE_COMPONENT_NAME; -@@ -4032,7 +4032,7 @@ d_growable_string_callback_adapter (cons +@@ -4055,7 +4055,7 @@ d_growable_string_callback_adapter (cons are larger than the actual numbers encountered. */ static void @@ -18,7 +19,7 @@ const struct demangle_component *dc) { if (dc == NULL) -@@ -4052,13 +4052,13 @@ d_count_templates_scopes (int *num_templ +@@ -4075,13 +4075,13 @@ d_count_templates_scopes (int *num_templ break; case DEMANGLE_COMPONENT_TEMPLATE: @@ -34,7 +35,7 @@ goto recurse_left_right; case DEMANGLE_COMPONENT_QUAL_NAME: -@@ -4122,42 +4122,42 @@ d_count_templates_scopes (int *num_templ +@@ -4146,42 +4146,42 @@ d_count_templates_scopes (int *num_templ case DEMANGLE_COMPONENT_TAGGED_NAME: case DEMANGLE_COMPONENT_CLONE: recurse_left_right: @@ -93,7 +94,7 @@ break; } } -@@ -4192,8 +4192,12 @@ d_print_init (struct d_print_info *dpi, +@@ -4216,8 +4216,12 @@ d_print_init (struct d_print_info *dpi, dpi->next_copy_template = 0; dpi->num_copy_templates = 0; diff --git a/binutils-CVE-2019-9073.patch b/binutils-CVE-2019-9073.patch index 37256f4..b460828 100644 --- a/binutils-CVE-2019-9073.patch +++ b/binutils-CVE-2019-9073.patch @@ -1,6 +1,7 @@ ---- binutils.orig/binutils/objdump.c 2019-02-25 16:12:30.394056901 +0000 -+++ binutils-2.31.1/binutils/objdump.c 2019-02-25 16:13:07.224778005 +0000 -@@ -2993,7 +2993,9 @@ dump_bfd_header (bfd *abfd) +diff -rupN --no-dereference binutils-2.32/binutils/objdump.c binutils-2.32-new/binutils/objdump.c +--- binutils-2.32/binutils/objdump.c 2019-01-19 17:01:33.000000000 +0100 ++++ binutils-2.32-new/binutils/objdump.c 2019-11-19 20:47:04.839607089 +0100 +@@ -3178,7 +3178,9 @@ dump_bfd_header (bfd *abfd) static void dump_bfd_private_header (bfd *abfd) { diff --git a/binutils-CVE-2019-9074.patch b/binutils-CVE-2019-9074.patch index 84f0fd5..ef46e3c 100644 --- a/binutils-CVE-2019-9074.patch +++ b/binutils-CVE-2019-9074.patch @@ -1,5 +1,6 @@ ---- binutils.orig/bfd/pei-x86_64.c 2019-02-25 16:12:29.798061414 +0000 -+++ binutils-2.31.1/bfd/pei-x86_64.c 2019-02-25 17:09:02.783425236 +0000 +diff -rupN --no-dereference binutils-2.32/bfd/pei-x86_64.c binutils-2.32-new/bfd/pei-x86_64.c +--- binutils-2.32/bfd/pei-x86_64.c 2019-01-19 17:01:33.000000000 +0100 ++++ binutils-2.32-new/bfd/pei-x86_64.c 2019-11-19 20:47:05.573611249 +0100 @@ -541,7 +541,7 @@ pex64_bfd_print_pdata_section (bfd *abfd /* virt_size might be zero for objects. */ if (stop == 0 && strcmp (abfd->xvec->name, "pe-x86-64") == 0) diff --git a/binutils-CVE-2019-9075.patch b/binutils-CVE-2019-9075.patch index ec3e8ca..5f11621 100644 --- a/binutils-CVE-2019-9075.patch +++ b/binutils-CVE-2019-9075.patch @@ -1,6 +1,6 @@ -diff -rup binutils.orig/bfd/archive64.c binutils-2.31.1/bfd/archive64.c ---- binutils.orig/bfd/archive64.c 2019-02-26 11:17:11.882530151 +0000 -+++ binutils-2.31.1/bfd/archive64.c 2019-02-26 11:19:18.422488805 +0000 +diff -rupN --no-dereference binutils-2.32/bfd/archive64.c binutils-2.32-new/bfd/archive64.c +--- binutils-2.32/bfd/archive64.c 2019-01-19 17:01:32.000000000 +0100 ++++ binutils-2.32-new/bfd/archive64.c 2019-11-19 20:47:06.349615660 +0100 @@ -100,8 +100,6 @@ _bfd_archive_64_bit_slurp_armap (bfd *ab return FALSE; carsyms = ardata->symdefs; @@ -31,10 +31,10 @@ diff -rup binutils.orig/bfd/archive64.c binutils-2.31.1/bfd/archive64.c ardata->symdef_count = nsymz; ardata->first_file_filepos = bfd_tell (abfd); -diff -rup binutils.orig/bfd/archive.c binutils-2.31.1/bfd/archive.c ---- binutils.orig/bfd/archive.c 2019-02-26 11:17:11.884530134 +0000 -+++ binutils-2.31.1/bfd/archive.c 2019-02-26 11:18:33.354859687 +0000 -@@ -1014,6 +1014,7 @@ do_slurp_coff_armap (bfd *abfd) +diff -rupN --no-dereference binutils-2.32/bfd/archive.c binutils-2.32-new/bfd/archive.c +--- binutils-2.32/bfd/archive.c 2019-01-19 17:01:32.000000000 +0100 ++++ binutils-2.32-new/bfd/archive.c 2019-11-19 20:47:06.350615666 +0100 +@@ -1012,6 +1012,7 @@ do_slurp_coff_armap (bfd *abfd) int *raw_armap, *rawptr; struct artdata *ardata = bfd_ardata (abfd); char *stringbase; @@ -42,7 +42,7 @@ diff -rup binutils.orig/bfd/archive.c binutils-2.31.1/bfd/archive.c bfd_size_type stringsize; bfd_size_type parsed_size; carsym *carsyms; -@@ -1073,22 +1074,20 @@ do_slurp_coff_armap (bfd *abfd) +@@ -1071,22 +1072,20 @@ do_slurp_coff_armap (bfd *abfd) } /* OK, build the carsyms. */ diff --git a/binutils-CVE-2019-9077.patch b/binutils-CVE-2019-9077.patch index 1790bfa..19e57bf 100644 --- a/binutils-CVE-2019-9077.patch +++ b/binutils-CVE-2019-9077.patch @@ -1,6 +1,7 @@ ---- binutils.orig/binutils/readelf.c 2019-02-26 11:17:12.414525772 +0000 -+++ binutils-2.31.1/binutils/readelf.c 2019-02-26 12:11:40.642876742 +0000 -@@ -16009,6 +16009,13 @@ process_mips_specific (Filedata * fileda +diff -rupN --no-dereference binutils-2.32/binutils/readelf.c binutils-2.32-new/binutils/readelf.c +--- binutils-2.32/binutils/readelf.c 2019-11-19 20:47:01.883590484 +0100 ++++ binutils-2.32-new/binutils/readelf.c 2019-11-19 20:47:07.105619971 +0100 +@@ -16200,6 +16200,13 @@ process_mips_specific (Filedata * fileda return FALSE; } diff --git a/binutils-aarch64-gold-PLT-for-MOVW_ABS.patch b/binutils-aarch64-gold-PLT-for-MOVW_ABS.patch index 2cdb734..8141307 100644 --- a/binutils-aarch64-gold-PLT-for-MOVW_ABS.patch +++ b/binutils-aarch64-gold-PLT-for-MOVW_ABS.patch @@ -1,5 +1,6 @@ ---- binutils.orig/gold/aarch64.cc 2019-05-21 11:24:07.642560743 +0100 -+++ binutils-2.32/gold/aarch64.cc 2019-05-21 11:25:02.425157682 +0100 +diff -rupN --no-dereference binutils-2.32/gold/aarch64.cc binutils-2.32-new/gold/aarch64.cc +--- binutils-2.32/gold/aarch64.cc 2019-01-19 17:01:33.000000000 +0100 ++++ binutils-2.32-new/gold/aarch64.cc 2019-11-19 20:47:09.316632670 +0100 @@ -6496,6 +6496,17 @@ Target_aarch64::Scan:: gold_error(_("%s: unsupported reloc %u in pos independent link."), object->name().c_str(), r_type); diff --git a/binutils-attach-to-group.patch b/binutils-attach-to-group.patch deleted file mode 100644 index 7bb5348..0000000 --- a/binutils-attach-to-group.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -rup binutils.orig/gas/config/obj-elf.c binutils-2.30/gas/config/obj-elf.c ---- binutils.orig/gas/config/obj-elf.c 2018-09-24 17:50:06.974172867 +0100 -+++ binutils-2.30/gas/config/obj-elf.c 2018-09-25 15:19:33.559830794 +0100 -@@ -82,9 +82,11 @@ static void obj_elf_gnu_attribute (int); - static void obj_elf_tls_common (int); - static void obj_elf_lcomm (int); - static void obj_elf_struct (int); -+static void obj_elf_attach_to_group (int); - - static const pseudo_typeS elf_pseudo_table[] = - { -+ {"attach_to_group", obj_elf_attach_to_group, 0}, - {"comm", obj_elf_common, 0}, - {"common", obj_elf_common, 1}, - {"ident", obj_elf_ident, 0}, -@@ -1007,6 +1009,27 @@ obj_elf_section_name (void) - return name; - } - -+static void -+obj_elf_attach_to_group (int dummy ATTRIBUTE_UNUSED) -+{ -+ const char * gname = obj_elf_section_name (); -+ -+ if (gname == NULL) -+ { -+ as_warn ("group name not parseable"); -+ return; -+ } -+ -+ if (elf_group_name (now_seg)) -+ { -+ as_warn ("already has a group"); -+ return; -+ } -+ -+ elf_group_name (now_seg) = xstrdup (gname); -+ elf_section_flags (now_seg) |= SHF_GROUP; -+} -+ - void - obj_elf_section (int push) - { -diff -rup binutils.orig/gas/doc/as.texinfo binutils-2.30/gas/doc/as.texinfo ---- binutils.orig/gas/doc/as.texi 2018-09-24 17:50:06.984172788 +0100 -+++ binutils-2.30/gas/doc/as.texi 2018-09-25 15:19:43.557748972 +0100 -@@ -4407,6 +4407,7 @@ Some machine configurations provide addi - * Altmacro:: @code{.altmacro} - * Ascii:: @code{.ascii "@var{string}"}@dots{} - * Asciz:: @code{.asciz "@var{string}"}@dots{} -+* Attach_to_group:: @code{.attach_to_group @var{name}} - * Balign:: @code{.balign @var{abs-expr} , @var{abs-expr}} - * Bundle directives:: @code{.bundle_align_mode @var{abs-expr}}, etc - * Byte:: @code{.byte @var{expressions}} -@@ -4703,6 +4704,12 @@ trailing zero byte) into consecutive add - @code{.asciz} is just like @code{.ascii}, but each string is followed by - a zero byte. The ``z'' in @samp{.asciz} stands for ``zero''. - -+@node Attach_to_group -+@section @code{.attach_to_group @var{name}} -+Attaches the current section to the named group. This is like declaring -+the section with the @code{G} attribute, but can be done after the section -+has been created. -+ - @node Balign - @section @code{.balign[wl] @var{abs-expr}, @var{abs-expr}, @var{abs-expr}} - - diff --git a/binutils-disassembling-efi-files.patch b/binutils-disassembling-efi-files.patch index 75d4275..cfa3664 100644 --- a/binutils-disassembling-efi-files.patch +++ b/binutils-disassembling-efi-files.patch @@ -1,7 +1,7 @@ -diff -rup binutils.orig/bfd/coffgen.c binutils-2.31.1/bfd/coffgen.c ---- binutils.orig/bfd/coffgen.c 2019-03-06 08:49:19.500586870 +0000 -+++ binutils-2.31.1/bfd/coffgen.c 2019-03-06 08:49:45.798394582 +0000 -@@ -2289,7 +2289,7 @@ coff_find_nearest_line_with_names (bfd * +diff -rupN --no-dereference binutils-2.32/bfd/coffgen.c binutils-2.32-new/bfd/coffgen.c +--- binutils-2.32/bfd/coffgen.c 2019-01-19 17:01:32.000000000 +0100 ++++ binutils-2.32-new/bfd/coffgen.c 2019-11-19 20:47:07.835624150 +0100 +@@ -2294,7 +2294,7 @@ coff_find_nearest_line_with_names (bfd * information. So try again, using a bias against the address sought. */ if (coff_data (abfd)->dwarf2_find_line_info != NULL) { @@ -10,7 +10,7 @@ diff -rup binutils.orig/bfd/coffgen.c binutils-2.31.1/bfd/coffgen.c /* Create a cache of the result for the next call. */ if (sec_data == NULL && section->owner == abfd) -@@ -2301,10 +2301,11 @@ coff_find_nearest_line_with_names (bfd * +@@ -2306,10 +2306,11 @@ coff_find_nearest_line_with_names (bfd * if (sec_data != NULL && sec_data->saved_bias) bias = sec_data->saved_bias; @@ -23,11 +23,10 @@ diff -rup binutils.orig/bfd/coffgen.c binutils-2.31.1/bfd/coffgen.c if (sec_data) { sec_data->saved_bias = TRUE; -Only in binutils-2.31.1/bfd: coffgen.c.orig -diff -rup binutils.orig/bfd/dwarf2.c binutils-2.31.1/bfd/dwarf2.c ---- binutils.orig/bfd/dwarf2.c 2019-03-06 08:49:19.498586884 +0000 -+++ binutils-2.31.1/bfd/dwarf2.c 2019-03-06 08:49:45.799394575 +0000 -@@ -4463,7 +4463,7 @@ _bfd_dwarf2_find_symbol_bias (asymbol ** +diff -rupN --no-dereference binutils-2.32/bfd/dwarf2.c binutils-2.32-new/bfd/dwarf2.c +--- binutils-2.32/bfd/dwarf2.c 2019-01-19 17:01:32.000000000 +0100 ++++ binutils-2.32-new/bfd/dwarf2.c 2019-11-19 20:47:07.836624156 +0100 +@@ -4472,7 +4472,7 @@ _bfd_dwarf2_find_symbol_bias (asymbol ** stash = (struct dwarf2_debug *) *pinfo; @@ -36,4 +35,3 @@ diff -rup binutils.orig/bfd/dwarf2.c binutils-2.31.1/bfd/dwarf2.c return 0; for (unit = stash->all_comp_units; unit; unit = unit->next_unit) -Only in binutils-2.31.1/bfd: dwarf2.c.orig diff --git a/binutils-do-not-link-with-static-libstdc++.patch b/binutils-do-not-link-with-static-libstdc++.patch index 49d46c2..c04b228 100644 --- a/binutils-do-not-link-with-static-libstdc++.patch +++ b/binutils-do-not-link-with-static-libstdc++.patch @@ -1,7 +1,7 @@ -diff -rup binutils.orig/configure binutils-2.30/configure ---- binutils.orig/configure 2018-09-24 17:50:06.967172922 +0100 -+++ binutils-2.30/configure 2018-09-24 17:51:16.648624865 +0100 -@@ -4996,49 +4996,6 @@ if test -z "$LD"; then +diff -rupN --no-dereference binutils-2.32/configure binutils-2.32-new/configure +--- binutils-2.32/configure 2019-01-19 17:10:54.000000000 +0100 ++++ binutils-2.32-new/configure 2019-11-19 20:47:01.887590506 +0100 +@@ -5049,49 +5049,6 @@ if test -z "$LD"; then fi fi @@ -51,10 +51,10 @@ diff -rup binutils.orig/configure binutils-2.30/configure if test -n "$ac_tool_prefix"; then -diff -rup binutils.orig/configure.ac binutils-2.30/configure.ac ---- binutils.orig/configure.ac 2018-09-24 17:50:07.241170767 +0100 -+++ binutils-2.30/configure.ac 2018-09-24 17:50:29.908992486 +0100 -@@ -1288,26 +1288,6 @@ if test -z "$LD"; then +diff -rupN --no-dereference binutils-2.32/configure.ac binutils-2.32-new/configure.ac +--- binutils-2.32/configure.ac 2019-02-02 17:15:43.000000000 +0100 ++++ binutils-2.32-new/configure.ac 2019-11-19 20:47:01.887590506 +0100 +@@ -1283,26 +1283,6 @@ if test -z "$LD"; then fi fi diff --git a/binutils-do-not-merge-differing-SHF_EXCLUDE-groups.patch b/binutils-do-not-merge-differing-SHF_EXCLUDE-groups.patch index e0653f9..d8c78a7 100644 --- a/binutils-do-not-merge-differing-SHF_EXCLUDE-groups.patch +++ b/binutils-do-not-merge-differing-SHF_EXCLUDE-groups.patch @@ -1,5 +1,6 @@ ---- binutils.orig/ld/emultempl/elf32.em 2019-07-22 13:25:51.601030174 +0100 -+++ binutils-2.32/ld/emultempl/elf32.em 2019-07-22 13:27:36.070394830 +0100 +diff -rupN --no-dereference binutils-2.32/ld/emultempl/elf32.em binutils-2.32-new/ld/emultempl/elf32.em +--- binutils-2.32/ld/emultempl/elf32.em 2019-01-19 17:01:33.000000000 +0100 ++++ binutils-2.32-new/ld/emultempl/elf32.em 2019-11-19 20:47:12.267649813 +0100 @@ -2029,10 +2029,12 @@ elf_orphan_compatible (asection *in, ase if (elf_section_data (out)->this_hdr.sh_info != elf_section_data (in)->this_hdr.sh_info) diff --git a/binutils-do-not-warn-about-debuginfo-files.patch b/binutils-do-not-warn-about-debuginfo-files.patch index bfe8135..367430e 100644 --- a/binutils-do-not-warn-about-debuginfo-files.patch +++ b/binutils-do-not-warn-about-debuginfo-files.patch @@ -1,6 +1,6 @@ -diff -rup binutils.orig/bfd/elf-bfd.h binutils-2.32/bfd/elf-bfd.h ---- binutils.orig/bfd/elf-bfd.h 2019-07-02 16:03:41.758007318 +0100 -+++ binutils-2.32/bfd/elf-bfd.h 2019-07-02 16:04:02.025862020 +0100 +diff -rupN --no-dereference binutils-2.32/bfd/elf-bfd.h binutils-2.32-new/bfd/elf-bfd.h +--- binutils-2.32/bfd/elf-bfd.h 2019-01-19 17:01:32.000000000 +0100 ++++ binutils-2.32-new/bfd/elf-bfd.h 2019-11-19 20:47:11.528645500 +0100 @@ -2749,6 +2749,8 @@ extern bfd_vma elf64_r_sym (bfd_vma); extern bfd_vma elf32_r_info (bfd_vma, bfd_vma); extern bfd_vma elf32_r_sym (bfd_vma); @@ -10,10 +10,9 @@ diff -rup binutils.orig/bfd/elf-bfd.h binutils-2.32/bfd/elf-bfd.h /* Large common section. */ extern asection _bfd_elf_large_com_section; -Only in binutils-2.32/bfd: elf-bfd.h.orig -diff -rup binutils.orig/bfd/elf.c binutils-2.32/bfd/elf.c ---- binutils.orig/bfd/elf.c 2019-07-02 16:03:42.101004858 +0100 -+++ binutils-2.32/bfd/elf.c 2019-07-02 16:04:23.909705141 +0100 +diff -rupN --no-dereference binutils-2.32/bfd/elf.c binutils-2.32-new/bfd/elf.c +--- binutils-2.32/bfd/elf.c 2019-11-19 20:47:04.094602882 +0100 ++++ binutils-2.32-new/bfd/elf.c 2019-11-19 20:47:11.530645511 +0100 @@ -5807,6 +5807,35 @@ assign_file_positions_for_load_sections return TRUE; } @@ -65,4 +64,3 @@ diff -rup binutils.orig/bfd/elf.c binutils-2.32/bfd/elf.c _bfd_error_handler /* xgettext:c-format */ (_("%pB: warning: allocated section `%s' not in segment"), -Only in binutils-2.32/bfd: elf.c.orig diff --git a/binutils-export-demangle.h.patch b/binutils-export-demangle.h.patch index 6e47d7d..1b8b282 100644 --- a/binutils-export-demangle.h.patch +++ b/binutils-export-demangle.h.patch @@ -1,6 +1,6 @@ -diff -rup binutils.orig/bfd/Makefile.am binutils-2.32/bfd/Makefile.am ---- binutils.orig/bfd/Makefile.am 2019-02-08 12:22:51.395684251 +0000 -+++ binutils-2.32/bfd/Makefile.am 2019-02-08 12:22:53.970664973 +0000 +diff -rupN --no-dereference binutils-2.32/bfd/Makefile.am binutils-2.32-new/bfd/Makefile.am +--- binutils-2.32/bfd/Makefile.am 2019-11-19 20:46:58.862573749 +0100 ++++ binutils-2.32-new/bfd/Makefile.am 2019-11-19 20:46:58.865573765 +0100 @@ -33,7 +33,7 @@ bfdlibdir = @bfdlibdir@ bfdincludedir = @bfdincludedir@ bfdlib_LTLIBRARIES = libbfd.la @@ -10,9 +10,9 @@ diff -rup binutils.orig/bfd/Makefile.am binutils-2.32/bfd/Makefile.am else !INSTALL_LIBBFD # Empty these so that the respective installation directories will not be created. bfdlibdir = -diff -rup binutils.orig/bfd/Makefile.in binutils-2.32/bfd/Makefile.in ---- binutils.orig/bfd/Makefile.in 2019-02-08 12:21:35.291254044 +0000 -+++ binutils-2.32/bfd/Makefile.in 2019-02-08 12:22:10.163992947 +0000 +diff -rupN --no-dereference binutils-2.32/bfd/Makefile.in binutils-2.32-new/bfd/Makefile.in +--- binutils-2.32/bfd/Makefile.in 2019-11-19 20:46:58.863573754 +0100 ++++ binutils-2.32-new/bfd/Makefile.in 2019-11-19 20:46:58.866573771 +0100 @@ -249,7 +249,7 @@ am__can_run_installinfo = \ esac am__bfdinclude_HEADERS_DIST = $(INCDIR)/plugin-api.h bfd.h \ diff --git a/binutils-fix-testsuite-failures.patch b/binutils-fix-testsuite-failures.patch index c171343..e912436 100644 --- a/binutils-fix-testsuite-failures.patch +++ b/binutils-fix-testsuite-failures.patch @@ -1,35 +1,57 @@ -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-10.d binutils-2.32/ld/testsuite/ld-plugin/plugin-10.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-10.d 2019-02-15 13:33:21.979627285 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-10.d 2019-02-15 13:40:26.911199033 +0000 -@@ -34,5 +34,6 @@ hook called: claim_file tmpdir/libtext.a +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-plugin/plugin-10.d binutils-2.32-new/ld/testsuite/ld-plugin/plugin-10.d +--- binutils-2.32/ld/testsuite/ld-plugin/plugin-10.d 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-plugin/plugin-10.d 2019-11-19 20:47:04.100602916 +0100 +@@ -32,7 +32,8 @@ hook called: claim_file tmpdir/func.o \[ + hook called: claim_file tmpdir/libtext.a \[@.* not claimed + #... hook called: all symbols read. - Sym: '_?func' Resolution: LDPR_PREVAILING_DEF +-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF ++Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY +#... hook called: cleanup. #... -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-12.d binutils-2.32/ld/testsuite/ld-plugin/plugin-12.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-12.d 2019-02-15 13:33:21.976627309 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-12.d 2019-02-15 13:47:04.060076132 +0000 -@@ -1,5 +1,5 @@ +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-plugin/plugin-11.d binutils-2.32-new/ld/testsuite/ld-plugin/plugin-11.d +--- binutils-2.32/ld/testsuite/ld-plugin/plugin-11.d 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-plugin/plugin-11.d 2019-11-19 20:47:04.100602916 +0100 +@@ -35,8 +35,9 @@ hook called: claim_file tmpdir/func.o \[ + hook called: claim_file tmpdir/libtext.a \[@.* CLAIMED + #... + hook called: all symbols read. +-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF ++Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY + Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY +-Sym: '_?text' Resolution: LDPR_PREVAILING_DEF ++Sym: '_?text' Resolution: LDPR_PREVAILING_DEF_IRONLY ++#... + hook called: cleanup. + #... +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-plugin/plugin-12.d binutils-2.32-new/ld/testsuite/ld-plugin/plugin-12.d +--- binutils-2.32/ld/testsuite/ld-plugin/plugin-12.d 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-plugin/plugin-12.d 2019-11-19 20:47:04.100602916 +0100 +@@ -1,6 +1,6 @@ #... -.*: symbol `func' definition: 0, visibility: 0, resolution: 2 -+.*: symbol `func' definition: 0, visibility: 0, resolution: . - .*: symbol `func1' definition: 0, visibility: 1, resolution: 3 - .*: symbol `func2' definition: 0, visibility: 2, resolution: 3 - .*: symbol `func3' definition: 0, visibility: 3, resolution: 3 -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-13.d binutils-2.32/ld/testsuite/ld-plugin/plugin-13.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-13.d 2019-02-15 13:33:21.980627277 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-13.d 2019-02-15 13:41:30.189692800 +0000 +-.*: symbol `func1' definition: 0, visibility: 1, resolution: 3 +-.*: symbol `func2' definition: 0, visibility: 2, resolution: 3 +-.*: symbol `func3' definition: 0, visibility: 3, resolution: 3 ++.*: symbol `_?func' definition: 0, visibility: 0, resolution: . ++.*: symbol `_?func1' definition: 0, visibility: 1, resolution: 3 ++.*: symbol `_?func2' definition: 0, visibility: 2, resolution: 3 ++.*: symbol `_?func3' definition: 0, visibility: 3, resolution: 3 + #pass +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-plugin/plugin-13.d binutils-2.32-new/ld/testsuite/ld-plugin/plugin-13.d +--- binutils-2.32/ld/testsuite/ld-plugin/plugin-13.d 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-plugin/plugin-13.d 2019-11-19 20:47:04.097602899 +0100 @@ -23,5 +23,3 @@ hook called: claim_file tmpdir/main.o \[ hook called: claim_file .*/ld/testsuite/ld-plugin/func.c \[@0/.* CLAIMED hook called: claim_file tmpdir/text.o \[@0/.* not claimed #... -.*main.c.*: undefined reference to `\.?func' -#... -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-14.d binutils-2.32/ld/testsuite/ld-plugin/plugin-14.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-14.d 2019-02-15 13:33:21.977627301 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-14.d 2019-02-15 13:42:03.598430960 +0000 +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-plugin/plugin-14.d binutils-2.32-new/ld/testsuite/ld-plugin/plugin-14.d +--- binutils-2.32/ld/testsuite/ld-plugin/plugin-14.d 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-plugin/plugin-14.d 2019-11-19 20:47:04.097602899 +0100 @@ -27,7 +27,6 @@ hook called: claim_file .*/ld/testsuite/ hook called: claim_file tmpdir/text.o \[@0/.* not claimed #... @@ -39,9 +61,9 @@ diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-14.d binutils-2.32/ld +#... hook called: cleanup. #... -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-15.d binutils-2.32/ld/testsuite/ld-plugin/plugin-15.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-15.d 2019-02-15 13:33:21.980627277 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-15.d 2019-02-15 13:42:28.014239600 +0000 +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-plugin/plugin-15.d binutils-2.32-new/ld/testsuite/ld-plugin/plugin-15.d +--- binutils-2.32/ld/testsuite/ld-plugin/plugin-15.d 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-plugin/plugin-15.d 2019-11-19 20:47:04.097602899 +0100 @@ -28,7 +28,6 @@ hook called: claim_file .*/ld/testsuite/ hook called: claim_file tmpdir/text.o \[@0/.* not claimed #... @@ -51,9 +73,9 @@ diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-15.d binutils-2.32/ld +#... hook called: cleanup. #... -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-16.d binutils-2.32/ld/testsuite/ld-plugin/plugin-16.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-16.d 2019-02-15 13:33:21.977627301 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-16.d 2019-02-15 13:43:21.309821910 +0000 +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-plugin/plugin-16.d binutils-2.32-new/ld/testsuite/ld-plugin/plugin-16.d +--- binutils-2.32/ld/testsuite/ld-plugin/plugin-16.d 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-plugin/plugin-16.d 2019-11-19 20:47:04.097602899 +0100 @@ -30,9 +30,8 @@ hook called: claim_file .*/ld/testsuite/ hook called: claim_file tmpdir/text.o \[@0/.* not claimed #... @@ -66,9 +88,9 @@ diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-16.d binutils-2.32/ld +#... hook called: cleanup. #... -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-17.d binutils-2.32/ld/testsuite/ld-plugin/plugin-17.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-17.d 2019-02-15 13:33:21.977627301 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-17.d 2019-02-15 13:43:54.925558451 +0000 +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-plugin/plugin-17.d binutils-2.32-new/ld/testsuite/ld-plugin/plugin-17.d +--- binutils-2.32/ld/testsuite/ld-plugin/plugin-17.d 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-plugin/plugin-17.d 2019-11-19 20:47:04.098602905 +0100 @@ -31,7 +31,8 @@ hook called: claim_file .*/ld/testsuite/ hook called: claim_file tmpdir/text.o \[@0/.* not claimed #... @@ -79,9 +101,37 @@ diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-17.d binutils-2.32/ld +#... hook called: cleanup. #... -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-20.d binutils-2.32/ld/testsuite/ld-plugin/plugin-20.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-20.d 2019-02-15 13:33:21.980627277 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-20.d 2019-02-15 13:49:20.091010016 +0000 +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-plugin/plugin-18.d binutils-2.32-new/ld/testsuite/ld-plugin/plugin-18.d +--- binutils-2.32/ld/testsuite/ld-plugin/plugin-18.d 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-plugin/plugin-18.d 2019-11-19 20:47:04.100602916 +0100 +@@ -32,7 +32,8 @@ hook called: claim_file .*/ld/testsuite/ + hook called: claim_file tmpdir/libtext.a \[@.* not claimed + #... + hook called: all symbols read. +-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF ++Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY + Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY ++#... + hook called: cleanup. + #... +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-plugin/plugin-19.d binutils-2.32-new/ld/testsuite/ld-plugin/plugin-19.d +--- binutils-2.32/ld/testsuite/ld-plugin/plugin-19.d 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-plugin/plugin-19.d 2019-11-19 20:47:04.100602916 +0100 +@@ -35,8 +35,9 @@ hook called: claim_file .*/ld/testsuite/ + hook called: claim_file tmpdir/libtext.a \[@.* CLAIMED + #... + hook called: all symbols read. +-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF ++Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY + Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY +-Sym: '_?text' Resolution: LDPR_PREVAILING_DEF ++Sym: '_?text' Resolution: LDPR_PREVAILING_DEF_IRONLY ++#... + hook called: cleanup. + #... +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-plugin/plugin-20.d binutils-2.32-new/ld/testsuite/ld-plugin/plugin-20.d +--- binutils-2.32/ld/testsuite/ld-plugin/plugin-20.d 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-plugin/plugin-20.d 2019-11-19 20:47:04.098602905 +0100 @@ -2,6 +2,5 @@ hook called: all symbols read. Input: func.c \(tmpdir/libfunc.a\) Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.* @@ -90,9 +140,9 @@ diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-20.d binutils-2.32/ld -.*main.c.*: undefined reference to `\.?func' +#... hook called: cleanup. -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-21.d binutils-2.32/ld/testsuite/ld-plugin/plugin-21.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-21.d 2019-02-15 13:33:21.978627293 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-21.d 2019-02-15 13:49:34.506897033 +0000 +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-plugin/plugin-21.d binutils-2.32-new/ld/testsuite/ld-plugin/plugin-21.d +--- binutils-2.32/ld/testsuite/ld-plugin/plugin-21.d 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-plugin/plugin-21.d 2019-11-19 20:47:04.098602905 +0100 @@ -2,6 +2,5 @@ hook called: all symbols read. Input: .*/ld/testsuite/ld-plugin/func.c \(.*/ld/testsuite/ld-plugin/func.c\) Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.* @@ -101,9 +151,9 @@ diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-21.d binutils-2.32/ld -.*main.c.*: undefined reference to `\.?func' +#... hook called: cleanup. -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-22.d binutils-2.32/ld/testsuite/ld-plugin/plugin-22.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-22.d 2019-02-15 13:33:21.980627277 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-22.d 2019-02-15 13:50:00.409694022 +0000 +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-plugin/plugin-22.d binutils-2.32-new/ld/testsuite/ld-plugin/plugin-22.d +--- binutils-2.32/ld/testsuite/ld-plugin/plugin-22.d 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-plugin/plugin-22.d 2019-11-19 20:47:04.098602905 +0100 @@ -2,6 +2,5 @@ Claimed: tmpdir/libfunc.a \[@.* hook called: all symbols read. Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.* @@ -112,9 +162,9 @@ diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-22.d binutils-2.32/ld -.*main.c.*: undefined reference to `\.?func' +#... hook called: cleanup. -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-23.d binutils-2.32/ld/testsuite/ld-plugin/plugin-23.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-23.d 2019-02-15 13:33:21.979627285 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-23.d 2019-02-15 13:50:14.938580156 +0000 +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-plugin/plugin-23.d binutils-2.32-new/ld/testsuite/ld-plugin/plugin-23.d +--- binutils-2.32/ld/testsuite/ld-plugin/plugin-23.d 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-plugin/plugin-23.d 2019-11-19 20:47:04.098602905 +0100 @@ -2,6 +2,5 @@ Claimed: .*/ld/testsuite/ld-plugin/func. hook called: all symbols read. Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.* @@ -123,48 +173,47 @@ diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-23.d binutils-2.32/ld -.*main.c.*: undefined reference to `\.?func' +#... hook called: cleanup. -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-24.d binutils-2.32/ld/testsuite/ld-plugin/plugin-24.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-24.d 2019-02-15 13:33:21.980627277 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-24.d 2019-02-15 13:49:46.346804240 +0000 +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-plugin/plugin-24.d binutils-2.32-new/ld/testsuite/ld-plugin/plugin-24.d +--- binutils-2.32/ld/testsuite/ld-plugin/plugin-24.d 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-plugin/plugin-24.d 2019-11-19 20:47:04.098602905 +0100 @@ -2,4 +2,5 @@ hook called: all symbols read. Input: .*/ld/testsuite/ld-plugin/func.c \(.*/ld/testsuite/ld-plugin/func.c\) Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.* Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.* +#... hook called: cleanup. -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-25.d binutils-2.32/ld/testsuite/ld-plugin/plugin-25.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-25.d 2019-02-15 13:33:21.978627293 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-25.d 2019-02-15 13:50:29.322467422 +0000 +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-plugin/plugin-25.d binutils-2.32-new/ld/testsuite/ld-plugin/plugin-25.d +--- binutils-2.32/ld/testsuite/ld-plugin/plugin-25.d 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-plugin/plugin-25.d 2019-11-19 20:47:04.098602905 +0100 @@ -2,4 +2,5 @@ Claimed: .*/ld/testsuite/ld-plugin/func. hook called: all symbols read. Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.* Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.* +#... hook called: cleanup. -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-28.d binutils-2.32/ld/testsuite/ld-plugin/plugin-28.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-28.d 2019-02-15 13:33:21.977627301 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-28.d 2019-02-15 13:45:05.343006557 +0000 -@@ -1 +1,3 @@ +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-plugin/plugin-28.d binutils-2.32-new/ld/testsuite/ld-plugin/plugin-28.d +--- binutils-2.32/ld/testsuite/ld-plugin/plugin-28.d 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-plugin/plugin-28.d 2019-11-19 20:47:04.101602922 +0100 +@@ -1 +1,2 @@ .*: error: Error +#... -+ -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-29.d binutils-2.32/ld/testsuite/ld-plugin/plugin-29.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-29.d 2019-02-15 13:33:21.978627293 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-29.d 2019-02-15 13:45:22.764870016 +0000 +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-plugin/plugin-29.d binutils-2.32-new/ld/testsuite/ld-plugin/plugin-29.d +--- binutils-2.32/ld/testsuite/ld-plugin/plugin-29.d 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-plugin/plugin-29.d 2019-11-19 20:47:04.099602910 +0100 @@ -1 +1,2 @@ .*: warning: Warning +#... -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-30.d binutils-2.32/ld/testsuite/ld-plugin/plugin-30.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-30.d 2019-02-15 13:33:21.976627309 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-30.d 2019-02-15 13:48:57.067190464 +0000 +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-plugin/plugin-30.d binutils-2.32-new/ld/testsuite/ld-plugin/plugin-30.d +--- binutils-2.32/ld/testsuite/ld-plugin/plugin-30.d 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-plugin/plugin-30.d 2019-11-19 20:47:04.099602910 +0100 @@ -24,3 +24,4 @@ hook called: claim_file tmpdir/main.o \[ hook called: claim_file tmpdir/func.o \[@0/.* not claimed hook called: claim_file tmpdir/text.o \[@0/.* not claimed hook called: claim_file tmpdir/libempty.a \[@.* not claimed +#pass -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-6.d binutils-2.32/ld/testsuite/ld-plugin/plugin-6.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-6.d 2019-02-15 13:33:21.979627285 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-6.d 2019-02-15 13:37:14.672749977 +0000 +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-plugin/plugin-6.d binutils-2.32-new/ld/testsuite/ld-plugin/plugin-6.d +--- binutils-2.32/ld/testsuite/ld-plugin/plugin-6.d 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-plugin/plugin-6.d 2019-11-19 20:47:04.099602910 +0100 @@ -27,7 +27,6 @@ hook called: claim_file tmpdir/func.o \[ hook called: claim_file tmpdir/text.o \[@0/.* not claimed #... @@ -174,9 +223,9 @@ diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-6.d binutils-2.32/ld/ +#... hook called: cleanup. #... -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-7.d binutils-2.32/ld/testsuite/ld-plugin/plugin-7.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-7.d 2019-02-15 13:33:21.977627301 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-7.d 2019-02-15 13:37:58.000400421 +0000 +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-plugin/plugin-7.d binutils-2.32-new/ld/testsuite/ld-plugin/plugin-7.d +--- binutils-2.32/ld/testsuite/ld-plugin/plugin-7.d 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-plugin/plugin-7.d 2019-11-19 20:47:04.099602910 +0100 @@ -28,7 +28,6 @@ hook called: claim_file tmpdir/func.o \[ hook called: claim_file tmpdir/text.o \[@0/.* not claimed #... @@ -186,21 +235,24 @@ diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-7.d binutils-2.32/ld/ +#... hook called: cleanup. #... -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-8.d binutils-2.32/ld/testsuite/ld-plugin/plugin-8.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-8.d 2019-02-15 13:33:21.980627277 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-8.d 2019-02-15 13:38:34.096109209 +0000 -@@ -32,7 +32,6 @@ hook called: claim_file tmpdir/text.o \[ +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-plugin/plugin-8.d binutils-2.32-new/ld/testsuite/ld-plugin/plugin-8.d +--- binutils-2.32/ld/testsuite/ld-plugin/plugin-8.d 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-plugin/plugin-8.d 2019-11-19 20:47:04.101602922 +0100 +@@ -30,9 +30,8 @@ hook called: claim_file tmpdir/func.o \[ + hook called: claim_file tmpdir/text.o \[@0/.* not claimed + #... hook called: all symbols read. - Sym: '_?func' Resolution: LDPR_PREVAILING_DEF +-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF ++Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY -.*: tmpdir/main.o: in function `main': -.*main.c.*: undefined reference to `\.?func' +#... hook called: cleanup. #... -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-9.d binutils-2.32/ld/testsuite/ld-plugin/plugin-9.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-9.d 2019-02-15 13:33:21.977627301 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-9.d 2019-02-15 13:39:52.655475403 +0000 +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-plugin/plugin-9.d binutils-2.32-new/ld/testsuite/ld-plugin/plugin-9.d +--- binutils-2.32/ld/testsuite/ld-plugin/plugin-9.d 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-plugin/plugin-9.d 2019-11-19 20:47:04.099602910 +0100 @@ -31,7 +31,8 @@ hook called: claim_file tmpdir/func.o \[ hook called: claim_file tmpdir/text.o \[@0/.* not claimed #... @@ -211,9 +263,9 @@ diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-9.d binutils-2.32/ld/ +#... hook called: cleanup. #... -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/pr20070.d binutils-2.32/ld/testsuite/ld-plugin/pr20070.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/pr20070.d 2019-02-15 13:33:21.976627309 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/pr20070.d 2019-02-15 13:50:56.874251486 +0000 +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-plugin/pr20070.d binutils-2.32-new/ld/testsuite/ld-plugin/pr20070.d +--- binutils-2.32/ld/testsuite/ld-plugin/pr20070.d 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-plugin/pr20070.d 2019-11-19 20:47:04.099602910 +0100 @@ -5,5 +5,6 @@ Sym: 'weakdef' Resolution: LDPR_PREVAILI Sym: 'undef' Resolution: LDPR_UNDEF Sym: 'weakundef' Resolution: LDPR_UNDEF @@ -221,9 +273,9 @@ diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/pr20070.d binutils-2.32/ld/t +#... hook called: cleanup. #... -diff -rup binutils-2.32.orig/ld/testsuite/ld-srec/srec.exp binutils-2.32/ld/testsuite/ld-srec/srec.exp ---- binutils-2.32.orig/ld/testsuite/ld-srec/srec.exp 2019-02-15 13:33:21.938627615 +0000 -+++ binutils-2.32/ld/testsuite/ld-srec/srec.exp 2019-02-15 13:53:58.744814006 +0000 +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-srec/srec.exp binutils-2.32-new/ld/testsuite/ld-srec/srec.exp +--- binutils-2.32/ld/testsuite/ld-srec/srec.exp 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-srec/srec.exp 2019-11-19 20:47:04.099602910 +0100 @@ -21,6 +21,8 @@ # Get the offset from an S-record line to the start of the data. @@ -233,9 +285,9 @@ diff -rup binutils-2.32.orig/ld/testsuite/ld-srec/srec.exp binutils-2.32/ld/test proc srec_off { l } { if [string match "S1*" $l] { return 8 -diff -rup binutils-2.32.orig/ld/testsuite/ld-x86-64/x86-64.exp binutils-2.32/ld/testsuite/ld-x86-64/x86-64.exp ---- binutils-2.32.orig/ld/testsuite/ld-x86-64/x86-64.exp 2019-02-15 13:33:22.030626874 +0000 -+++ binutils-2.32/ld/testsuite/ld-x86-64/x86-64.exp 2019-02-15 13:57:34.295106041 +0000 +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-x86-64/x86-64.exp binutils-2.32-new/ld/testsuite/ld-x86-64/x86-64.exp +--- binutils-2.32/ld/testsuite/ld-x86-64/x86-64.exp 2019-01-19 17:01:34.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-x86-64/x86-64.exp 2019-11-19 20:47:04.100602916 +0100 @@ -1275,25 +1275,6 @@ if { [isnative] && [which $CC] != 0 } { "$NOPIE_CFLAGS" \ ] \ @@ -262,91 +314,3 @@ diff -rup binutils-2.32.orig/ld/testsuite/ld-x86-64/x86-64.exp binutils-2.32/ld/ } run_ld_link_exec_tests [list \ -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-10.d binutils-2.32/ld/testsuite/ld-plugin/plugin-10.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-10.d 2019-02-15 14:10:59.038709514 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-10.d 2019-02-15 14:13:53.532300721 +0000 -@@ -32,7 +32,7 @@ hook called: claim_file tmpdir/func.o \[ - hook called: claim_file tmpdir/libtext.a \[@.* not claimed - #... - hook called: all symbols read. --Sym: '_?func' Resolution: LDPR_PREVAILING_DEF -+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY - Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY - #... - hook called: cleanup. -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-11.d binutils-2.32/ld/testsuite/ld-plugin/plugin-11.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-11.d 2019-02-15 14:10:59.041709490 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-11.d 2019-02-15 14:14:50.061844322 +0000 -@@ -35,8 +35,9 @@ hook called: claim_file tmpdir/func.o \[ - hook called: claim_file tmpdir/libtext.a \[@.* CLAIMED - #... - hook called: all symbols read. --Sym: '_?func' Resolution: LDPR_PREVAILING_DEF -+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY - Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY --Sym: '_?text' Resolution: LDPR_PREVAILING_DEF -+Sym: '_?text' Resolution: LDPR_PREVAILING_DEF_IRONLY -+#... - hook called: cleanup. - #... -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-12.d binutils-2.32/ld/testsuite/ld-plugin/plugin-12.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-12.d 2019-02-15 14:10:58.912710532 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-12.d 2019-02-15 14:13:18.464583848 +0000 -@@ -1,6 +1,6 @@ - #... --.*: symbol `func' definition: 0, visibility: 0, resolution: . --.*: symbol `func1' definition: 0, visibility: 1, resolution: 3 --.*: symbol `func2' definition: 0, visibility: 2, resolution: 3 --.*: symbol `func3' definition: 0, visibility: 3, resolution: 3 -+.*: symbol `_?func' definition: 0, visibility: 0, resolution: . -+.*: symbol `_?func1' definition: 0, visibility: 1, resolution: 3 -+.*: symbol `_?func2' definition: 0, visibility: 2, resolution: 3 -+.*: symbol `_?func3' definition: 0, visibility: 3, resolution: 3 - #pass -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-18.d binutils-2.32/ld/testsuite/ld-plugin/plugin-18.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-18.d 2019-02-15 14:10:58.942710289 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-18.d 2019-02-15 14:15:20.030602369 +0000 -@@ -32,7 +32,8 @@ hook called: claim_file .*/ld/testsuite/ - hook called: claim_file tmpdir/libtext.a \[@.* not claimed - #... - hook called: all symbols read. --Sym: '_?func' Resolution: LDPR_PREVAILING_DEF -+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY - Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY -+#... - hook called: cleanup. - #... -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-19.d binutils-2.32/ld/testsuite/ld-plugin/plugin-19.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-19.d 2019-02-15 14:10:59.024709627 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-19.d 2019-02-15 14:15:54.926320633 +0000 -@@ -35,8 +35,9 @@ hook called: claim_file .*/ld/testsuite/ - hook called: claim_file tmpdir/libtext.a \[@.* CLAIMED - #... - hook called: all symbols read. --Sym: '_?func' Resolution: LDPR_PREVAILING_DEF -+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY - Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY --Sym: '_?text' Resolution: LDPR_PREVAILING_DEF -+Sym: '_?text' Resolution: LDPR_PREVAILING_DEF_IRONLY -+#... - hook called: cleanup. - #... -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-28.d binutils-2.32/ld/testsuite/ld-plugin/plugin-28.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-28.d 2019-02-15 14:10:58.998709837 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-28.d 2019-02-15 14:12:19.856057024 +0000 -@@ -1,3 +1,2 @@ - .*: error: Error - #... -- -diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-8.d binutils-2.32/ld/testsuite/ld-plugin/plugin-8.d ---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-8.d 2019-02-15 14:10:59.074709224 +0000 -+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-8.d 2019-02-15 14:11:48.144313048 +0000 -@@ -30,7 +30,7 @@ hook called: claim_file tmpdir/func.o \[ - hook called: claim_file tmpdir/text.o \[@0/.* not claimed - #... - hook called: all symbols read. --Sym: '_?func' Resolution: LDPR_PREVAILING_DEF -+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY - Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY - #... - hook called: cleanup. diff --git a/binutils-gas-build-note-relocs.patch b/binutils-gas-build-note-relocs.patch index 52a4c0b..1fa71d4 100644 --- a/binutils-gas-build-note-relocs.patch +++ b/binutils-gas-build-note-relocs.patch @@ -1,5 +1,6 @@ ---- binutils.orig/gas/write.c 2019-07-01 16:23:28.133707500 +0100 -+++ binutils-2.32/gas/write.c 2019-07-01 16:24:50.699130611 +0100 +diff -rupN --no-dereference binutils-2.32/gas/write.c binutils-2.32-new/gas/write.c +--- binutils-2.32/gas/write.c 2019-01-19 17:01:33.000000000 +0100 ++++ binutils-2.32-new/gas/write.c 2019-11-19 20:47:10.792641216 +0100 @@ -1891,7 +1891,8 @@ create_obj_attrs_section (void) static void create_note_reloc (segT sec, diff --git a/binutils-gold-ignore-discarded-note-relocs.patch b/binutils-gold-ignore-discarded-note-relocs.patch index b354fa4..a8adff1 100644 --- a/binutils-gold-ignore-discarded-note-relocs.patch +++ b/binutils-gold-ignore-discarded-note-relocs.patch @@ -1,5 +1,6 @@ ---- binutils.orig/gold/target-reloc.h 2018-07-12 11:37:24.894494658 +0100 -+++ binutils-2.30.90/gold/target-reloc.h 2018-07-12 15:38:50.049083904 +0100 +diff -rupN --no-dereference binutils-2.32/gold/target-reloc.h binutils-2.32-new/gold/target-reloc.h +--- binutils-2.32/gold/target-reloc.h 2019-01-19 17:01:33.000000000 +0100 ++++ binutils-2.32-new/gold/target-reloc.h 2019-11-19 20:47:02.632594671 +0100 @@ -136,6 +136,7 @@ class Default_comdat_behavior if (Layout::is_debug_info_section(name)) return CB_PRETEND; diff --git a/binutils-gold-mismatched-section-flags.patch b/binutils-gold-mismatched-section-flags.patch index 4125801..13659f0 100644 --- a/binutils-gold-mismatched-section-flags.patch +++ b/binutils-gold-mismatched-section-flags.patch @@ -1,6 +1,6 @@ -diff -rup binutils.orig/gold/layout.cc binutils-2.32/gold/layout.cc ---- binutils.orig/gold/layout.cc 2019-06-24 14:37:36.013086899 +0100 -+++ binutils-2.32/gold/layout.cc 2019-06-24 14:41:40.054517479 +0100 +diff -rupN --no-dereference binutils-2.32/gold/layout.cc binutils-2.32-new/gold/layout.cc +--- binutils-2.32/gold/layout.cc 2019-01-19 17:01:33.000000000 +0100 ++++ binutils-2.32-new/gold/layout.cc 2019-11-19 20:47:10.054636935 +0100 @@ -868,6 +868,7 @@ Layout::get_output_section(const char* n && (same_name->flags() & elfcpp::SHF_TLS) == 0) os = same_name; @@ -17,9 +17,9 @@ diff -rup binutils.orig/gold/layout.cc binutils-2.32/gold/layout.cc } if (os == NULL) -diff -rup binutils.orig/gold/object.cc binutils-2.32/gold/object.cc ---- binutils.orig/gold/object.cc 2019-06-24 14:37:36.012086906 +0100 -+++ binutils-2.32/gold/object.cc 2019-06-24 14:39:59.287165501 +0100 +diff -rupN --no-dereference binutils-2.32/gold/object.cc binutils-2.32-new/gold/object.cc +--- binutils-2.32/gold/object.cc 2019-01-19 17:01:33.000000000 +0100 ++++ binutils-2.32-new/gold/object.cc 2019-11-19 20:47:10.054636935 +0100 @@ -1644,6 +1644,13 @@ Sized_relobj_file::do_ omit[i] = true; } diff --git a/binutils-objcopy-gnu-build-version-notes.patch b/binutils-objcopy-gnu-build-version-notes.patch index f3f5bd4..d1f1492 100644 --- a/binutils-objcopy-gnu-build-version-notes.patch +++ b/binutils-objcopy-gnu-build-version-notes.patch @@ -1,5 +1,6 @@ ---- binutils.orig/binutils/objcopy.c 2019-08-05 16:17:56.908552690 +0100 -+++ binutils-2.32/binutils/objcopy.c 2019-08-05 16:18:14.985435014 +0100 +diff -rupN --no-dereference binutils-2.32/binutils/objcopy.c binutils-2.32-new/binutils/objcopy.c +--- binutils-2.32/binutils/objcopy.c 2019-01-19 17:01:33.000000000 +0100 ++++ binutils-2.32-new/binutils/objcopy.c 2019-11-19 20:47:13.738658442 +0100 @@ -1988,7 +1988,6 @@ merge_gnu_build_notes (bfd * abfd, asect unsigned long previous_open_end = 0; long relsize; diff --git a/binutils-readelf-other-sym-info.patch b/binutils-readelf-other-sym-info.patch index fa1b2f2..ddec626 100644 --- a/binutils-readelf-other-sym-info.patch +++ b/binutils-readelf-other-sym-info.patch @@ -1,7 +1,7 @@ -diff -rup binutils.orig/binutils/readelf.c binutils-2.29/binutils/readelf.c ---- binutils.orig/binutils/readelf.c 2017-12-12 16:24:19.571221194 +0000 -+++ binutils-2.29/binutils/readelf.c 2017-12-12 16:27:26.997979803 +0000 -@@ -11018,12 +11018,14 @@ print_dynamic_symbol (bfd_vma si, unsign +diff -rupN --no-dereference binutils-2.32/binutils/readelf.c binutils-2.32-new/binutils/readelf.c +--- binutils-2.32/binutils/readelf.c 2019-11-19 20:47:01.146586379 +0100 ++++ binutils-2.32-new/binutils/readelf.c 2019-11-19 20:47:01.152586412 +0100 +@@ -11321,12 +11321,14 @@ print_dynamic_symbol (Filedata * filedat unsigned int vis = ELF_ST_VISIBILITY (psym->st_other); printf (" %-7s", get_symbol_visibility (vis)); @@ -16,7 +16,7 @@ diff -rup binutils.orig/binutils/readelf.c binutils-2.29/binutils/readelf.c } printf (" %3.3s ", get_symbol_index_type (filedata, psym->st_shndx)); -@@ -11031,6 +11033,15 @@ print_dynamic_symbol (bfd_vma si, unsign +@@ -11334,6 +11336,15 @@ print_dynamic_symbol (Filedata * filedat print_symbol (25, GET_DYNAMIC_NAME (psym->st_name)); else printf (_(" "), psym->st_name); @@ -32,9 +32,7 @@ diff -rup binutils.orig/binutils/readelf.c binutils-2.29/binutils/readelf.c putchar ('\n'); } ---- binutils.orig/binutils/readelf.c 2017-12-12 16:36:21.806561149 +0000 -+++ binutils-2.29.1/binutils/readelf.c 2017-12-12 16:38:17.763168514 +0000 -@@ -11548,11 +11548,13 @@ process_symbol_table (FILE * file) +@@ -11842,11 +11853,13 @@ process_symbol_table (Filedata * filedat unsigned int vis = ELF_ST_VISIBILITY (psym->st_other); printf (" %-7s", get_symbol_visibility (vis)); @@ -48,7 +46,7 @@ diff -rup binutils.orig/binutils/readelf.c binutils-2.29/binutils/readelf.c } printf (" %4s ", get_symbol_index_type (filedata, psym->st_shndx)); print_symbol (25, psym->st_name < strtab_size -@@ -11571,7 +11573,15 @@ process_symbol_table (FILE * file) +@@ -11865,7 +11878,15 @@ process_symbol_table (Filedata * filedat printf (sym_info == symbol_hidden ? "@%s" : "@@%s", version_string); } diff --git a/binutils-rh1736114.patch b/binutils-rh1736114.patch index b47dde9..f229ef7 100644 --- a/binutils-rh1736114.patch +++ b/binutils-rh1736114.patch @@ -1,47 +1,7 @@ -Backup from binutils-2_32-branch upstream: - -commit df010caac3b33b1d38b6d67024091854c3f77c77 -Author: H.J. Lu -Date: Mon Jun 24 11:08:40 2019 -0700 - - elf: Remove the property after reporting its removal - - commit d2ef37ebd9f771d06edf1fdea37970f60b242b2d - Author: H.J. Lu - Date: Fri Dec 7 08:30:30 2018 -0800 - - elf: Report property change when merging properties - - failed to remove the property after reporting it has been removed. This - patch corrects it. - - bfd/ - - PR ld/24721 - * elf-properties.c (elf_merge_gnu_property_list): Remove the - property after reporting property removal. - - ld/ - - PR ld/24721 - * testsuite/ld-x86-64/x86-64.exp: Run PR ld/24721 tests. - * testsuite/ld-x86-64/pr24721-x32.d: New file. - * testsuite/ld-x86-64/pr24721.d: Likewise. - * testsuite/ld-x86-64/pr24721.map: Likewise. - * testsuite/ld-x86-64/pr24721a.s: Likewise. - * testsuite/ld-x86-64/pr24721b.s: Likewise. - - (cherry picked from commit f93ab3a0b8039a1667a666f013cca50b03d67f9b) - -Conflicts: - ld/testsuite/ld-x86-64/x86-64.exp - (Missing backports of PR24151, PR24458.) - -diff --git a/bfd/elf-properties.c b/bfd/elf-properties.c -index 5e48d75faa269453..4a9907ff7edad5e0 100644 ---- a/bfd/elf-properties.c -+++ b/bfd/elf-properties.c -@@ -322,12 +322,10 @@ elf_merge_gnu_property_list (struct bfd_link_info *info, bfd *first_pbfd, +diff -rupN --no-dereference binutils-2.32/bfd/elf-properties.c binutils-2.32-new/bfd/elf-properties.c +--- binutils-2.32/bfd/elf-properties.c 2019-01-19 17:01:32.000000000 +0100 ++++ binutils-2.32-new/bfd/elf-properties.c 2019-11-19 20:47:13.003654121 +0100 +@@ -322,12 +322,10 @@ elf_merge_gnu_property_list (struct bfd_ (bfd_vma) p->property.pr_type, first_pbfd, abfd); } } @@ -58,44 +18,9 @@ index 5e48d75faa269453..4a9907ff7edad5e0 100644 } else if (number_p) { -diff --git a/ld/testsuite/ld-x86-64/pr24721-x32.d b/ld/testsuite/ld-x86-64/pr24721-x32.d -new file mode 100644 -index 0000000000000000..9b067efdc11a4824 ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr24721-x32.d -@@ -0,0 +1,6 @@ -+#source: pr24721a.s -+#source: pr24721b.s -+#as: --x32 -mx86-used-note=no -+#ld: -r -m elf32_x86_64 -Map tmpdir/pr24721.map -+#readelf: -n -+#map: pr24721.map -diff --git a/ld/testsuite/ld-x86-64/pr24721.d b/ld/testsuite/ld-x86-64/pr24721.d -new file mode 100644 -index 0000000000000000..efa88db2b3c7e9c5 ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr24721.d -@@ -0,0 +1,6 @@ -+#source: pr24721a.s -+#source: pr24721b.s -+#as: --64 -defsym __64_bit__=1 -mx86-used-note=no -+#ld: -r -melf_x86_64 -Map tmpdir/pr24721.map -+#readelf: -n -+#map: pr24721.map -diff --git a/ld/testsuite/ld-x86-64/pr24721.map b/ld/testsuite/ld-x86-64/pr24721.map -new file mode 100644 -index 0000000000000000..9e63fff27557b983 ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr24721.map -@@ -0,0 +1,3 @@ -+#... -+Removed property 0xc0000002 to merge tmpdir/pr24721a.o \(0x1\) and tmpdir/pr24721b.o \(not found\) -+#pass -diff --git a/ld/testsuite/ld-x86-64/pr24721a.s b/ld/testsuite/ld-x86-64/pr24721a.s -new file mode 100644 -index 0000000000000000..b229d19b02dc9809 ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr24721a.s +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-x86-64/pr24721a.s binutils-2.32-new/ld/testsuite/ld-x86-64/pr24721a.s +--- binutils-2.32/ld/testsuite/ld-x86-64/pr24721a.s 1970-01-01 01:00:00.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-x86-64/pr24721a.s 2019-11-19 20:47:13.004654127 +0100 @@ -0,0 +1,34 @@ + .text + .globl foo @@ -131,11 +56,9 @@ index 0000000000000000..b229d19b02dc9809 + .p2align 2 +.endif +5: -diff --git a/ld/testsuite/ld-x86-64/pr24721b.s b/ld/testsuite/ld-x86-64/pr24721b.s -new file mode 100644 -index 0000000000000000..3d11691166751bfa ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr24721b.s +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-x86-64/pr24721b.s binutils-2.32-new/ld/testsuite/ld-x86-64/pr24721b.s +--- binutils-2.32/ld/testsuite/ld-x86-64/pr24721b.s 1970-01-01 01:00:00.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-x86-64/pr24721b.s 2019-11-19 20:47:13.004654127 +0100 @@ -0,0 +1,6 @@ + .text + .globl bar @@ -143,10 +66,36 @@ index 0000000000000000..3d11691166751bfa + .p2align 4 +bar: + ret -diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp -index 0d65801a942dbddd..3e02531e6f90aff9 100644 ---- a/ld/testsuite/ld-x86-64/x86-64.exp -+++ b/ld/testsuite/ld-x86-64/x86-64.exp +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-x86-64/pr24721.d binutils-2.32-new/ld/testsuite/ld-x86-64/pr24721.d +--- binutils-2.32/ld/testsuite/ld-x86-64/pr24721.d 1970-01-01 01:00:00.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-x86-64/pr24721.d 2019-11-19 20:47:13.004654127 +0100 +@@ -0,0 +1,6 @@ ++#source: pr24721a.s ++#source: pr24721b.s ++#as: --64 -defsym __64_bit__=1 -mx86-used-note=no ++#ld: -r -melf_x86_64 -Map tmpdir/pr24721.map ++#readelf: -n ++#map: pr24721.map +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-x86-64/pr24721.map binutils-2.32-new/ld/testsuite/ld-x86-64/pr24721.map +--- binutils-2.32/ld/testsuite/ld-x86-64/pr24721.map 1970-01-01 01:00:00.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-x86-64/pr24721.map 2019-11-19 20:47:13.004654127 +0100 +@@ -0,0 +1,3 @@ ++#... ++Removed property 0xc0000002 to merge tmpdir/pr24721a.o \(0x1\) and tmpdir/pr24721b.o \(not found\) ++#pass +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-x86-64/pr24721-x32.d binutils-2.32-new/ld/testsuite/ld-x86-64/pr24721-x32.d +--- binutils-2.32/ld/testsuite/ld-x86-64/pr24721-x32.d 1970-01-01 01:00:00.000000000 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-x86-64/pr24721-x32.d 2019-11-19 20:47:13.003654121 +0100 +@@ -0,0 +1,6 @@ ++#source: pr24721a.s ++#source: pr24721b.s ++#as: --x32 -mx86-used-note=no ++#ld: -r -m elf32_x86_64 -Map tmpdir/pr24721.map ++#readelf: -n ++#map: pr24721.map +diff -rupN --no-dereference binutils-2.32/ld/testsuite/ld-x86-64/x86-64.exp binutils-2.32-new/ld/testsuite/ld-x86-64/x86-64.exp +--- binutils-2.32/ld/testsuite/ld-x86-64/x86-64.exp 2019-11-19 20:47:04.837607078 +0100 ++++ binutils-2.32-new/ld/testsuite/ld-x86-64/x86-64.exp 2019-11-19 20:47:13.004654127 +0100 @@ -424,6 +424,8 @@ run_dump_test "pr23486d-x32" run_dump_test "pr23854" run_dump_test "pr23930" diff --git a/binutils-special-sections-in-groups.patch b/binutils-special-sections-in-groups.patch index 7de5a93..b114c50 100644 --- a/binutils-special-sections-in-groups.patch +++ b/binutils-special-sections-in-groups.patch @@ -1,6 +1,7 @@ ---- binutils.orig/bfd/elf.c 2018-10-19 11:42:10.107277490 +0100 -+++ binutils-2.31.1/bfd/elf.c 2018-10-19 11:44:33.607105801 +0100 -@@ -830,7 +830,13 @@ setup_group (bfd *abfd, Elf_Internal_Shd +diff -rupN --no-dereference binutils-2.32/bfd/elf.c binutils-2.32-new/bfd/elf.c +--- binutils-2.32/bfd/elf.c 2019-01-19 17:01:32.000000000 +0100 ++++ binutils-2.32-new/bfd/elf.c 2019-11-19 20:47:03.372598821 +0100 +@@ -831,7 +831,13 @@ setup_group (bfd *abfd, Elf_Internal_Shd } } @@ -15,7 +16,7 @@ { /* xgettext:c-format */ _bfd_error_handler (_("%pB: no group info for section '%pA'"), -@@ -936,7 +942,8 @@ _bfd_elf_setup_sections (bfd *abfd) +@@ -937,7 +943,8 @@ _bfd_elf_setup_sections (bfd *abfd) else if (idx->shdr->bfd_section) elf_sec_group (idx->shdr->bfd_section) = shdr->bfd_section; else if (idx->shdr->sh_type != SHT_RELA diff --git a/binutils_24267.patch b/binutils_24267.patch new file mode 100644 index 0000000..5c9f2bc --- /dev/null +++ b/binutils_24267.patch @@ -0,0 +1,36 @@ +diff -rupN --no-dereference binutils-2.32/bfd/coffgen.c binutils-2.32-new/bfd/coffgen.c +--- binutils-2.32/bfd/coffgen.c 2019-11-19 20:47:08.571628378 +0100 ++++ binutils-2.32-new/bfd/coffgen.c 2019-11-19 20:47:17.460680520 +0100 +@@ -2639,6 +2639,9 @@ _bfd_coff_section_already_linked (bfd *a + struct bfd_section_already_linked_hash_entry *already_linked_list; + struct coff_comdat_info *s_comdat; + ++ if (sec->output_section == bfd_abs_section_ptr) ++ return FALSE; ++ + flags = sec->flags; + if ((flags & SEC_LINK_ONCE) == 0) + return FALSE; +diff -rupN --no-dereference binutils-2.32/bfd/cofflink.c binutils-2.32-new/bfd/cofflink.c +--- binutils-2.32/bfd/cofflink.c 2019-01-19 17:01:32.000000000 +0100 ++++ binutils-2.32-new/bfd/cofflink.c 2019-11-19 20:47:17.460680520 +0100 +@@ -310,7 +310,9 @@ coff_link_add_symbols (bfd *abfd, + case COFF_SYMBOL_GLOBAL: + flags = BSF_EXPORT | BSF_GLOBAL; + section = coff_section_from_bfd_index (abfd, sym.n_scnum); +- if (! obj_pe (abfd)) ++ if (discarded_section (section)) ++ section = bfd_und_section_ptr; ++ else if (! obj_pe (abfd)) + value -= section->vma; + break; + +@@ -327,6 +329,8 @@ coff_link_add_symbols (bfd *abfd, + case COFF_SYMBOL_PE_SECTION: + flags = BSF_SECTION_SYM | BSF_GLOBAL; + section = coff_section_from_bfd_index (abfd, sym.n_scnum); ++ if (discarded_section (section)) ++ section = bfd_und_section_ptr; + break; + } + diff --git a/mingw-binutils.spec b/mingw-binutils.spec index bc62bbe..a59485d 100644 --- a/mingw-binutils.spec +++ b/mingw-binutils.spec @@ -2,7 +2,7 @@ Name: mingw-binutils Version: 2.32 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Cross-compiled version of binutils for Win32 and Win64 environments License: GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+ @@ -10,20 +10,10 @@ License: GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+ URL: http://www.gnu.org/software/binutils/ Source0: http://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.bz2 -#---------------------------------------------------------------------------- +### Patches from native package -# Backport https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=999d6dff80fab12d22c2a8d91923db6bde7fb3e5 -# Fixes "too many open files" when linking libLLVM.dll -Patch0: 0001-Plugin-target-handling.patch - -# Purpose: Use /lib64 and /usr/lib64 instead of /lib and /usr/lib in the -# default library search path of 64-bit targets. -# Lifetime: Permanent, but it should not be. This is a bug in the libtool -# sources used in both binutils and gcc, (specifically the -# libtool.m4 file). These are based on a version released in 2009 -# (2.2.6?) rather than the latest version. (Definitely fixed in -# libtool version 2.4.6). -Patch01: binutils-2.20.51.0.2-libtool-lib64.patch +# Unneeded, mingw does not have lib64 +# Patch01: binutils-2.20.51.0.2-libtool-lib64.patch # Purpose: Appends a RHEL or Fedora release string to the generic binutils # version string. @@ -55,13 +45,8 @@ Patch04: binutils-2.22.52.0.4-no-config-h-check.patch # patch. Patch05: binutils-2.29-filename-in-error-messages.patch -# Purpose: Disable an x86/x86_64 optimization that moves functions from the -# PLT into the GOTPLT for faster access. This optimization is -# problematic for tools that want to intercept PLT entries, such -# as ltrace and LD_AUDIT. See BZs 1452111 and 1333481. -# Lifetime: Permanent. But it should not be. -# FIXME: Replace with a configure time option. -Patch06: binutils-2.29-revert-PLT-elision.patch +# Unneeded, affects ELF only +# Patch06: binutils-2.29-revert-PLT-elision.patch # Purpose: Changes readelf so that when it displays extra information about # a symbol, this information is placed at the end of the line. @@ -71,20 +56,15 @@ Patch06: binutils-2.29-revert-PLT-elision.patch # no longer being maintained. Patch07: binutils-readelf-other-sym-info.patch -# Purpose: Do not create PLT entries for AARCH64 IFUNC symbols referenced in -# debug sections. -# Lifetime: Permanent. -# FIXME: Find related bug. Decide on permanency. -Patch08: binutils-2.27-aarch64-ifunc.patch +# Unneeded, affects ELF only +# Patch08: binutils-2.27-aarch64-ifunc.patch # Purpose: Stop the binutils from statically linking with libstdc++. # Lifetime: Permanent. Patch09: binutils-do-not-link-with-static-libstdc++.patch -# Purpose: Add a .attach_to_group pseudo-op to the assembler for -# use by the annobin gcc plugin. -# Lifetime: Permanent. -Patch10: binutils-attach-to-group.patch +# Unneeded, affects ELF only +# Patch10: binutils-attach-to-group.patch # Purpose: Stop gold from complaining about relocs in the .gnu.build.attribute # section that reference symbols in discarded sections. @@ -170,7 +150,14 @@ Patch28: binutils-CVE-2019-14250.patch # Lifetime: Fixed in 2.33 Patch29: binutils-CVE-2019-14444.patch -#---------------------------------------------------------------------------- +### MINGW specific patches + +# Backport https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=999d6dff80fab12d22c2a8d91923db6bde7fb3e5 +# Fixes "too many open files" when linking libLLVM.dll +Patch100: 0001-Plugin-target-handling.patch +# Backport https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=patch;h=2219ae0b0ebe14373850b000c2abaa31dab1d741 +# Fixes an LTO issue (#1475237) +Patch101: binutils_24267.patch BuildRequires: gcc BuildRequires: flex @@ -412,6 +399,10 @@ rm -rf $RPM_BUILD_ROOT/multilib %changelog +* Tue Nov 19 2019 Sandro Mani - 2.32-6 +- Add binutils_24267.patch +- Drop non-relevant patches from native binutils package + * Tue Aug 13 2019 Fabiano Fidêncio - 3.32-5 - Backport all patches from native binutils package, rhbz#1740709