From 557fd6fe8e67e6838889aa4fcf4045f0935ddf84 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 12 2020 20:05:46 +0000 Subject: import binutils-2.30-68.el8 --- diff --git a/.binutils.metadata b/.binutils.metadata new file mode 100644 index 0000000..074d28a --- /dev/null +++ b/.binutils.metadata @@ -0,0 +1,2 @@ +574d3b5650413d6ee65195a4f5ecbddc3a38f718 SOURCES/binutils-2.30.tar.xz +d3e5c9fc829ed40648110da6fe46c2fb1ed8aadb SOURCES/standards.info.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3ce3d88 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +SOURCES/binutils-2.30.tar.xz +SOURCES/standards.info.gz diff --git a/SOURCES/binutils-2.19.50.0.1-output-format.sed b/SOURCES/binutils-2.19.50.0.1-output-format.sed new file mode 100644 index 0000000..fd770cb --- /dev/null +++ b/SOURCES/binutils-2.19.50.0.1-output-format.sed @@ -0,0 +1,38 @@ +# Generate OUTPUT_FORMAT line for .so files from the system linker output. +# Imported from glibc/Makerules. + +/ld.*[ ]-E[BL]/b f +/collect.*[ ]-E[BL]/b f +/OUTPUT_FORMAT[^)]*$/{N +s/\n[ ]*/ / +} +t o +: o +s/^.*OUTPUT_FORMAT(\([^,]*\), \1, \1).*$/OUTPUT_FORMAT(\1)/ +t q +s/^.*OUTPUT_FORMAT(\([^,]*\), \([^,]*\), \([^,]*\)).*$/\1,\2,\3/ +t s +s/^.*OUTPUT_FORMAT(\([^,)]*\).*$)/OUTPUT_FORMAT(\1)/ +t q +d +: s +s/"//g +G +s/\n// +s/^\([^,]*\),\([^,]*\),\([^,]*\),B/OUTPUT_FORMAT(\2)/p +s/^\([^,]*\),\([^,]*\),\([^,]*\),L/OUTPUT_FORMAT(\3)/p +s/^\([^,]*\),\([^,]*\),\([^,]*\)/OUTPUT_FORMAT(\1)/p +/,/s|^|*** BUG in libc/scripts/output-format.sed *** |p +q +: q +s/"//g +p +q +: f +s/^.*[ ]-E\([BL]\)[ ].*$/,\1/ +t h +s/^.*[ ]-E\([BL]\)$/,\1/ +t h +d +: h +h diff --git a/SOURCES/binutils-2.20.51.0.2-libtool-lib64.patch b/SOURCES/binutils-2.20.51.0.2-libtool-lib64.patch new file mode 100644 index 0000000..142fc7e --- /dev/null +++ b/SOURCES/binutils-2.20.51.0.2-libtool-lib64.patch @@ -0,0 +1,236 @@ +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/SOURCES/binutils-2.22.52.0.1-export-demangle.h.patch b/SOURCES/binutils-2.22.52.0.1-export-demangle.h.patch new file mode 100644 index 0000000..84f82cd --- /dev/null +++ b/SOURCES/binutils-2.22.52.0.1-export-demangle.h.patch @@ -0,0 +1,21 @@ +--- a/bfd/Makefile.am 2012-03-06 14:00:33.229957572 +0000 ++++ b/bfd/Makefile.am 2012-04-27 16:46:05.410974817 +0100 +@@ -18,7 +18,7 @@ + bfdlibdir = @bfdlibdir@ + bfdincludedir = @bfdincludedir@ + bfdlib_LTLIBRARIES = libbfd.la +-bfdinclude_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h ++bfdinclude_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h $(INCDIR)/demangle.h + else !INSTALL_LIBBFD + # Empty these so that the respective installation directories will not be created. + bfdlibdir = +--- binutils-2.26.orig/bfd/Makefile.in 2016-01-25 10:23:35.054721634 +0000 ++++ binutils-2.26/bfd/Makefile.in 2016-01-25 10:25:59.292607840 +0000 +@@ -350,6 +350,7 @@ libbfd_la_LDFLAGS = $(am__append_1) -rel + @INSTALL_LIBBFD_FALSE@bfdinclude_HEADERS = $(am__append_2) + @INSTALL_LIBBFD_TRUE@bfdinclude_HEADERS = $(BFD_H) \ + @INSTALL_LIBBFD_TRUE@ $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ ++@INSTALL_LIBBFD_TRUE@ $(INCDIR)/demangle.h \ + @INSTALL_LIBBFD_TRUE@ $(INCDIR)/bfdlink.h $(am__append_2) + @INSTALL_LIBBFD_FALSE@rpath_bfdlibdir = @bfdlibdir@ + @INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libbfd.la diff --git a/SOURCES/binutils-2.22.52.0.4-no-config-h-check.patch b/SOURCES/binutils-2.22.52.0.4-no-config-h-check.patch new file mode 100644 index 0000000..c89195a --- /dev/null +++ b/SOURCES/binutils-2.22.52.0.4-no-config-h-check.patch @@ -0,0 +1,28 @@ +--- 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 @@ + #ifndef __BFD_H_SEEN__ + #define __BFD_H_SEEN__ + +-/* PR 14072: Ensure that config.h is included first. */ +-#if !defined PACKAGE && !defined PACKAGE_VERSION +-#error config.h must be included before this header +-#endif +- + #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 @@ + #ifndef __BFD_H_SEEN__ + #define __BFD_H_SEEN__ + +-/* PR 14072: Ensure that config.h is included first. */ +-#if !defined PACKAGE && !defined PACKAGE_VERSION +-#error config.h must be included before this header +-#endif +- + #ifdef __cplusplus + extern "C" { + #endif diff --git a/SOURCES/binutils-2.25-set-long-long.patch b/SOURCES/binutils-2.25-set-long-long.patch new file mode 100644 index 0000000..1ea7418 --- /dev/null +++ b/SOURCES/binutils-2.25-set-long-long.patch @@ -0,0 +1,38 @@ +diff -up binutils-2.25.orig/bfd/configure.ac binutils-2.25/bfd/configure.ac +--- binutils-2.25.orig/bfd/configure.ac 2014-12-24 10:34:45.590491143 +0000 ++++ binutils-2.25/bfd/configure.ac 2014-12-24 10:36:12.997981992 +0000 +@@ -183,11 +183,13 @@ if test "x${ac_cv_sizeof_long}" = "x8"; + BFD_HOST_64BIT_LONG=1 + test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long" + test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long" +-elif test "x${ac_cv_sizeof_long_long}" = "x8"; then ++fi ++if test "x${ac_cv_sizeof_long_long}" = "x8"; then + BFD_HOST_64BIT_LONG_LONG=1 + test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long long" + test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long long" +- if test "x${ac_cv_sizeof_void_p}" = "x8"; then ++ if test "x${ac_cv_sizeof_void_p}" = "x8" \ ++ -a "x${ac_cv_sizeof_long}" != "x8"; then + BFD_HOSTPTR_T="unsigned long long" + fi + fi +diff -up ../binutils-2.20.51.0.7.original/bfd/configure ./bfd/configure +--- a/bfd/configure 2010-04-08 15:23:58.000000000 +0100 ++++ b/bfd/configure 2010-04-08 15:24:06.000000000 +0100 +@@ -12819,11 +12819,13 @@ + BFD_HOST_64BIT_LONG=1 + test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long" + test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long" +-elif test "x${ac_cv_sizeof_long_long}" = "x8"; then ++fi ++if test "x${ac_cv_sizeof_long_long}" = "x8"; then + BFD_HOST_64BIT_LONG_LONG=1 + test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long long" + test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long long" +- if test "x${ac_cv_sizeof_void_p}" = "x8"; then ++ if test "x${ac_cv_sizeof_void_p}" = "x8" \ ++ -a "x${ac_cv_sizeof_long}" != "x8"; then + BFD_HOSTPTR_T="unsigned long long" + fi + fi diff --git a/SOURCES/binutils-2.25-version.patch b/SOURCES/binutils-2.25-version.patch new file mode 100644 index 0000000..d97e81b --- /dev/null +++ b/SOURCES/binutils-2.25-version.patch @@ -0,0 +1,44 @@ +--- 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 + 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/'` ;\ +- bfd_version_string="\"$(VERSION)\"" ;\ +- bfd_soversion="$(VERSION)" ;\ ++ bfd_version_string="\"$(VERSION)-%{release}\"" ;\ ++ bfd_soversion="$(VERSION)-%{release}" ;\ + bfd_version_package="\"$(PKGVERSION)\"" ;\ + report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\ + . $(srcdir)/development.sh ;\ +@@ -1055,7 +1055,7 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/ + fi ;\ + $(SED) -e "s,@bfd_version@,$$bfd_version," \ + -e "s,@bfd_version_string@,$$bfd_version_string," \ +- -e "s,@bfd_version_package@,$$bfd_version_package," \ ++ -e "s,@bfd_version_package@,\"version \"," \ + -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) + 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/'` ;\ +- bfd_version_string="\"$(VERSION)\"" ;\ +- bfd_soversion="$(VERSION)" ;\ ++ bfd_version_string="\"$(VERSION)-%{release}\"" ;\ ++ bfd_soversion="$(VERSION)-%{release}" ;\ + bfd_version_package="\"$(PKGVERSION)\"" ;\ + report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\ + . $(srcdir)/development.sh ;\ +@@ -2123,7 +2123,7 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/ + fi ;\ + $(SED) -e "s,@bfd_version@,$$bfd_version," \ + -e "s,@bfd_version_string@,$$bfd_version_string," \ +- -e "s,@bfd_version_package@,$$bfd_version_package," \ ++ -e "s,@bfd_version_package@,\"version \"," \ + -e "s,@report_bugs_to@,$$report_bugs_to," \ + < $(srcdir)/version.h > $@; \ + echo "$${bfd_soversion}" > libtool-soversion diff --git a/SOURCES/binutils-2.26-lto.patch b/SOURCES/binutils-2.26-lto.patch new file mode 100644 index 0000000..c030f71 --- /dev/null +++ b/SOURCES/binutils-2.26-lto.patch @@ -0,0 +1,2439 @@ +diff -rup binutils-2.26.orig/bfd/bfd.c binutils-2.26/bfd/bfd.c +--- binutils-2.26.orig/bfd/bfd.c 2016-02-19 09:35:36.231000625 +0000 ++++ binutils-2.26/bfd/bfd.c 2016-02-19 09:35:54.901106498 +0000 +@@ -57,6 +57,14 @@ CODE_FRAGMENT + . bfd_byte data[1]; + . }; + . ++.enum bfd_lto_object_type ++. { ++. lto_non_object, ++. lto_non_ir_object, ++. lto_ir_object, ++. lto_mixed_object ++. }; ++. + .struct bfd + .{ + . {* The filename the application opened the BFD with. *} +@@ -227,6 +235,9 @@ CODE_FRAGMENT + . {* Set if this is a plugin output file. *} + . unsigned int lto_output : 1; + . ++. {* LTO object type. *} ++. ENUM_BITFIELD (bfd_lto_object_type) lto_type : 2; ++. + . {* Set to dummy BFD created when claimed by a compiler plug-in + . library. *} + . bfd *plugin_dummy_bfd; +@@ -252,6 +263,9 @@ CODE_FRAGMENT + . {* The last section on the section list. *} + . struct bfd_section *section_last; + . ++. {* The object-only section on the section list. *} ++. struct bfd_section *object_only_section; ++. + . {* The number of sections. *} + . unsigned int section_count; + . +@@ -2270,3 +2284,36 @@ bfd_convert_section_contents (bfd *ibfd, + *ptr_size = size; + return TRUE; + } ++ ++/* ++FUNCTION ++ bfd_group_signature ++ ++SYNOPSIS ++ asymbol *bfd_group_signature (asection *group, asymbol **isympp); ++ ++DESCRIPTION ++ Return a pointer to the symbol used as a signature for GROUP. ++*/ ++ ++asymbol * ++bfd_group_signature (asection *group, asymbol **isympp) ++{ ++ bfd *abfd = group->owner; ++ Elf_Internal_Shdr *ghdr; ++ ++ if (bfd_get_flavour (abfd) != bfd_target_elf_flavour) ++ return NULL; ++ ++ ghdr = &elf_section_data (group)->this_hdr; ++ if (ghdr->sh_link < elf_numsections (abfd)) ++ { ++ const struct elf_backend_data *bed = get_elf_backend_data (abfd); ++ Elf_Internal_Shdr *symhdr = elf_elfsections (abfd) [ghdr->sh_link]; ++ ++ if (symhdr->sh_type == SHT_SYMTAB ++ && ghdr->sh_info < symhdr->sh_size / bed->s->sizeof_sym) ++ return isympp[ghdr->sh_info - 1]; ++ } ++ return NULL; ++} +diff -rup binutils-2.26.orig/bfd/bfd-in2.h binutils-2.26/bfd/bfd-in2.h +--- binutils-2.26.orig/bfd/bfd-in2.h 2016-02-19 09:35:36.280000903 +0000 ++++ binutils-2.26/bfd/bfd-in2.h 2016-02-19 09:35:54.900106492 +0000 +@@ -1654,6 +1657,9 @@ extern asection _bfd_std_section[4]; + #define BFD_COM_SECTION_NAME "*COM*" + #define BFD_IND_SECTION_NAME "*IND*" + ++/* GNU object-only section name. */ ++#define GNU_OBJECT_ONLY_SECTION_NAME ".gnu_object_only" ++ + /* Pointer to the common section. */ + #define bfd_com_section_ptr (&_bfd_std_section[0]) + /* Pointer to the undefined section. */ +@@ -6511,6 +6517,14 @@ struct bfd_build_id + bfd_byte data[1]; + }; + ++enum bfd_lto_object_type ++ { ++ lto_non_object, ++ lto_non_ir_object, ++ lto_ir_object, ++ lto_mixed_object ++ }; ++ + struct bfd + { + /* The filename the application opened the BFD with. */ +@@ -6681,6 +6695,9 @@ struct bfd + /* Set if this is a plugin output file. */ + unsigned int lto_output : 1; + ++ /* LTO object type. */ ++ ENUM_BITFIELD (bfd_lto_object_type) lto_type : 2; ++ + /* Set to dummy BFD created when claimed by a compiler plug-in + library. */ + bfd *plugin_dummy_bfd; +@@ -6706,6 +6723,9 @@ struct bfd + /* The last section on the section list. */ + struct bfd_section *section_last; + ++ /* The object-only section on the section list. */ ++ struct bfd_section *object_only_section; ++ + /* The number of sections. */ + unsigned int section_count; + +@@ -7026,6 +7046,8 @@ bfd_boolean bfd_convert_section_contents + (bfd *ibfd, asection *isec, bfd *obfd, + bfd_byte **ptr, bfd_size_type *ptr_size); + ++asymbol *bfd_group_signature (asection *group, asymbol **isympp); ++ + /* Extracted from archive.c. */ + symindex bfd_get_next_mapent + (bfd *abfd, symindex previous, carsym **sym); +diff -rup binutils-2.26.orig/bfd/elf.c binutils-2.26/bfd/elf.c +--- binutils-2.26.orig/bfd/elf.c 2016-02-19 09:35:36.280000903 +0000 ++++ binutils-2.26/bfd/elf.c 2016-02-19 09:35:54.904106515 +0000 +@@ -2387,6 +2387,7 @@ static const struct bfd_elf_special_sect + { STRING_COMMA_LEN (".gnu.linkonce.b"), -2, SHT_NOBITS, SHF_ALLOC + SHF_WRITE }, + { STRING_COMMA_LEN (".gnu.lto_"), -1, SHT_PROGBITS, SHF_EXCLUDE }, + { STRING_COMMA_LEN (".got"), 0, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE }, ++ { STRING_COMMA_LEN (".gnu_object_only"), 0, SHT_GNU_OBJECT_ONLY, SHF_EXCLUDE }, + { STRING_COMMA_LEN (".gnu.version"), 0, SHT_GNU_versym, 0 }, + { STRING_COMMA_LEN (".gnu.version_d"), 0, SHT_GNU_verdef, 0 }, + { STRING_COMMA_LEN (".gnu.version_r"), 0, SHT_GNU_verneed, 0 }, +diff -rup binutils-2.26.orig/bfd/format.c binutils-2.26/bfd/format.c +--- binutils-2.26.orig/bfd/format.c 2016-02-19 09:35:36.265000818 +0000 ++++ binutils-2.26/bfd/format.c 2016-02-19 09:36:21.420256880 +0000 +@@ -46,6 +46,9 @@ SUBSECTION + #include "sysdep.h" + #include "bfd.h" + #include "libbfd.h" ++#if BFD_SUPPORTS_PLUGINS ++#include "plugin.h" ++#endif + + /* IMPORT from targets.c. */ + extern const size_t _bfd_target_vector_entries; +@@ -179,6 +182,33 @@ bfd_preserve_finish (bfd *abfd ATTRIBUTE + preserve->marker = NULL; + } + ++/* Set lto_type in ABFD. */ ++ ++static void ++bfd_set_lto_type (bfd *abfd) ++{ ++ if (abfd->format == bfd_object ++ && abfd->lto_type == lto_non_object ++ && (abfd->flags & (DYNAMIC | EXEC_P)) == 0) ++ { ++ asection *sec; ++ enum bfd_lto_object_type type = lto_non_ir_object; ++ for (sec = abfd->sections; sec != NULL; sec = sec->next) ++ { ++ if (strcmp (sec->name, GNU_OBJECT_ONLY_SECTION_NAME) == 0) ++ { ++ type = lto_mixed_object; ++ abfd->object_only_section = sec; ++ break; ++ } ++ else if (type != lto_ir_object ++ && strncmp (sec->name, ".gnu.lto_", 9) == 0) ++ type = lto_ir_object; ++ } ++ abfd->lto_type = type; ++ } ++} ++ + /* + FUNCTION + bfd_check_format_matches +@@ -221,7 +251,10 @@ bfd_check_format_matches (bfd *abfd, bfd + } + + if (abfd->format != bfd_unknown) +- return abfd->format == format; ++ { ++ bfd_set_lto_type (abfd); ++ return abfd->format == format; ++ } + + if (matching != NULL || *bfd_associated_vector != NULL) + { +@@ -285,6 +318,13 @@ bfd_check_format_matches (bfd *abfd, bfd + || (*target)->match_priority > best_match) + continue; + ++#if BFD_SUPPORTS_PLUGINS ++ /* If the plugin target is explicitly specified when a BFD file ++ is opened, don't check it twice. */ ++ if (bfd_plugin_specified_p () && bfd_plugin_target_p (*target)) ++ continue; ++#endif ++ + /* If we already tried a match, the bfd is modified and may + have sections attached, which will confuse the next + _bfd_check_format call. */ +@@ -449,6 +489,8 @@ bfd_check_format_matches (bfd *abfd, bfd + if (matching_vector) + free (matching_vector); + ++ bfd_set_lto_type (abfd); ++ + /* File position has moved, BTW. */ + return TRUE; + } +diff -rup binutils-2.26.orig/bfd/plugin.c binutils-2.26/bfd/plugin.c +--- binutils-2.26.orig/bfd/plugin.c 2016-02-19 09:35:36.271000852 +0000 ++++ binutils-2.26/bfd/plugin.c 2016-02-19 09:35:54.905106520 +0000 +@@ -130,6 +130,146 @@ register_claim_file (ld_plugin_claim_fil + return LDPS_OK; + } + ++static asection bfd_plugin_fake_text_section ++ = BFD_FAKE_SECTION (bfd_plugin_fake_text_section, 0, 0, ".text", 0); ++static asection bfd_plugin_fake_common_section ++ = BFD_FAKE_SECTION (bfd_plugin_fake_common_section, SEC_IS_COMMON, 0, ++ NULL, 0); ++ ++/* Get symbols from object only section. */ ++ ++static void ++bfd_plugin_get_symbols_in_object_only (bfd *abfd) ++{ ++ struct plugin_data_struct *plugin_data = abfd->tdata.plugin_data; ++ const char *object_only_file; ++ bfd *nbfd; ++ long storage; ++ long object_only_nsyms, added_nsyms, i; ++ asymbol **object_only_syms, **added_syms; ++ ++ plugin_data->object_only_syms = NULL; ++ plugin_data->object_only_nsyms = 0; ++ ++ if (abfd->sections == NULL && abfd->my_archive == NULL) ++ { ++ nbfd = bfd_openr (abfd->filename, NULL); ++ if (nbfd == NULL) ++ { ++ (*_bfd_error_handler) ++ (_("%s: failed to open to extract object only section: %s"), ++ abfd->filename, bfd_errmsg (bfd_get_error ())); ++ goto error_return; ++ } ++ else if (!bfd_check_format (nbfd, bfd_object)) ++ { ++ /* There is no object only section if it isn't a bfd_object ++ file. */ ++error_return: ++ bfd_close (nbfd); ++ return; ++ } ++ } ++ else ++ { ++ if (!bfd_check_format (abfd, bfd_object)) ++ { ++ (*_bfd_error_handler) ++ (_("%B: invalid file to extract object only section: %s"), ++ abfd, bfd_errmsg (bfd_get_error ())); ++ return; ++ } ++ nbfd = abfd; ++ } ++ ++ if (nbfd->lto_type == lto_mixed_object ++ && (nbfd->flags & HAS_SYMS) != 0) ++ { ++ object_only_file = bfd_extract_object_only_section (nbfd); ++ if (object_only_file == NULL) ++ (*_bfd_error_handler) ++ (_("%B: failed to extract object only section: %s"), ++ abfd, bfd_errmsg (bfd_get_error ())); ++ } ++ else ++ object_only_file = NULL; ++ ++ /* Close the new bfd we just opened. */ ++ if (nbfd != abfd) ++ bfd_close (nbfd); ++ ++ /* Return if there is no object only section or there is no ++ symbol in object only section. */ ++ if (!object_only_file) ++ return; ++ ++ /* Open the file containing object only section. */ ++ nbfd = bfd_openr (object_only_file, NULL); ++ if (!bfd_check_format (nbfd, bfd_object)) ++ { ++ (*_bfd_error_handler) ++ (_("%B: failed to open object only section: %s"), ++ abfd, bfd_errmsg (bfd_get_error ())); ++ goto quit; ++ } ++ ++ storage = bfd_get_symtab_upper_bound (nbfd); ++ if (storage <= 0) ++ { ++ if (storage < 0) ++ (*_bfd_error_handler) ++ (_("%B: failed to get symbol table in object only section: %s"), ++ abfd, bfd_errmsg (bfd_get_error ())); ++ ++ goto quit; ++ } ++ ++ object_only_syms = (asymbol **) bfd_malloc (storage); ++ object_only_nsyms = bfd_canonicalize_symtab (nbfd, object_only_syms); ++ ++ /* FIXME: We waste some spaces if not all symbols are copied. */ ++ added_syms = (asymbol **) bfd_alloc (abfd, storage); ++ added_nsyms = 0; ++ ++ /* Copy only global symbols from object only section. */ ++ for (i = 0; i < object_only_nsyms; i++) ++ { ++ asection *sec = object_only_syms[i]->section; ++ flagword flags = object_only_syms[i]->flags; ++ asymbol *s; ++ ++ if (bfd_is_com_section (sec)) ++ sec = &bfd_plugin_fake_common_section; ++ else if (bfd_is_und_section (sec)) ++ ; ++ else if ((flags & (BSF_GLOBAL | BSF_WEAK | BSF_GNU_UNIQUE)) != 0) ++ sec = &bfd_plugin_fake_text_section; ++ else ++ continue; ++ ++ s = bfd_alloc (abfd, sizeof (asymbol)); ++ BFD_ASSERT (s); ++ added_syms[added_nsyms++] = s; ++ ++ s->section = sec; ++ s->the_bfd = abfd; ++ s->name = xstrdup (object_only_syms[i]->name); ++ s->value = 0; ++ s->flags = flags; ++ s->udata.p = NULL; ++ } ++ ++ plugin_data->object_only_syms = added_syms; ++ plugin_data->object_only_nsyms = added_nsyms; ++ ++ free (object_only_syms); ++ ++quit: ++ /* Close and remove the object only section file. */ ++ bfd_close (nbfd); ++ unlink (object_only_file); ++} ++ + static enum ld_plugin_status + add_symbols (void * handle, + int nsyms, +@@ -142,10 +282,13 @@ add_symbols (void * handle, + plugin_data->nsyms = nsyms; + plugin_data->syms = syms; + +- if (nsyms != 0) ++ abfd->tdata.plugin_data = plugin_data; ++ ++ bfd_plugin_get_symbols_in_object_only (abfd); ++ ++ if ((nsyms + plugin_data->object_only_nsyms) != 0) + abfd->flags |= HAS_SYMS; + +- abfd->tdata.plugin_data = plugin_data; + return LDPS_OK; + } + +@@ -440,7 +583,8 @@ static long + bfd_plugin_get_symtab_upper_bound (bfd *abfd) + { + struct plugin_data_struct *plugin_data = abfd->tdata.plugin_data; +- long nsyms = plugin_data->nsyms; ++ /* Add symbols from object only section. */ ++ long nsyms = plugin_data->nsyms + plugin_data->object_only_nsyms; + + BFD_ASSERT (nsyms >= 0); + +@@ -474,12 +618,7 @@ bfd_plugin_canonicalize_symtab (bfd *abf + struct plugin_data_struct *plugin_data = abfd->tdata.plugin_data; + long nsyms = plugin_data->nsyms; + const struct ld_plugin_symbol *syms = plugin_data->syms; +- static asection fake_section; +- static asection fake_common_section; +- int i; +- +- fake_section.name = ".text"; +- fake_common_section.flags = SEC_IS_COMMON; ++ int i, j; + + for (i = 0; i < nsyms; i++) + { +@@ -492,10 +631,11 @@ bfd_plugin_canonicalize_symtab (bfd *abf + s->name = syms[i].name; + s->value = 0; + s->flags = convert_flags (&syms[i]); ++ s->udata.p = NULL; + switch (syms[i].def) + { + case LDPK_COMMON: +- s->section = &fake_common_section; ++ s->section = &bfd_plugin_fake_common_section; + break; + case LDPK_UNDEF: + case LDPK_WEAKUNDEF: +@@ -503,15 +643,18 @@ bfd_plugin_canonicalize_symtab (bfd *abf + break; + case LDPK_DEF: + case LDPK_WEAKDEF: +- s->section = &fake_section; ++ s->section = &bfd_plugin_fake_text_section; + break; + default: + BFD_ASSERT (0); + } +- +- s->udata.p = (void *) &syms[i]; + } + ++ /* Copy symbols from object only section. */ ++ nsyms += plugin_data->object_only_nsyms; ++ for (j = 0; j < plugin_data->object_only_nsyms; j++, i++) ++ alocation[i] = plugin_data->object_only_syms[j]; ++ + return nsyms; + } + +diff -rup binutils-2.26.orig/bfd/plugin.h binutils-2.26/bfd/plugin.h +--- binutils-2.26.orig/bfd/plugin.h 2016-02-19 09:35:36.271000852 +0000 ++++ binutils-2.26/bfd/plugin.h 2016-02-19 09:35:54.906106526 +0000 +@@ -33,6 +33,8 @@ typedef struct plugin_data_struct + { + int nsyms; + const struct ld_plugin_symbol *syms; ++ int object_only_nsyms; ++ asymbol **object_only_syms; + } + plugin_data_struct; + +diff -rup binutils-2.26.orig/bfd/section.c binutils-2.26/bfd/section.c +--- binutils-2.26.orig/bfd/section.c 2016-02-19 09:35:36.276000881 +0000 ++++ binutils-2.26/bfd/section.c 2016-02-19 09:35:54.906106526 +0000 +@@ -588,6 +588,9 @@ CODE_FRAGMENT + .#define BFD_COM_SECTION_NAME "*COM*" + .#define BFD_IND_SECTION_NAME "*IND*" + . ++.{* GNU object-only section name. *} ++.#define GNU_OBJECT_ONLY_SECTION_NAME ".gnu_object_only" ++. + .{* Pointer to the common section. *} + .#define bfd_com_section_ptr (&_bfd_std_section[0]) + .{* Pointer to the undefined section. *} +diff -rup binutils-2.26.orig/binutils/readelf.c binutils-2.26/binutils/readelf.c +--- binutils-2.26.orig/binutils/readelf.c 2016-02-19 09:35:36.295000988 +0000 ++++ binutils-2.26/binutils/readelf.c 2016-02-19 09:35:54.911106554 +0000 +@@ -3900,6 +3900,7 @@ get_section_type_name (unsigned int sh_t + case 0x7ffffffd: return "AUXILIARY"; + case 0x7fffffff: return "FILTER"; + case SHT_GNU_LIBLIST: return "GNU_LIBLIST"; ++ case SHT_GNU_OBJECT_ONLY: return "GNU_OBJECT_ONLY"; + + default: + if ((sh_type >= SHT_LOPROC) && (sh_type <= SHT_HIPROC)) +diff -rup binutils-2.26.orig/gas/testsuite/gas/elf/section9.d binutils-2.26/gas/testsuite/gas/elf/section9.d +--- binutils-2.26.orig/gas/testsuite/gas/elf/section9.d 2016-02-19 09:35:36.397001567 +0000 ++++ binutils-2.26/gas/testsuite/gas/elf/section9.d 2016-02-19 09:35:54.912106560 +0000 +@@ -4,4 +4,5 @@ + #... + [ ]*\[.*\][ ]+\.gnu\.lto_main[ ]+PROGBITS.*[ ]+E[ ]+.* + [ ]*\[.*\][ ]+\.gnu\.lto_\.pureconst[ ]+PROGBITS.*[ ]+E[ ]+.* ++[ ]*\[.*\][ ]+\.gnu_object_only[ ]+GNU_OBJECT_ONLY.*[ ]+E[ ]+.* + #pass +diff -rup binutils-2.26.orig/gas/testsuite/gas/elf/section9.s binutils-2.26/gas/testsuite/gas/elf/section9.s +--- binutils-2.26.orig/gas/testsuite/gas/elf/section9.s 2016-02-19 09:35:36.397001567 +0000 ++++ binutils-2.26/gas/testsuite/gas/elf/section9.s 2016-02-19 09:35:54.912106560 +0000 +@@ -2,3 +2,5 @@ + .byte 0,0,0,0 + .section .gnu.lto_.pureconst,"",%progbits + .byte 0,0,0,0 ++ .section .gnu_object_only ++ .byte 0,0,0,0 +diff -rup binutils-2.26.orig/include/bfdlink.h binutils-2.26/include/bfdlink.h +--- binutils-2.26.orig/include/bfdlink.h 2016-02-19 09:35:36.672003126 +0000 ++++ binutils-2.26/include/bfdlink.h 2016-02-19 09:35:54.913106566 +0000 +@@ -400,6 +400,12 @@ struct bfd_link_info + /* TRUE if ok to have multiple definition. */ + unsigned int allow_multiple_definition: 1; + ++ /* TRUE if .gnu_object_only section should be created. */ ++ unsigned int emit_gnu_object_only: 1; ++ ++ /* TRUE if .gnu_object_only section is being created. */ ++ unsigned int emitting_gnu_object_only: 1; ++ + /* TRUE if ok to have version with no definition. */ + unsigned int allow_undefined_version: 1; + +diff -rup binutils-2.26.orig/include/elf/common.h binutils-2.26/include/elf/common.h +--- binutils-2.26.orig/include/elf/common.h 2016-02-19 09:35:36.675003143 +0000 ++++ binutils-2.26/include/elf/common.h 2016-02-19 09:35:54.913106566 +0000 +@@ -478,6 +478,7 @@ + #define SHT_GNU_ATTRIBUTES 0x6ffffff5 /* Object attributes */ + #define SHT_GNU_HASH 0x6ffffff6 /* GNU style symbol hash table */ + #define SHT_GNU_LIBLIST 0x6ffffff7 /* List of prelink dependencies */ ++#define SHT_GNU_OBJECT_ONLY 0x6ffffff8 /* Object only */ + + /* The next three section types are defined by Solaris, and are named + SHT_SUNW*. We use them in GNU code, so we also define SHT_GNU* +diff -rup binutils-2.26.orig/ld/emultempl/aarch64elf.em binutils-2.26/ld/emultempl/aarch64elf.em +--- binutils-2.26.orig/ld/emultempl/aarch64elf.em 2016-02-19 09:35:36.698003274 +0000 ++++ binutils-2.26/ld/emultempl/aarch64elf.em 2016-02-19 09:35:54.914106571 +0000 +@@ -271,7 +271,7 @@ gld${EMULATION_NAME}_after_allocation (v + } + + static void +-gld${EMULATION_NAME}_finish (void) ++aarch64_finish (void) + { + if (!bfd_link_relocatable (&link_info)) + { +@@ -283,7 +283,7 @@ gld${EMULATION_NAME}_finish (void) + } + } + +- finish_default (); ++ gld${EMULATION_NAME}_finish (); + } + + /* This is a convenient point to tell BFD about target specific flags. +@@ -435,4 +435,4 @@ LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS= + LDEMUL_BEFORE_PARSE=gld"${EMULATION_NAME}"_before_parse + + # Call the extra arm-elf function +-LDEMUL_FINISH=gld${EMULATION_NAME}_finish ++LDEMUL_FINISH=aarch64_finish +diff -rup binutils-2.26.orig/ld/emultempl/alphaelf.em binutils-2.26/ld/emultempl/alphaelf.em +--- binutils-2.26.orig/ld/emultempl/alphaelf.em 2016-02-19 09:35:36.698003274 +0000 ++++ binutils-2.26/ld/emultempl/alphaelf.em 2016-02-19 09:35:54.914106571 +0000 +@@ -104,7 +104,7 @@ alpha_finish (void) + if (limit_32bit) + elf_elfheader (link_info.output_bfd)->e_flags |= EF_ALPHA_32BIT; + +- finish_default (); ++ gld${EMULATION_NAME}_finish (); + } + EOF + +diff -rup binutils-2.26.orig/ld/emultempl/avrelf.em binutils-2.26/ld/emultempl/avrelf.em +--- binutils-2.26.orig/ld/emultempl/avrelf.em 2016-02-19 09:35:36.698003274 +0000 ++++ binutils-2.26/ld/emultempl/avrelf.em 2016-02-19 09:35:54.915106577 +0000 +@@ -209,7 +209,7 @@ avr_finish (void) + elf_elfheader (abfd)->e_flags &= ~EF_AVR_LINKRELAX_PREPARED; + } + +- finish_default (); ++ gld${EMULATION_NAME}_finish (); + } + EOF + +diff -rup binutils-2.26.orig/ld/emultempl/elf32.em binutils-2.26/ld/emultempl/elf32.em +--- binutils-2.26.orig/ld/emultempl/elf32.em 2016-02-19 09:35:36.700003285 +0000 ++++ binutils-2.26/ld/emultempl/elf32.em 2016-02-19 09:35:54.915106577 +0000 +@@ -66,6 +66,7 @@ static void gld${EMULATION_NAME}_before_ + static void gld${EMULATION_NAME}_after_allocation (void); + static lang_output_section_statement_type *gld${EMULATION_NAME}_place_orphan + (asection *, const char *, int); ++static void gld${EMULATION_NAME}_finish (void); + EOF + + if [ "x${USE_LIBPATH}" = xyes ] ; then +@@ -1795,6 +1796,8 @@ output_rel_find (asection *sec, int isdy + in->owner, in); + } + ++static int orphan_init_done = 0; ++ + /* Place an orphan section. We use this to put random SHF_ALLOC + sections in the right segment. */ + +@@ -1803,7 +1806,7 @@ gld${EMULATION_NAME}_place_orphan (asect + const char *secname, + int constraint) + { +- static struct orphan_save hold[] = ++ static struct orphan_save orig_hold[] = + { + { ".text", + SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE, +@@ -1833,6 +1836,7 @@ gld${EMULATION_NAME}_place_orphan (asect + SEC_HAS_CONTENTS, + 0, 0, 0, 0 }, + }; ++ static struct orphan_save hold[ARRAY_SIZE (orig_hold)]; + enum orphan_save_index + { + orphan_text = 0, +@@ -1845,7 +1849,6 @@ gld${EMULATION_NAME}_place_orphan (asect + orphan_sdata, + orphan_nonalloc + }; +- static int orphan_init_done = 0; + struct orphan_save *place; + lang_output_section_statement_type *after; + lang_output_section_statement_type *os; +@@ -1924,15 +1927,22 @@ gld${EMULATION_NAME}_place_orphan (asect + + if (!orphan_init_done) + { +- struct orphan_save *ho; ++ struct orphan_save *ho, *horig; + + for (ho = hold; ho < hold + sizeof (hold) / sizeof (hold[0]); ++ho) ++ for (ho = hold, horig = orig_hold; ++ ho < hold + ARRAY_SIZE (hold); ++ ++ho, ++horig) ++ { ++ *ho = *horig; ++ if (ho->name != NULL) + if (ho->name != NULL) + { + ho->os = lang_output_section_find (ho->name); + if (ho->os != NULL && ho->os->flags == 0) + ho->os->flags = ho->flags; + } ++ } + orphan_init_done = 1; + } + +@@ -2017,6 +2027,27 @@ gld${EMULATION_NAME}_place_orphan (asect + EOF + fi + ++fragment <my_archive; ++ if (archive) ++ break; ++ case cmdline_is_file_enum: ++ cmdline_list_append (&cmdline_object_only_file_list, type, data); ++ return; ++ } ++ ++ /* Put archive member on cmdline_object_only_archive_list and sort ++ the list by archive name and archive member origin. */ ++ new_opt = (cmdline_union_type *) stat_alloc (sizeof (*new_opt)); ++ new_opt->header.type = cmdline_is_bfd_enum; ++ new_opt->header.next = NULL; ++ new_opt->abfd.abfd = (bfd *) data; ++ ++ c = cmdline_object_only_archive_list.head; ++ if (c == NULL) ++ { ++ cmdline_object_only_archive_list.head = new_opt; ++ cmdline_object_only_archive_list.tail = &new_opt->header.next; ++ return; ++ } ++ ++ prev = NULL; ++ origin = abfd->origin; ++ for (; c != NULL; c = next) ++ { ++ if (c->header.type != cmdline_is_bfd_enum) ++ abort (); ++ ++ next = c->header.next; ++ ++ obfd = c->abfd.abfd; ++ oarchive = abfd->my_archive; ++ ++ if (strcmp (archive->filename, oarchive->filename) == 0) ++ { ++ bfd_boolean after; ++ ++ if (origin < obfd->origin) ++ { ++ /* Insert it before the current. */ ++ new_opt->header.next = c; ++ if (prev) ++ *prev = new_opt; ++ else ++ cmdline_object_only_archive_list.head = new_opt; ++ return; ++ } ++ ++ after = TRUE; ++ ++ /* Check origin. */ ++ while (next) ++ { ++ if (next->header.type != cmdline_is_bfd_enum) ++ abort (); ++ ++ nbfd = next->abfd.abfd; ++ norigin = nbfd->origin; ++ if (origin > norigin) ++ { ++ /* Insert it after NEXT. */ ++ break; ++ } ++ ++ narchive = nbfd->my_archive; ++ if (strcmp (archive->filename, narchive->filename) != 0) ++ { ++ /* Insert it befor NEXT. */ ++ after = FALSE; ++ break; ++ } ++ ++ c = next; ++ next = next->header.next; ++ } ++ ++ if (after && next) ++ { ++ c = next; ++ next = next->header.next; ++ } ++ ++ if (*cmdline_object_only_archive_list.tail == c->header.next) ++ cmdline_object_only_archive_list.tail ++ = &new_opt->header.next; ++ ++ prev = &c->header.next; ++ new_opt->header.next = next; ++ *prev = new_opt; ++ return; ++ } ++ ++ prev = &c->header.next; ++ } ++ ++ *cmdline_object_only_archive_list.tail = new_opt; ++ cmdline_object_only_archive_list.tail = &new_opt->header.next; ++} ++ ++/* Get object-only input files. */ ++ ++static void ++cmdline_get_object_only_input_files (void) ++{ ++ cmdline_union_type *c, *next; ++ bfd *abfd, *archive; ++ bfd *nbfd, *narchive; ++ ++ /* Add files first. */ ++ for (c = cmdline_object_only_file_list.head; ++ c != NULL; c = c->header.next) ++ switch (c->header.type) ++ { ++ default: ++ abort (); ++ case cmdline_is_file_enum: ++ lang_add_input_file (c->file.filename, ++ lang_input_file_is_file_enum, NULL); ++ break; ++ case cmdline_is_bfd_enum: ++ abfd = c->abfd.abfd; ++ if (abfd->my_archive) ++ abort (); ++ lang_add_input_file (abfd->filename, ++ lang_input_file_is_file_enum, NULL); ++ break; ++ } ++ ++ /* Add archive members next. */ ++ for (c = cmdline_object_only_archive_list.head; c != NULL; c = next) ++ { ++ if (c->header.type != cmdline_is_bfd_enum) ++ abort (); ++ ++ next = c->header.next; ++ ++ abfd = c->abfd.abfd; ++ archive = abfd->my_archive; ++ ++ /* Add the first archive of the archive member group. */ ++ lang_add_input_file (archive->filename, ++ lang_input_file_is_file_enum, NULL); ++ ++ /* Skip the rest members in the archive member group. */ ++ do ++ { ++ if (!next) ++ break; ++ ++ if (next->header.type != cmdline_is_bfd_enum) ++ abort (); ++ ++ next = next->header.next; ++ if (!next) ++ break; ++ nbfd = next->abfd.abfd; ++ narchive = nbfd->my_archive; ++ } ++ while (strcmp (archive->filename, narchive->filename) == 0); ++ } ++} ++ ++struct cmdline_arg ++{ ++ bfd *obfd; ++ asymbol **isympp; ++ int status; ++}; ++ ++/* Create a section in OBFD with the same ++ name and attributes as ISECTION in IBFD. */ ++ ++static void ++setup_section (bfd *ibfd, sec_ptr isection, void *p) ++{ ++ struct cmdline_arg *arg = (struct cmdline_arg *) p; ++ bfd *obfd = arg->obfd; ++ asymbol **isympp = arg->isympp; ++ const char *name = isection->name; ++ sec_ptr osection; ++ const char *err; ++ ++ /* Skip the object-only section. */ ++ if (ibfd->object_only_section == isection) ++ return; ++ ++ /* If we have already failed earlier on, do not keep on generating ++ complaints now. */ ++ if (arg->status) ++ return; ++ ++ osection = bfd_make_section_anyway_with_flags (obfd, name, ++ isection->flags); ++ ++ if (osection == NULL) ++ { ++ err = _("failed to create output section"); ++ goto loser; ++ } ++ ++ osection->size = isection->size; ++ osection->vma = isection->vma; ++ osection->lma = isection->lma; ++ osection->alignment_power = isection->alignment_power; ++ ++ /* Copy merge entity size. */ ++ osection->entsize = isection->entsize; ++ ++ /* This used to be mangle_section; we do here to avoid using ++ bfd_get_section_by_name since some formats allow multiple ++ sections with the same name. */ ++ isection->output_section = osection; ++ isection->output_offset = 0; ++ ++ if ((isection->flags & SEC_GROUP) != 0) ++ { ++ asymbol *gsym = bfd_group_signature (isection, isympp); ++ ++ if (gsym != NULL) ++ { ++ gsym->flags |= BSF_KEEP; ++ if (ibfd->xvec->flavour == bfd_target_elf_flavour) ++ elf_group_id (isection) = gsym; ++ } ++ } ++ ++ /* Allow the BFD backend to copy any private data it understands ++ from the input section to the output section. */ ++ if (!bfd_copy_private_section_data (ibfd, isection, obfd, osection)) ++ { ++ err = _("failed to copy private data"); ++ goto loser; ++ } ++ ++ /* All went well. */ ++ return; ++ ++loser: ++ arg->status = 1; ++ einfo (_("%P%F: setup_section: %s: %s\n"), err, name); ++} ++ ++/* Copy the data of input section ISECTION of IBFD ++ to an output section with the same name in OBFD. ++ If stripping then don't copy any relocation info. */ ++ ++static void ++copy_section (bfd *ibfd, sec_ptr isection, void *p) ++{ ++ struct cmdline_arg *arg = (struct cmdline_arg *) p; ++ bfd *obfd = arg->obfd; ++ asymbol **isympp = arg->isympp; ++ arelent **relpp; ++ long relcount; ++ sec_ptr osection; ++ bfd_size_type size; ++ long relsize; ++ flagword flags; ++ const char *err; ++ ++ /* Skip the object-only section. */ ++ if (ibfd->object_only_section == isection) ++ return; ++ ++ /* If we have already failed earlier on, do not keep on generating ++ complaints now. */ ++ if (arg->status) ++ return; ++ ++ flags = bfd_get_section_flags (ibfd, isection); ++ if ((flags & SEC_GROUP) != 0) ++ return; ++ ++ osection = isection->output_section; ++ size = bfd_get_section_size (isection); ++ ++ if (size == 0 || osection == 0) ++ return; ++ ++ relsize = bfd_get_reloc_upper_bound (ibfd, isection); ++ ++ if (relsize < 0) ++ { ++ /* Do not complain if the target does not support relocations. */ ++ if (relsize == -1 ++ && bfd_get_error () == bfd_error_invalid_operation) ++ relsize = 0; ++ else ++ { ++ err = bfd_errmsg (bfd_get_error ()); ++ goto loser; ++ } ++ } ++ ++ if (relsize == 0) ++ bfd_set_reloc (obfd, osection, NULL, 0); ++ else ++ { ++ relpp = (arelent **) xmalloc (relsize); ++ relcount = bfd_canonicalize_reloc (ibfd, isection, relpp, isympp); ++ if (relcount < 0) ++ { ++ err = _("relocation count is negative"); ++ goto loser; ++ } ++ ++ bfd_set_reloc (obfd, osection, ++ relcount == 0 ? NULL : relpp, relcount); ++ if (relcount == 0) ++ free (relpp); ++ } ++ ++ if (bfd_get_section_flags (ibfd, isection) & SEC_HAS_CONTENTS) ++ { ++ bfd_byte *memhunk = NULL; ++ ++ if (!bfd_get_full_section_contents (ibfd, isection, &memhunk)) ++ { ++ err = bfd_errmsg (bfd_get_error ()); ++ goto loser; ++ } ++ ++ if (!bfd_set_section_contents (obfd, osection, memhunk, 0, size)) ++ { ++ err = bfd_errmsg (bfd_get_error ()); ++ goto loser; ++ } ++ free (memhunk); ++ } ++ ++ /* All went well. */ ++ return; ++ ++loser: ++ einfo (_("%P%F: copy_section: %s: %s\n"), err, isection->name); ++} ++/* Open the temporary bfd created in the same directory as PATH. */ ++ ++static bfd * ++cmdline_fopen_temp (const char *path, const char *target, ++ const char *mode) ++{ ++#define template "ldXXXXXX" ++ const char *slash = strrchr (path, '/'); ++ char *tmpname; ++ size_t len; ++ int fd; ++ ++#ifdef HAVE_DOS_BASED_FILE_SYSTEM ++ { ++ /* We could have foo/bar\\baz, or foo\\bar, or d:bar. */ ++ char *bslash = strrchr (path, '\\'); ++ ++ if (slash == NULL || (bslash != NULL && bslash > slash)) ++ slash = bslash; ++ if (slash == NULL && path[0] != '\0' && path[1] == ':') ++ slash = path + 1; ++ } ++#endif ++ ++ if (slash != (char *) NULL) ++ { ++ len = slash - path; ++ tmpname = (char *) xmalloc (len + sizeof (template) + 2); ++ memcpy (tmpname, path, len); ++ ++#ifdef HAVE_DOS_BASED_FILE_SYSTEM ++ /* If tmpname is "X:", appending a slash will make it a root ++ directory on drive X, which is NOT the same as the current ++ directory on drive X. */ ++ if (len == 2 && tmpname[1] == ':') ++ tmpname[len++] = '.'; ++#endif ++ tmpname[len++] = '/'; ++ } ++ else ++ { ++ tmpname = (char *) xmalloc (sizeof (template)); ++ len = 0; ++ } ++ ++ memcpy (tmpname + len, template, sizeof (template)); ++#undef template ++ ++#ifdef HAVE_MKSTEMP ++ fd = mkstemp (tmpname); ++#else ++ tmpname = mktemp (tmpname); ++ if (tmpname == NULL) ++ return NULL; ++ fd = open (tmpname, O_RDWR | O_CREAT | O_EXCL, 0600); ++#endif ++ if (fd == -1) ++ return NULL; ++ return bfd_fopen (tmpname, target, mode, fd); ++} ++ ++/* Add the object-only section. */ ++ ++static void ++cmdline_add_object_only_section (bfd_byte *contents, size_t size) ++{ ++ bfd_vma start; ++ flagword flags; ++ enum bfd_architecture iarch; ++ unsigned int imach; ++ long symcount; ++ long symsize; ++ asymbol **isympp = NULL; ++ asymbol **osympp = NULL; ++ bfd *obfd = NULL, *ibfd; ++ const char *err; ++ struct arg ++ { ++ bfd *obfd; ++ asymbol **isympp; ++ int status; ++ } arg; ++ char **matching; ++ char *ofilename = NULL; ++ asection *sec; ++ ++ ibfd = bfd_openr (output_filename, output_target); ++ if (!ibfd) ++ { ++ err = bfd_errmsg (bfd_get_error ()); ++ goto loser; ++ } ++ ++ if (!bfd_check_format_matches (ibfd, bfd_object, &matching)) ++ { ++ err = bfd_errmsg (bfd_get_error ()); ++ goto loser; ++ } ++ ++ obfd = cmdline_fopen_temp (output_filename, output_target, "w"); ++ if (!obfd) ++ { ++ err = bfd_errmsg (bfd_get_error ()); ++ goto loser; ++ } ++ /* To be used after bfd_close (). */ ++ ofilename = xstrdup (bfd_get_filename (obfd)); ++ ++ if (!bfd_set_format (obfd, bfd_object)) ++ { ++ err = bfd_errmsg (bfd_get_error ()); ++ goto loser; ++ } ++ ++ /* Copy the start address, flags and architecture of input file to ++ output file. */ ++ flags = bfd_get_file_flags (ibfd); ++ start = bfd_get_start_address (ibfd); ++ iarch = bfd_get_arch (ibfd); ++ imach = bfd_get_mach (ibfd); ++ if (!bfd_set_start_address (obfd, start) ++ || !bfd_set_file_flags (obfd, flags) ++ || !bfd_set_arch_mach (obfd, iarch, imach)) ++ { ++ err = bfd_errmsg (bfd_get_error ()); ++ goto loser; ++ } ++ ++ symsize = bfd_get_symtab_upper_bound (ibfd); ++ if (symsize < 0) ++ { ++ err = bfd_errmsg (bfd_get_error ()); ++ goto loser; ++ } ++ ++ isympp = (asymbol **) xmalloc (symsize); ++ symcount = bfd_canonicalize_symtab (ibfd, isympp); ++ if (symcount < 0) ++ { ++ err = bfd_errmsg (bfd_get_error ()); ++ goto loser; ++ } ++ ++ arg.obfd = obfd; ++ arg.isympp = isympp; ++ arg.status = 0; ++ ++ /* BFD mandates that all output sections be created and sizes set before ++ any output is done. Thus, we traverse all sections multiple times. */ ++ bfd_map_over_sections (ibfd, setup_section, &arg); ++ ++ if (arg.status) ++ { ++ err = _("error setting up sections"); ++ goto loser; ++ } ++ ++ /* Allow the BFD backend to copy any private data it understands ++ from the input section to the output section. */ ++ if (! bfd_copy_private_header_data (ibfd, obfd)) ++ { ++ err = _("error copying private header data"); ++ goto loser; ++ } ++ ++ /* Create the object-only section. */ ++ sec = bfd_make_section_with_flags (obfd, ++ GNU_OBJECT_ONLY_SECTION_NAME, ++ (SEC_HAS_CONTENTS ++ | SEC_READONLY ++ | SEC_DATA ++ | SEC_LINKER_CREATED)); ++ if (sec == NULL) ++ { ++ err = _("can't create object-only section"); ++ goto loser; ++ } ++ ++ if (! bfd_set_section_size (obfd, sec, size)) ++ { ++ err = _("can't set object-only section size"); ++ goto loser; ++ } ++ ++ if (ibfd->object_only_section) ++ { ++ /* Filter out the object-only section symbol. */ ++ long src_count = 0, dst_count = 0; ++ asymbol **from, **to; ++ ++ osympp = (asymbol **) xmalloc (symcount * sizeof (asymbol *)); ++ from = isympp; ++ to = osympp; ++ for (; src_count < symcount; src_count++) ++ { ++ asymbol *sym = from[src_count]; ++ if (bfd_get_section (sym) != ibfd->object_only_section) ++ to[dst_count++] = sym; ++ } ++ to[dst_count] = NULL; ++ symcount = dst_count; ++ bfd_set_symtab (obfd, osympp, symcount); ++ } ++ else ++ bfd_set_symtab (obfd, isympp, symcount); ++ ++ /* This has to happen after the symbol table has been set. */ ++ bfd_map_over_sections (ibfd, copy_section, &arg); ++ ++ if (arg.status) ++ { ++ err = _("error copying sections"); ++ goto loser; ++ } ++ ++ /* Copy the object-only section to the output. */ ++ if (! bfd_set_section_contents (obfd, sec, contents, 0, size)) ++ { ++ err = _("error adding object-only section"); ++ goto loser; ++ } ++ ++ /* Allow the BFD backend to copy any private data it understands ++ from the input BFD to the output BFD. This is done last to ++ permit the routine to look at the filtered symbol table, which is ++ important for the ECOFF code at least. */ ++ if (! bfd_copy_private_bfd_data (ibfd, obfd)) ++ { ++ err = _("error copying private BFD data"); ++ goto loser; ++ } ++ ++ if (!bfd_close (obfd)) ++ { ++ unlink (ofilename); ++ einfo (_("%P%F: failed to finish output with object-only section\n")); ++ } ++ ++ /* Must be freed after bfd_close (). */ ++ free (isympp); ++ if (osympp) ++ free (osympp); ++ ++ if (rename (ofilename, output_filename)) ++ { ++ unlink (ofilename); ++ einfo (_("%P%F: failed to rename output with object-only section\n")); ++ } ++ ++ free (ofilename); ++ return; ++ ++loser: ++ if (isympp) ++ free (isympp); ++ if (osympp) ++ free (osympp); ++ if (obfd) ++ bfd_close (obfd); ++ if (ofilename) ++ { ++ unlink (ofilename); ++ free (ofilename); ++ } ++ einfo (_("%P%F: failed to add object-only section: %s\n"), err); ++} ++ ++/* Emit the final output with object-only section. */ ++ ++void ++cmdline_emit_object_only_section (void) ++{ ++ const char *saved_output_filename = output_filename; ++ int fd; ++ size_t size, off; ++ bfd_byte *contents; ++ struct stat st; ++ ++ /* Get a temporary object-only file. */ ++ output_filename = make_temp_file (".obj-only.o"); ++ ++ had_output_filename = FALSE; ++ link_info.input_bfds = NULL; ++ link_info.input_bfds_tail = &link_info.input_bfds; ++ ++ lang_init (TRUE); ++ ldexp_init (TRUE); ++ ++ ld_parse_linker_script (); ++ ++ /* Set up the object-only output. */ ++ lang_final (); ++ ++ /* Open the object-only file for output. */ ++ lang_for_each_statement (ldlang_open_output); ++ ++ ldemul_create_output_section_statements (); ++ ++ if (!bfd_section_already_linked_table_init ()) ++ einfo (_("%P%F: Failed to create hash table\n")); ++ ++ /* Call cmdline_on_object_only_archive_list_p to check which member ++ should be loaded. */ ++ input_flags.whole_archive = TRUE; ++ ++ /* Set it to avoid adding more to cmdline lists. */ ++ link_info.emitting_gnu_object_only = TRUE; ++ ++ /* Get object-only input files. */ ++ cmdline_get_object_only_input_files (); ++ ++ /* Open object-only input files. */ ++ open_input_bfds (statement_list.head, FALSE); ++ ++ ldemul_after_open (); ++ ++ bfd_section_already_linked_table_free (); ++ ++ /* Make sure that we're not mixing architectures. We call this ++ after all the input files have been opened, but before we do any ++ other processing, so that any operations merge_private_bfd_data ++ does on the output file will be known during the rest of the ++ link. */ ++ lang_check (); ++ ++ /* Size up the common data. */ ++ lang_common (); ++ ++ /* Update wild statements. */ ++ update_wild_statements (statement_list.head); ++ ++ /* Run through the contours of the script and attach input sections ++ to the correct output sections. */ ++ map_input_to_output_sections (statement_list.head, NULL, NULL); ++ ++ /* Find any sections not attached explicitly and handle them. */ ++ lang_place_orphans (); ++ ++ /* Do anything special before sizing sections. This is where ELF ++ and other back-ends size dynamic sections. */ ++ ldemul_before_allocation (); ++ ++ /* Size up the sections. */ ++ lang_size_sections (NULL, ! RELAXATION_ENABLED); ++ ++ /* See if anything special should be done now we know how big ++ everything is. This is where relaxation is done. */ ++ ldemul_after_allocation (); ++ ++ ldemul_finish (); ++ ++ /* Make sure that the section addresses make sense. */ ++ if (command_line.check_section_addresses) ++ lang_check_section_addresses (); ++ ++ lang_end (); ++ ++ ldwrite (); ++ ++ ldexp_finish (TRUE); ++ lang_finish (); ++ ++ if (! bfd_close (link_info.output_bfd)) ++ einfo (_("%P%F:%s: final close failed on object-only output: %E\n"), ++ output_filename); ++ ++ /* Read in the object-only file. */ ++ fd = open (output_filename, O_RDONLY | O_BINARY); ++ if (fd < 0) ++ { ++ bfd_set_error (bfd_error_system_call); ++ einfo (_("%P%F:%s: cannot open object-only output: %E"), ++ output_filename); ++ } ++ ++ /* Get the object-only file size. */ ++ if (fstat (fd, &st) != 0) ++ { ++ bfd_set_error (bfd_error_system_call); ++ einfo (_("%P%F:%s: cannot stat object-only output: %E"), ++ output_filename); ++ } ++ ++ size = st.st_size; ++ off = 0; ++ contents = (bfd_byte *) xmalloc (size); ++ while (off != size) ++ { ++ ssize_t got; ++ ++ got = read (fd, contents + off, size - off); ++ if (got < 0) ++ { ++ bfd_set_error (bfd_error_system_call); ++ einfo (_("%P%F:%s: read failed on object-only output: %E"), ++ output_filename); ++ } ++ ++ off += got; ++ } ++ ++ close (fd); ++ ++ /* Remove the temporary object-only file. */ ++ unlink (output_filename); ++ ++ output_filename = saved_output_filename; ++ ++ cmdline_add_object_only_section (contents, size); ++ ++ free (contents); ++} ++ ++/* Extract the object-only section. */ ++ ++static const char * ++cmdline_extract_object_only_section (bfd *abfd) ++{ ++ const char *name = bfd_extract_object_only_section (abfd); ++ ++ if (name == NULL) ++ einfo (_("%P%F: cannot extract object-only section from %B: %E"), ++ abfd); ++ ++ /* It should be removed after it is done. */ ++ cmdline_list_append (&cmdline_temp_object_only_list, ++ cmdline_is_file_enum, (void *) name); ++ ++ return name; ++} ++ ++/* Check and handle the object-only section. */ ++ ++void ++cmdline_check_object_only_section (bfd *abfd, bfd_boolean lto) ++{ ++ const char *filename; ++ ++ if (link_info.emitting_gnu_object_only ++ || abfd->format != bfd_object) ++ return; ++ ++ if (lto) ++ { ++ /* For LTO link, we only need to extract object-only section ++ from the mixed object, add it to input, and put it on LTO ++ claimed output. */ ++ switch (abfd->lto_type) ++ { ++ default: ++ abort (); ++ case lto_mixed_object: ++ filename = cmdline_extract_object_only_section (abfd); ++ lang_add_input_file (filename, ++ lang_input_file_is_file_enum, NULL); ++ break; ++ case lto_non_ir_object: ++ case lto_ir_object: ++ break; ++ } ++ } ++ else if (bfd_link_relocatable (&link_info)) ++ { ++ /* For non-LTO relocatable link, we need to append non-IR object ++ file and the object file in object-only section to the object ++ only list. */ ++ switch (abfd->lto_type) ++ { ++ default: ++ abort (); ++ case lto_mixed_object: ++ filename = cmdline_extract_object_only_section (abfd); ++ cmdline_object_only_list_append (cmdline_is_file_enum, ++ (void *) filename); ++ break; ++ case lto_non_ir_object: ++ cmdline_object_only_list_append (cmdline_is_bfd_enum, abfd); ++ break; ++ case lto_ir_object: ++ break; ++ } ++ } ++} ++ ++/* Remove temporary object-only files. */ ++ ++void ++cmdline_remove_object_only_files (void) ++{ ++ cmdline_union_type *c; ++ ++#ifdef ENABLE_PLUGINS ++ if (plugin_save_temps) ++ return; ++#endif ++ ++ c = cmdline_temp_object_only_list.head; ++ for (; c != NULL; c = c->header.next) ++ switch (c->header.type) ++ { ++ default: ++ abort (); ++ case cmdline_is_file_enum: ++ unlink (c->file.filename); ++ break; ++ } ++} +diff -rup binutils-2.26.orig/ld/ldlang.h binutils-2.26/ld/ldlang.h +--- binutils-2.26.orig/ld/ldlang.h 2016-02-19 09:35:36.701003291 +0000 ++++ binutils-2.26/ld/ldlang.h 2016-02-19 09:35:54.921106611 +0000 +@@ -517,7 +517,7 @@ extern struct asneeded_minfo **asneeded_ + extern void (*output_bfd_hash_table_free_fn) (struct bfd_link_hash_table *); + + extern void lang_init +- (void); ++ (bfd_boolean); + extern void lang_finish + (void); + extern lang_memory_region_type * lang_memory_region_lookup +@@ -693,7 +693,48 @@ lang_ld_feature (char *); + extern void + lang_print_memory_usage (void); + + extern void + lang_add_gc_name (const char *); + ++typedef enum ++{ ++ cmdline_is_file_enum, ++ cmdline_is_bfd_enum ++} cmdline_enum_type; ++ ++typedef struct cmdline_header_struct ++{ ++ union cmdline_union *next; ++ cmdline_enum_type type; ++} cmdline_header_type; ++ ++typedef struct cmdline_file_struct ++{ ++ cmdline_header_type header; ++ const char *filename; ++} cmdline_file_type; ++ ++typedef struct cmdline_bfd_struct ++{ ++ cmdline_header_type header; ++ bfd *abfd; ++} cmdline_bfd_type; ++ ++typedef union cmdline_union ++{ ++ cmdline_header_type header; ++ cmdline_file_type file; ++ cmdline_bfd_type abfd; ++} cmdline_union_type; ++ ++typedef struct cmdline_list ++{ ++ cmdline_union_type *head; ++ cmdline_union_type **tail; ++} cmdline_list_type; ++ ++extern void cmdline_emit_object_only_section (void); ++extern void cmdline_check_object_only_section (bfd *, bfd_boolean); ++extern void cmdline_remove_object_only_files (void); ++ + #endif +diff -rup binutils-2.26.orig/ld/ldlex.h binutils-2.26/ld/ldlex.h +--- binutils-2.26.orig/ld/ldlex.h 2016-02-19 09:35:36.701003291 +0000 ++++ binutils-2.26/ld/ldlex.h 2016-02-19 09:35:54.921106611 +0000 +@@ -134,6 +134,7 @@ enum option_values + #ifdef ENABLE_PLUGINS + OPTION_PLUGIN, + OPTION_PLUGIN_OPT, ++ OPTION_PLUGIN_SAVE_TEMPS, + #endif /* ENABLE_PLUGINS */ + OPTION_DEFAULT_SCRIPT, + OPTION_PRINT_OUTPUT_FORMAT, +diff -rup binutils-2.26.orig/ld/ldmain.c binutils-2.26/ld/ldmain.c +--- binutils-2.26.orig/ld/ldmain.c 2016-02-19 09:35:36.701003291 +0000 ++++ binutils-2.26/ld/ldmain.c 2016-02-19 09:35:54.922106617 +0000 +@@ -219,6 +219,9 @@ main (int argc, char **argv) + + xatexit (ld_cleanup); + ++ /* Remove temporary object-only files. */ ++ xatexit (cmdline_remove_object_only_files); ++ + /* Set up the sysroot directory. */ + ld_sysroot = get_sysroot (argc, argv); + if (*ld_sysroot) +@@ -291,8 +294,8 @@ main (int argc, char **argv) + default_target = ldemul_choose_target (argc, argv); + config.maxpagesize = bfd_emul_get_maxpagesize (default_target); + config.commonpagesize = bfd_emul_get_commonpagesize (default_target); +- lang_init (); +- ldexp_init (); ++ lang_init (FALSE); ++ ldexp_init (FALSE); + ldemul_before_parse (); + lang_has_input_file = FALSE; + parse_args (argc, argv); +@@ -307,34 +310,7 @@ main (int argc, char **argv) + + ldemul_set_symbols (); + +- /* If we have not already opened and parsed a linker script, +- try the default script from command line first. */ +- if (saved_script_handle == NULL +- && command_line.default_script != NULL) +- { +- ldfile_open_command_file (command_line.default_script); +- parser_input = input_script; +- yyparse (); +- } +- +- /* If we have not already opened and parsed a linker script +- read the emulation's appropriate default script. */ +- if (saved_script_handle == NULL) +- { +- int isfile; +- char *s = ldemul_get_script (&isfile); +- +- if (isfile) +- ldfile_open_default_command_file (s); +- else +- { +- lex_string = s; +- lex_redirect (s, _("built in linker script"), 1); +- } +- parser_input = input_script; +- yyparse (); +- lex_string = NULL; +- } ++ ld_parse_linker_script (); + + if (verbose) + { +@@ -445,7 +421,7 @@ main (int argc, char **argv) + fprintf (stderr, "lookup = %p val %lx\n", h, h ? h->u.def.value : 1); + } + #endif +- ldexp_finish (); ++ ldexp_finish (FALSE); + lang_finish (); + + /* Even if we're producing relocatable output, some non-fatal errors should +@@ -465,6 +441,8 @@ main (int argc, char **argv) + if (!bfd_close (link_info.output_bfd)) + einfo (_("%F%B: final close failed: %E\n"), link_info.output_bfd); + ++ link_info.output_bfd = NULL; ++ + /* If the --force-exe-suffix is enabled, and we're making an + executable file and it doesn't end in .exe, copy it to one + which does. */ +@@ -512,6 +490,9 @@ main (int argc, char **argv) + } + } + ++ if (link_info.emit_gnu_object_only) ++ cmdline_emit_object_only_section (); ++ + END_PROGRESS (program_name); + + if (config.stats) +@@ -805,7 +786,9 @@ add_archive_element (struct bfd_link_inf + *subsbfd = input->the_bfd; + } + } ++ else + #endif /* ENABLE_PLUGINS */ ++ cmdline_check_object_only_section (input->the_bfd, FALSE); + + ldlang_add_file (input); + +@@ -1484,3 +1467,38 @@ notice (struct bfd_link_info *info, + + return TRUE; + } ++ ++/* Parse the linker script. */ ++ ++void ++ld_parse_linker_script () ++{ ++ /* If we have not already opened and parsed a linker script, ++ try the default script from command line first. */ ++ if (saved_script_handle == NULL ++ && command_line.default_script != NULL) ++ { ++ ldfile_open_command_file (command_line.default_script); ++ parser_input = input_script; ++ yyparse (); ++ } ++ ++ /* If we have not already opened and parsed a linker script ++ read the emulation's appropriate default script. */ ++ if (saved_script_handle == NULL) ++ { ++ int isfile; ++ char *s = ldemul_get_script (&isfile); ++ ++ if (isfile) ++ ldfile_open_default_command_file (s); ++ else ++ { ++ lex_string = s; ++ lex_redirect (s, _("built in linker script"), 1); ++ } ++ parser_input = input_script; ++ yyparse (); ++ lex_string = NULL; ++ } ++} +diff -rup binutils-2.26.orig/ld/ldmain.h binutils-2.26/ld/ldmain.h +--- binutils-2.26.orig/ld/ldmain.h 2016-02-19 09:35:36.701003291 +0000 ++++ binutils-2.26/ld/ldmain.h 2016-02-19 09:35:54.922106617 +0000 +@@ -59,4 +59,6 @@ extern void add_wrap (const char *); + extern void add_ignoresym (struct bfd_link_info *, const char *); + extern void add_keepsyms_file (const char *); + ++extern void ld_parse_linker_script (void); ++ + #endif +diff -rup binutils-2.26.orig/ld/lexsup.c binutils-2.26/ld/lexsup.c +--- binutils-2.26.orig/ld/lexsup.c 2016-02-19 09:35:36.700003285 +0000 ++++ binutils-2.26/ld/lexsup.c 2016-02-19 09:35:54.923106623 +0000 +@@ -169,6 +169,9 @@ static const struct ld_option ld_options + '\0', N_("PLUGIN"), N_("Load named plugin"), ONE_DASH }, + { {"plugin-opt", required_argument, NULL, OPTION_PLUGIN_OPT}, + '\0', N_("ARG"), N_("Send arg to last-loaded plugin"), ONE_DASH }, ++ { {"plugin-save-temps", no_argument, NULL, OPTION_PLUGIN_SAVE_TEMPS}, ++ '\0', NULL, N_("Store plugin intermediate files permanently"), ++ ONE_DASH }, + { {"flto", optional_argument, NULL, OPTION_IGNORE}, + '\0', NULL, N_("Ignored for GCC LTO option compatibility"), + ONE_DASH }, +@@ -1020,6 +1023,9 @@ parse_args (unsigned argc, char **argv) + if (plugin_opt_plugin_arg (optarg)) + einfo (_("%P%F: bad -plugin-opt option\n")); + break; ++ case OPTION_PLUGIN_SAVE_TEMPS: ++ plugin_save_temps = TRUE; ++ break; + #endif /* ENABLE_PLUGINS */ + case 'q': + link_info.emitrelocations = TRUE; +diff -rup binutils-2.26.orig/ld/plugin.c binutils-2.26/ld/plugin.c +--- binutils-2.26.orig/ld/plugin.c 2016-02-19 09:35:36.702003296 +0000 ++++ binutils-2.26/ld/plugin.c 2016-02-19 09:35:54.923106623 +0000 +@@ -57,6 +57,9 @@ extern int errno; + /* Report plugin symbols. */ + bfd_boolean report_plugin_symbols; + ++/* Store plugin intermediate files permanently. */ ++bfd_boolean plugin_save_temps; ++ + /* The suffix to append to the name of the real (claimed) object file + when generating a dummy BFD to hold the IR symbols sent from the + plugin. For cosmetic use only; appears in maps, crefs etc. */ +@@ -1182,6 +1185,9 @@ plugin_maybe_claim (lang_input_statement + { + bfd *abfd = entry->the_bfd->plugin_dummy_bfd; + ++ /* Check object only section. */ ++ cmdline_check_object_only_section (entry->the_bfd, TRUE); ++ + /* Discard the real file's BFD and substitute the dummy one. */ + + /* We can't call bfd_close on archives. BFD archive handling +@@ -1227,14 +1233,17 @@ plugin_call_cleanup (void) + { + if (curplug->cleanup_handler && !curplug->cleanup_done) + { +- enum ld_plugin_status rv; +- curplug->cleanup_done = TRUE; +- called_plugin = curplug; +- rv = (*curplug->cleanup_handler) (); +- called_plugin = NULL; +- if (rv != LDPS_OK) +- info_msg (_("%P: %s: error in plugin cleanup: %d (ignored)\n"), +- curplug->name, rv); ++ if (!plugin_save_temps) ++ { ++ enum ld_plugin_status rv; ++ curplug->cleanup_done = TRUE; ++ called_plugin = curplug; ++ rv = (*curplug->cleanup_handler) (); ++ called_plugin = NULL; ++ if (rv != LDPS_OK) ++ info_msg (_("%P: %s: error in plugin cleanup: %d (ignored)\n"), ++ curplug->name, rv); ++ } + dlclose (curplug->dlhandle); + } + curplug = curplug->next; +diff -rup binutils-2.26.orig/ld/plugin.h binutils-2.26/ld/plugin.h +--- binutils-2.26.orig/ld/plugin.h 2016-02-19 09:35:36.702003296 +0000 ++++ binutils-2.26/ld/plugin.h 2016-02-19 09:35:54.924106628 +0000 +@@ -24,6 +24,9 @@ + /* Report plugin symbols. */ + extern bfd_boolean report_plugin_symbols; + ++/* Store plugin intermediate files permanently. */ ++extern bfd_boolean plugin_save_temps; ++ + /* Set at all symbols read time, to avoid recursively offering the plugin + its own newly-added input files and libs to claim. */ + extern bfd_boolean no_more_claiming; +diff -rup binutils-2.26.orig/ld/scripttempl/armbpabi.sc binutils-2.26/ld/scripttempl/armbpabi.sc +--- binutils-2.26.orig/ld/scripttempl/armbpabi.sc 2016-02-19 09:35:36.704003308 +0000 ++++ binutils-2.26/ld/scripttempl/armbpabi.sc 2016-02-19 09:35:54.924106628 +0000 +@@ -36,7 +36,7 @@ INTERP=".interp 0 : { *(.interp) } + PLT=".plt ${RELOCATING-0} : { *(.plt) }" + RODATA=".rodata ${RELOCATING-0} : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }" + DATARELRO=".data.rel.ro : { *(.data.rel.ro.local) *(.data.rel.ro .data.rel.ro.*) }" +-DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) }" ++DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) *(.gnu_object_only) }" + if test -z "${NO_SMALL_DATA}"; then + SBSS=".sbss ${RELOCATING-0} : + { +diff -rup binutils-2.26.orig/ld/scripttempl/elf32sh-symbian.sc binutils-2.26/ld/scripttempl/elf32sh-symbian.sc +--- binutils-2.26.orig/ld/scripttempl/elf32sh-symbian.sc 2016-02-19 09:35:36.705003313 +0000 ++++ binutils-2.26/ld/scripttempl/elf32sh-symbian.sc 2016-02-19 09:35:54.925106634 +0000 +@@ -88,7 +88,7 @@ fi + PLT=".plt : { *(.plt) } :dynamic :dyn" + DYNAMIC=".dynamic : { *(.dynamic) } :dynamic :dyn" + RODATA=".rodata ALIGN(4) : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }" +-DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.directive) *(.gnu.lto_*) }" ++DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.directive) *(.gnu.lto_*) *(.gnu_object_only) }" + test -z "$GOT" && GOT=".got ${RELOCATING-0} : { *(.got.plt) *(.got) } :dynamic :dyn" + INIT_ARRAY=".init_array ${RELOCATING-0} : + { +diff -rup binutils-2.26.orig/ld/scripttempl/elf64hppa.sc binutils-2.26/ld/scripttempl/elf64hppa.sc +--- binutils-2.26.orig/ld/scripttempl/elf64hppa.sc 2016-02-19 09:35:36.705003313 +0000 ++++ binutils-2.26/ld/scripttempl/elf64hppa.sc 2016-02-19 09:35:54.925106634 +0000 +@@ -132,7 +132,7 @@ fi + DYNAMIC=".dynamic ${RELOCATING-0} : { *(.dynamic) }" + RODATA=".rodata ${RELOCATING-0} : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }" + DATARELRO=".data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro .data.rel.ro.* .gnu.linkonce.d.rel.ro.*) }" +-DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) }" ++DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) *(.gnu_object_only) }" + if test -z "${NO_SMALL_DATA}"; then + SBSS=".sbss ${RELOCATING-0} : + { +diff -rup binutils-2.26.orig/ld/scripttempl/elf.sc binutils-2.26/ld/scripttempl/elf.sc +--- binutils-2.26.orig/ld/scripttempl/elf.sc 2016-02-19 09:35:36.705003313 +0000 ++++ binutils-2.26/ld/scripttempl/elf.sc 2016-02-19 09:35:54.924106628 +0000 +@@ -170,7 +170,7 @@ RELA_IPLT=".rela.iplt ${RELOCATING-0} + DYNAMIC=".dynamic ${RELOCATING-0} : { *(.dynamic) }" + RODATA=".${RODATA_NAME} ${RELOCATING-0} : { *(.${RODATA_NAME}${RELOCATING+ .${RODATA_NAME}.* .gnu.linkonce.r.*}) }" + DATARELRO=".data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro .data.rel.ro.* .gnu.linkonce.d.rel.ro.*) }" +-DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) }" ++DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) *(.gnu_object_only) }" + if test -z "${NO_SMALL_DATA}"; then + SBSS=".${SBSS_NAME} ${RELOCATING-0} : + { +diff -rup binutils-2.26.orig/ld/scripttempl/elfxtensa.sc binutils-2.26/ld/scripttempl/elfxtensa.sc +--- binutils-2.26.orig/ld/scripttempl/elfxtensa.sc 2016-02-19 09:35:36.705003313 +0000 ++++ binutils-2.26/ld/scripttempl/elfxtensa.sc 2016-02-19 09:35:54.925106634 +0000 +@@ -145,7 +145,7 @@ fi + DYNAMIC=".dynamic ${RELOCATING-0} : { *(.dynamic) }" + RODATA=".rodata ${RELOCATING-0} : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }" + DATARELRO=".data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro .data.rel.ro.* .gnu.linkonce.d.rel.ro.*) }" +-DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) }" ++DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) *(.gnu_object_only) }" + INIT_LIT=".init.literal 0 : { *(.init.literal) }" + INIT=".init 0 : { *(.init) }" + FINI_LIT=".fini.literal 0 : { *(.fini.literal) }" +diff -rup binutils-2.26.orig/ld/scripttempl/mep.sc binutils-2.26/ld/scripttempl/mep.sc +--- binutils-2.26.orig/ld/scripttempl/mep.sc 2016-02-19 09:35:36.706003319 +0000 ++++ binutils-2.26/ld/scripttempl/mep.sc 2016-02-19 09:35:54.926106640 +0000 +@@ -119,7 +119,7 @@ fi + DYNAMIC=".dynamic ${RELOCATING-0} : { *(.dynamic) }" + RODATA=".rodata ${RELOCATING-0} : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }" + DATARELRO=".data.rel.ro : { *(.data.rel.ro.local) *(.data.rel.ro .data.rel.ro.*) }" +-DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) }" ++DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) *(.gnu_object_only) }" + if test -z "${NO_SMALL_DATA}"; then + SBSS=".sbss ${RELOCATING-0} : + { +diff -rup binutils-2.26.orig/ld/scripttempl/pep.sc binutils-2.26/ld/scripttempl/pep.sc +--- binutils-2.26.orig/ld/scripttempl/pep.sc 2016-02-19 09:35:36.706003319 +0000 ++++ binutils-2.26/ld/scripttempl/pep.sc 2016-02-19 09:35:54.926106640 +0000 +@@ -178,6 +178,7 @@ SECTIONS + *(.drectve) + ${RELOCATING+ *(.note.GNU-stack)} + ${RELOCATING+ *(.gnu.lto_*)} ++ ${RELOCATING+ *(.gnu_object_only)} + } + + .idata ${RELOCATING+BLOCK(__section_alignment__)} : +diff -rup binutils-2.26.orig/ld/scripttempl/pe.sc binutils-2.26/ld/scripttempl/pe.sc +--- binutils-2.26.orig/ld/scripttempl/pe.sc 2016-02-19 09:35:36.706003319 +0000 ++++ binutils-2.26/ld/scripttempl/pe.sc 2016-02-19 09:35:54.926106640 +0000 +@@ -165,6 +165,7 @@ SECTIONS + *(.drectve) + ${RELOCATING+ *(.note.GNU-stack)} + ${RELOCATING+ *(.gnu.lto_*)} ++ ${RELOCATING+ *(.gnu_object_only)} + } + + .idata ${RELOCATING+BLOCK(__section_alignment__)} : +--- binutils.orig/bfd/bfd-in2.h 2017-03-02 11:14:48.572979573 +0000 ++++ binutils-2.28/bfd/bfd-in2.h 2017-03-02 11:21:39.828458555 +0000 +@@ -1118,6 +1118,9 @@ bfd_boolean bfd_fill_in_gnu_debuglink_se + + char *bfd_follow_build_id_debuglink (bfd *abfd, const char *dir); + ++const char *bfd_extract_object_only_section ++ (bfd *abfd); ++ + /* Extracted from libbfd.c. */ + + /* Byte swapping macros for user section data. */ +--- binutils.orig/bfd/opncls.c 2017-03-02 11:14:48.586979385 +0000 ++++ binutils-2.28/bfd/opncls.c 2017-03-02 11:23:23.546065945 +0000 +@@ -1990,3 +1990,69 @@ bfd_follow_build_id_debuglink (bfd *abfd + get_build_id_name, + check_build_id_file, &build_id); + } ++ ++/* ++FUNCTION ++ bfd_extract_object_only_section ++ ++SYNOPSIS ++ const char *bfd_extract_object_only_section ++ (bfd *abfd); ++ ++DESCRIPTION ++ ++ Takes a @var{ABFD} and extract the .gnu_object_only section into ++ a temporary file. ++ ++RETURNS ++ The name of the temporary file is returned if all is ok. ++ Otherwise <> is returned and bfd_error is set. ++*/ ++ ++const char * ++bfd_extract_object_only_section (bfd *abfd) ++{ ++ asection *sec = abfd->object_only_section; ++ const char *name; ++ FILE *file; ++ bfd_byte *memhunk = NULL; ++ size_t off, size; ++ bfd_error_type err; ++ ++ /* Get a temporary object-only file. */ ++ name = make_temp_file (".obj-only.o"); ++ ++ /* Open the object-only file. */ ++ file = _bfd_real_fopen (name, FOPEN_WB); ++ if (!bfd_get_full_section_contents (abfd, sec, &memhunk)) ++ { ++ err = bfd_get_error (); ++ ++loser: ++ free (memhunk); ++ fclose (file); ++ unlink (name); ++ bfd_set_error (err); ++ return NULL; ++ } ++ ++ off = 0; ++ size = sec->size; ++ while (off != size) ++ { ++ size_t written, nwrite = size - off; ++ ++ written = fwrite (memhunk + off, 1, nwrite, file); ++ if (written < nwrite && ferror (file)) ++ { ++ err = bfd_error_system_call; ++ goto loser; ++ } ++ ++ off += written; ++ } ++ ++ free (memhunk); ++ fclose (file); ++ return name; ++} +--- binutils.orig/bfd/plugin.c 2017-03-02 11:37:31.572677260 +0000 ++++ binutils-2.28/bfd/plugin.c 2017-03-02 11:40:35.246209573 +0000 +@@ -132,10 +132,10 @@ register_claim_file (ld_plugin_claim_fil + } + + static asection bfd_plugin_fake_text_section +- = BFD_FAKE_SECTION (bfd_plugin_fake_text_section, 0, 0, ".text", 0); ++= BFD_FAKE_SECTION (bfd_plugin_fake_text_section, 0, ".text", 0, 0); + static asection bfd_plugin_fake_common_section +- = BFD_FAKE_SECTION (bfd_plugin_fake_common_section, SEC_IS_COMMON, 0, +- NULL, 0); ++ = BFD_FAKE_SECTION (bfd_plugin_fake_common_section, 0, ++ NULL, 0, SEC_IS_COMMON); + + /* Get symbols from object only section. */ + +--- binutils.orig/ld/emultempl/armelf.em 2017-03-02 11:58:14.632981042 +0000 ++++ binutils-2.28/ld/emultempl/armelf.em 2017-03-02 12:00:55.663819055 +0000 +@@ -414,7 +414,7 @@ gld${EMULATION_NAME}_after_allocation (v + } + + static void +-gld${EMULATION_NAME}_finish (void) ++arm_finish (void) + { + struct bfd_link_hash_entry * h; + +@@ -441,7 +441,7 @@ gld${EMULATION_NAME}_finish (void) + } + } + +- finish_default (); ++ gld${EMULATION_NAME}_finish (); + + if (params.thumb_entry_symbol) + { +@@ -790,4 +790,4 @@ LDEMUL_BEFORE_PARSE=gld"${EMULATION_NAME + LDEMUL_SET_SYMBOLS=gld"${EMULATION_NAME}"_set_symbols + + # Call the extra arm-elf function +-LDEMUL_FINISH=gld${EMULATION_NAME}_finish ++LDEMUL_FINISH=arm_finish +--- binutils.orig/ld/emultempl/ppc64elf.em 2017-03-02 11:58:14.632981042 +0000 ++++ binutils-2.28/ld/emultempl/ppc64elf.em 2017-03-02 12:01:40.961210895 +0000 +@@ -561,7 +561,7 @@ gld${EMULATION_NAME}_after_allocation (v + /* Final emulation specific call. */ + + static void +-gld${EMULATION_NAME}_finish (void) ++ppc_finish (void) + { + char *msg = NULL; + char *line, *endline; +@@ -592,7 +592,7 @@ gld${EMULATION_NAME}_finish (void) + if (msg != NULL) + free (msg); + +- finish_default (); ++ gld${EMULATION_NAME}_finish (); + } + + +@@ -926,4 +926,4 @@ LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS= + LDEMUL_AFTER_OPEN=ppc_after_open + LDEMUL_BEFORE_ALLOCATION=ppc_before_allocation + LDEMUL_AFTER_ALLOCATION=gld${EMULATION_NAME}_after_allocation +-LDEMUL_FINISH=gld${EMULATION_NAME}_finish ++LDEMUL_FINISH=ppc_finish +--- binutils.orig/bfd/format.c 2018-01-22 16:04:36.855155517 +0000 ++++ binutils-2.30.0/bfd/format.c 2018-01-22 16:11:36.546253154 +0000 +@@ -47,6 +47,7 @@ SUBSECTION + #include "bfd.h" + #include "libbfd.h" + #if BFD_SUPPORTS_PLUGINS ++#include "plugin-api.h" + #include "plugin.h" + #endif + +--- binutils.orig/ld/ldlang.c 2018-01-22 16:04:37.271150658 +0000 ++++ binutils-2.30.0/ld/ldlang.c 2018-01-22 16:14:10.653453040 +0000 +@@ -8954,6 +8954,7 @@ cmdline_object_only_list_append (cmdline + archive = abfd->my_archive; + if (archive) + break; ++ /* Fall through. */ + case cmdline_is_file_enum: + cmdline_list_append (&cmdline_object_only_file_list, type, data); + return; diff --git a/SOURCES/binutils-2.27-aarch64-ifunc.patch b/SOURCES/binutils-2.27-aarch64-ifunc.patch new file mode 100644 index 0000000..562ef18 --- /dev/null +++ b/SOURCES/binutils-2.27-aarch64-ifunc.patch @@ -0,0 +1,11 @@ +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/SOURCES/binutils-2.28-ignore-gold-duplicates.patch b/SOURCES/binutils-2.28-ignore-gold-duplicates.patch new file mode 100644 index 0000000..346f956 --- /dev/null +++ b/SOURCES/binutils-2.28-ignore-gold-duplicates.patch @@ -0,0 +1,14 @@ +diff -rup binutils.orig/ld/ldmain.c binutils-2.28/ld/ldmain.c +--- binutils.orig/ld/ldmain.c 2017-06-09 09:08:26.954016429 +0100 ++++ binutils-2.28/ld/ldmain.c 2017-06-09 09:09:11.307490976 +0100 +@@ -923,6 +923,10 @@ multiple_definition (struct bfd_link_inf + obfd = h->u.def.section->owner; + break; + case bfd_link_hash_indirect: ++ /* PR 21074: The GOLD linker can produce multiple indirect ++ refences to the same symbol. These can be ignored. */ ++ if (bfd_is_ind_section (nsec)) ++ return; + osec = bfd_ind_section_ptr; + oval = 0; + obfd = NULL; diff --git a/SOURCES/binutils-2.29-filename-in-error-messages.patch b/SOURCES/binutils-2.29-filename-in-error-messages.patch new file mode 100644 index 0000000..d8ce241 --- /dev/null +++ b/SOURCES/binutils-2.29-filename-in-error-messages.patch @@ -0,0 +1,124 @@ +--- 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) + Filedata * filedata = NULL; + struct stat statbuf; + char armag[SARMAG]; +- bfd_boolean ret = TRUE; ++ bfd_boolean ret = FALSE; ++ char * name; ++ char * saved_program_name; ++ ++ /* Overload program_name to include file_name. Doing this means ++ that warning/error messages will positively identify the file ++ concerned even when multiple instances of readelf are running. */ ++ name = xmalloc (strlen (program_name) + strlen (file_name) + 3); ++ sprintf (name, "%s: %s", program_name, file_name); ++ saved_program_name = program_name; ++ program_name = name; + + if (stat (file_name, &statbuf) < 0) + { + if (errno == ENOENT) +- error (_("'%s': No such file\n"), file_name); ++ error (_("No such file\n")); + else +- error (_("Could not locate '%s'. System error message: %s\n"), +- file_name, strerror (errno)); +- return FALSE; ++ error (_("Could not locate file. System error message: %s\n"), ++ strerror (errno)); ++ goto done; + } + + if (! S_ISREG (statbuf.st_mode)) + { +- error (_("'%s' is not an ordinary file\n"), file_name); +- return FALSE; ++ error (_("Not an ordinary file\n")); ++ goto done; + } + + filedata = calloc (1, sizeof * filedata); + if (filedata == NULL) + { + error (_("Out of memory allocating file data structure\n")); +- return FALSE; ++ goto done; + } + + filedata->file_name = file_name; + filedata->handle = fopen (file_name, "rb"); + if (filedata->handle == NULL) + { +- error (_("Input file '%s' is not readable.\n"), file_name); +- free (filedata); +- return FALSE; ++ error (_("Not readable\n")); ++ goto done; + } + + if (fread (armag, SARMAG, 1, filedata->handle) != 1) + { +- error (_("%s: Failed to read file's magic number\n"), file_name); +- fclose (filedata->handle); +- free (filedata); +- return FALSE; +- } +- +- filedata->file_size = (bfd_size_type) statbuf.st_size; +- +- if (memcmp (armag, ARMAG, SARMAG) == 0) +- { +- if (! process_archive (filedata, FALSE)) +- ret = FALSE; +- } +- else if (memcmp (armag, ARMAGT, SARMAG) == 0) +- { +- if ( ! process_archive (filedata, TRUE)) +- ret = FALSE; ++ error (_("Failed to read file's magic number\n")); + } + else + { +- if (do_archive_index) +- error (_("File %s is not an archive so its index cannot be displayed.\n"), +- file_name); ++ filedata->file_size = (bfd_size_type) statbuf.st_size; + +- rewind (filedata->handle); +- archive_file_size = archive_file_offset = 0; +- +- if (! process_object (filedata)) +- ret = FALSE; ++ if (memcmp (armag, ARMAG, SARMAG) == 0) ++ { ++ if (process_archive (filedata, FALSE)) ++ ret = TRUE; ++ } ++ else if (memcmp (armag, ARMAGT, SARMAG) == 0) ++ { ++ if (process_archive (filedata, TRUE)) ++ ret = TRUE; ++ } ++ else ++ { ++ if (do_archive_index) ++ error (_("Not an archive so its index cannot be displayed.\n")); ++ ++ rewind (filedata->handle); ++ archive_file_size = archive_file_offset = 0; ++ ++ if (process_object (filedata)) ++ ret = TRUE; ++ } + } + + fclose (filedata->handle); ++ done: + free (filedata); ++ free (program_name); ++ program_name = saved_program_name; + + return ret; + } diff --git a/SOURCES/binutils-2.30-allow_R_AARCH64-symbols.patch b/SOURCES/binutils-2.30-allow_R_AARCH64-symbols.patch new file mode 100644 index 0000000..213b267 --- /dev/null +++ b/SOURCES/binutils-2.30-allow_R_AARCH64-symbols.patch @@ -0,0 +1,147 @@ +From 279b2f94168ee91e02ccd070d27c983fc001fe12 Mon Sep 17 00:00:00 2001 +From: Renlin Li +Date: Sat, 3 Feb 2018 13:18:17 +0000 +Subject: [PATCH] [PR22764][LD][AARCH64]Allow R_AARCH64_ABS16 and + R_AARCH64_ABS32 against absolution symbol or undefine symbol in shared + object. + +The assumption that R_AARCH64_ABS16 and R_AARCH64_ABS32 relocation in LP64 abi +will be used to generate an address does not hold for absolute symbol. +In this case, it is a value fixed at static linking time. + +The condition to check the relocations is relax to allow absolute symbol and +undefined symbol case. + +bfd/ + +2018-02-05 Renlin Li + + PR ld/22764 + * elfnn-aarch64.c (elfNN_aarch64_check_relocs): Relax the + R_AARCH64_ABS32 and R_AARCH64_ABS16 for absolute symbol. Apply the + check for writeable section as well. + +ld/ + +2018-02-05 Renlin Li + + PR ld/22764 + * testsuite/ld-aarch64/emit-relocs-258.s: Define symbol as an address. + * testsuite/ld-aarch64/emit-relocs-259.s: Likewise. + * testsuite/ld-aarch64/aarch64-elf.exp: Run new test. + * testsuite/ld-aarch64/pr22764.s: New. + * testsuite/ld-aarch64/pr22764.d: New. +--- + bfd/ChangeLog | 7 +++++++ + bfd/elfnn-aarch64.c | 15 ++++++++++++--- + ld/ChangeLog | 8 ++++++++ + ld/testsuite/ld-aarch64/aarch64-elf.exp | 1 + + ld/testsuite/ld-aarch64/emit-relocs-258.s | 3 ++- + ld/testsuite/ld-aarch64/emit-relocs-259.s | 3 ++- + ld/testsuite/ld-aarch64/pr22764.d | 18 ++++++++++++++++++ + ld/testsuite/ld-aarch64/pr22764.s | 6 ++++++ + 8 files changed, 56 insertions(+), 5 deletions(-) + create mode 100644 ld/testsuite/ld-aarch64/pr22764.d + create mode 100644 ld/testsuite/ld-aarch64/pr22764.s + +diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c +index af448f9..2737773 100644 +--- a/bfd/elfnn-aarch64.c ++++ b/bfd/elfnn-aarch64.c +@@ -7189,10 +7189,19 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info, + #if ARCH_SIZE == 64 + case BFD_RELOC_AARCH64_32: + #endif +- if (bfd_link_pic (info) +- && (sec->flags & SEC_ALLOC) != 0 +- && (sec->flags & SEC_READONLY) != 0) ++ if (bfd_link_pic (info) && (sec->flags & SEC_ALLOC) != 0) + { ++ if (h != NULL ++ /* This is an absolute symbol. It represents a value instead ++ of an address. */ ++ && ((h->root.type == bfd_link_hash_defined ++ && bfd_is_abs_section (h->root.u.def.section)) ++ /* This is an undefined symbol. */ ++ || h->root.type == bfd_link_hash_undefined)) ++ break; ++ ++ /* For local symbols, defined global symbols in a non-ABS section, ++ it is assumed that the value is an address. */ + int howto_index = bfd_r_type - BFD_RELOC_AARCH64_RELOC_START; + _bfd_error_handler + /* xgettext:c-format */ +diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp +index 2602a43..c67ffb1 100644 +--- a/ld/testsuite/ld-aarch64/aarch64-elf.exp ++++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp +@@ -285,6 +285,7 @@ run_dump_test "pr17415" + run_dump_test_lp64 "tprel_g2_overflow" + run_dump_test "tprel_add_lo12_overflow" + run_dump_test "protected-data" ++run_dump_test_lp64 "pr22764" + + # ifunc tests + run_dump_test "ifunc-1" +diff --git a/ld/testsuite/ld-aarch64/emit-relocs-258.s b/ld/testsuite/ld-aarch64/emit-relocs-258.s +index f724776..87bb657 100644 +--- a/ld/testsuite/ld-aarch64/emit-relocs-258.s ++++ b/ld/testsuite/ld-aarch64/emit-relocs-258.s +@@ -1,5 +1,6 @@ ++.global dummy + .text +- ++dummy: + ldr x0, .L1 + + .L1: +diff --git a/ld/testsuite/ld-aarch64/emit-relocs-259.s b/ld/testsuite/ld-aarch64/emit-relocs-259.s +index 7e1ba3c..0977c9d 100644 +--- a/ld/testsuite/ld-aarch64/emit-relocs-259.s ++++ b/ld/testsuite/ld-aarch64/emit-relocs-259.s +@@ -1,5 +1,6 @@ ++.global dummy + .text +- ++dummy: + ldr x0, .L1 + + .L1: +diff --git a/ld/testsuite/ld-aarch64/pr22764.d b/ld/testsuite/ld-aarch64/pr22764.d +new file mode 100644 +index 0000000..997519f +--- /dev/null ++++ b/ld/testsuite/ld-aarch64/pr22764.d +@@ -0,0 +1,18 @@ ++#source: pr22764.s ++#ld: -shared -T relocs.ld -defsym sym_abs1=0x1 -defsym sym_abs2=0x2 -defsym sym_abs3=0x3 -e0 --emit-relocs ++#notarget: aarch64_be-*-* ++#objdump: -dr ++#... ++ ++Disassembly of section \.text: ++ ++0000000000010000 \<\.text\>: ++ 10000: d503201f nop ++ ... ++ 10004: R_AARCH64_ABS64 sym_abs1 ++ 1000c: 00000002 \.word 0x00000002 ++ 1000c: R_AARCH64_ABS32 sym_abs2 ++ 10010: 0003 \.short 0x0003 ++ 10010: R_AARCH64_ABS16 sym_abs3 ++ 10012: 0000 \.short 0x0000 ++ 10014: d503201f nop +diff --git a/ld/testsuite/ld-aarch64/pr22764.s b/ld/testsuite/ld-aarch64/pr22764.s +new file mode 100644 +index 0000000..25e36b4 +--- /dev/null ++++ b/ld/testsuite/ld-aarch64/pr22764.s +@@ -0,0 +1,6 @@ ++ .text ++ nop ++ .xword sym_abs1 ++ .word sym_abs2 ++ .short sym_abs3 ++ nop +-- +2.9.3 diff --git a/SOURCES/binutils-AArch64-gold.patch b/SOURCES/binutils-AArch64-gold.patch new file mode 100644 index 0000000..2841091 --- /dev/null +++ b/SOURCES/binutils-AArch64-gold.patch @@ -0,0 +1,373 @@ +diff -pruN binutils-2.30.orig/gold/aarch64.cc binutils-2.30/gold/aarch64.cc +--- binutils-2.30.orig/gold/aarch64.cc 2019-03-28 06:50:31.813828734 -0400 ++++ binutils-2.30/gold/aarch64.cc 2019-03-28 06:50:46.993954670 -0400 +@@ -6478,6 +6478,17 @@ Target_aarch64::Scan:: + gold_error(_("%s: unsupported reloc %u in pos independent link."), + object->name().c_str(), r_type); + } ++ // Make a PLT entry if necessary. ++ if (gsym->needs_plt_entry()) ++ { ++ target->make_plt_entry(symtab, layout, gsym); ++ // Since this is not a PC-relative relocation, we may be ++ // taking the address of a function. In that case we need to ++ // set the entry in the dynamic symbol table to the address of ++ // the PLT entry. ++ if (gsym->is_from_dynobj() && !parameters->options().shared()) ++ gsym->set_needs_dynsym_value(); ++ } + break; + + case elfcpp::R_AARCH64_LD_PREL_LO19: // 273 +diff -pruN binutils-2.30.orig/gold/ChangeLog binutils-2.30/gold/ChangeLog +--- binutils-2.30.orig/gold/ChangeLog 2018-01-27 10:08:21.000000000 -0500 ++++ binutils-2.30/gold/ChangeLog 2019-03-28 06:52:51.924999245 -0400 +@@ -1,3 +1,14 @@ ++2019-02-19 Egeyar Bagcioglu ++ ++ PR gold/23870 ++ * aarch64.cc (Target_aarch64::Scan::global): Check if a symbol with ++ R_AARCH64_MOVW_.ABS_* relocations requires a PLT entry. ++ * testsuite/Makefile.am: Add aarch64_pr23870 test case. ++ * testsuite/Makefile.in: Regenerate. ++ * testsuite/aarch64_pr23870_bar.c: New file. ++ * testsuite/aarch64_pr23870_foo.c: New file. ++ * testsuite/aarch64_pr23870_main.S: New file. ++ + 2018-01-27 Nick Clifton + + This is the 2.30 release: +diff -pruN binutils-2.30.orig/gold/testsuite/aarch64_pr23870_bar.c binutils-2.30/gold/testsuite/aarch64_pr23870_bar.c +--- binutils-2.30.orig/gold/testsuite/aarch64_pr23870_bar.c 1969-12-31 19:00:00.000000000 -0500 ++++ binutils-2.30/gold/testsuite/aarch64_pr23870_bar.c 2019-03-28 06:50:46.993954670 -0400 +@@ -0,0 +1,6 @@ ++void bar (void); ++ ++void bar () ++{ ++ return; ++} +diff -pruN binutils-2.30.orig/gold/testsuite/aarch64_pr23870_foo.c binutils-2.30/gold/testsuite/aarch64_pr23870_foo.c +--- binutils-2.30.orig/gold/testsuite/aarch64_pr23870_foo.c 1969-12-31 19:00:00.000000000 -0500 ++++ binutils-2.30/gold/testsuite/aarch64_pr23870_foo.c 2019-03-28 06:50:46.993954670 -0400 +@@ -0,0 +1,6 @@ ++void foo (void (*bar)(void)); ++ ++void foo (void (*bar)(void)) ++{ ++ bar(); ++} +diff -pruN binutils-2.30.orig/gold/testsuite/aarch64_pr23870_main.S binutils-2.30/gold/testsuite/aarch64_pr23870_main.S +--- binutils-2.30.orig/gold/testsuite/aarch64_pr23870_main.S 1969-12-31 19:00:00.000000000 -0500 ++++ binutils-2.30/gold/testsuite/aarch64_pr23870_main.S 2019-03-28 06:50:46.993954670 -0400 +@@ -0,0 +1,15 @@ ++ ++ .text ++ .globl main ++ .type main,#function ++main: ++ stp x29, x30, [sp,#-16]! ++ mov x29, sp ++ movz x0, #:abs_g3:bar ++ movk x0, #:abs_g2_nc:bar ++ movk x0, #:abs_g1_nc:bar ++ movk x0, #:abs_g0_nc:bar ++ add x0, x0, #0x0 ++ bl foo ++ ldp x29, x30, [sp],#16 ++ ret +diff -pruN binutils-2.30.orig/gold/testsuite/Makefile.am binutils-2.30/gold/testsuite/Makefile.am +--- binutils-2.30.orig/gold/testsuite/Makefile.am 2019-03-28 06:50:31.563826660 -0400 ++++ binutils-2.30/gold/testsuite/Makefile.am 2019-03-28 06:50:46.993954670 -0400 +@@ -3144,6 +3144,26 @@ pr22266: pr22266_main.o pr22266_ar.o gcc + pr22266_ar.o: pr22266_a.o gcctestdir/ld + gcctestdir/ld -r -T $(srcdir)/pr22266_script.t -o $@ pr22266_a.o + ++if DEFAULT_TARGET_AARCH64 ++ ++check_PROGRAMS += aarch64_pr23870 ++aarch64_pr23870_SOURCES = aarch64_pr23870_foo.c ++aarch64_pr23870_DEPENDENCIES = \ ++ gcctestdir/ld gcctestdir/as aarch64_pr23870_main.o \ ++ aarch64_pr23870_foo.o aarch64_pr23870_bar.so ++aarch64_pr23870_LDFLAGS = -Wl,-R,. -L. -Wl,-l:aarch64_pr23870_bar.so ++aarch64_pr23870_LDADD = aarch64_pr23870_main.o ++aarch64_pr23870_main.o: aarch64_pr23870_main.S ++ $(COMPILE) -c -o $@ $< ++aarch64_pr23870_foo.o: aarch64_pr23870_foo.c ++ $(COMPILE) -c -o $@ $< ++aarch64_pr23870_bar.o: aarch64_pr23870_bar.c ++ $(COMPILE) -c -fPIC -o $@ $< ++aarch64_pr23870_bar.so: aarch64_pr23870_bar.o ++ $(COMPILE) -shared -o $@ $< ++ ++endif DEFAULT_TARGET_AARCH64 ++ + endif GCC + endif NATIVE_LINKER + +diff -pruN binutils-2.30.orig/gold/testsuite/Makefile.in binutils-2.30/gold/testsuite/Makefile.in +--- binutils-2.30.orig/gold/testsuite/Makefile.in 2019-03-28 06:50:31.573826743 -0400 ++++ binutils-2.30/gold/testsuite/Makefile.in 2019-03-28 06:59:26.518313455 -0400 +@@ -70,7 +70,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E + $(am__EXEEXT_31) $(am__EXEEXT_32) $(am__EXEEXT_33) \ + $(am__EXEEXT_34) $(am__EXEEXT_35) $(am__EXEEXT_36) \ + $(am__EXEEXT_37) $(am__EXEEXT_38) $(am__EXEEXT_39) \ +- $(am__EXEEXT_40) $(am__EXEEXT_41) ++ $(am__EXEEXT_40) $(am__EXEEXT_41) $(am__EXEEXT_42) + @NATIVE_OR_CROSS_LINKER_TRUE@am__append_1 = object_unittest \ + @NATIVE_OR_CROSS_LINKER_TRUE@ binary_unittest leb128_unittest \ + @NATIVE_OR_CROSS_LINKER_TRUE@ overflow_unittest +@@ -817,27 +817,28 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E + @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_84 = gnu_property_test.sh + @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_85 = gnu_property_test.stdout + @GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_86 = pr22266 ++@DEFAULT_TARGET_AARCH64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_87 = aarch64_pr23870 + + # These tests work with native and cross linkers. + + # Test script section order. +-@NATIVE_OR_CROSS_LINKER_TRUE@am__append_87 = script_test_10.sh +-@NATIVE_OR_CROSS_LINKER_TRUE@am__append_88 = script_test_10.stdout +-@NATIVE_OR_CROSS_LINKER_TRUE@am__append_89 = script_test_10 ++@NATIVE_OR_CROSS_LINKER_TRUE@am__append_88 = script_test_10.sh ++@NATIVE_OR_CROSS_LINKER_TRUE@am__append_89 = script_test_10.stdout ++@NATIVE_OR_CROSS_LINKER_TRUE@am__append_90 = script_test_10 + + # These tests work with cross linkers only. +-@DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_90 = split_i386.sh +-@DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_91 = split_i386_1.stdout split_i386_2.stdout \ ++@DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_91 = split_i386.sh ++@DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_92 = split_i386_1.stdout split_i386_2.stdout \ + @DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_i386_3.stdout split_i386_4.stdout split_i386_r.stdout + +-@DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_92 = split_i386_1 split_i386_2 split_i386_3 \ ++@DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_93 = split_i386_1 split_i386_2 split_i386_3 \ + @DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_i386_4 split_i386_r + +-@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_93 = split_x86_64.sh \ ++@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_94 = split_x86_64.sh \ + @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ bnd_plt_1.sh \ + @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ bnd_ifunc_1.sh \ + @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ bnd_ifunc_2.sh +-@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_94 = split_x86_64_1.stdout \ ++@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_95 = split_x86_64_1.stdout \ + @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_x86_64_2.stdout \ + @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_x86_64_3.stdout \ + @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_x86_64_4.stdout \ +@@ -845,14 +846,14 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E + @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ bnd_plt_1.stdout \ + @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ bnd_ifunc_1.stdout \ + @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ bnd_ifunc_2.stdout +-@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_95 = split_x86_64_1 split_x86_64_2 split_x86_64_3 \ ++@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_96 = split_x86_64_1 split_x86_64_2 split_x86_64_3 \ + @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_x86_64_4 split_x86_64_r + +-@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_96 = split_x32.sh +-@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_97 = split_x32_1.stdout split_x32_2.stdout \ ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_97 = split_x32.sh ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_98 = split_x32_1.stdout split_x32_2.stdout \ + @DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_x32_3.stdout split_x32_4.stdout split_x32_r.stdout + +-@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_98 = split_x32_1 split_x32_2 split_x32_3 \ ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_99 = split_x32_1 split_x32_2 split_x32_3 \ + @DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_x32_4 split_x32_r + + +@@ -873,7 +874,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E + # Check Thumb to ARM farcall veneers + + # Check handling of --target1-abs, --target1-rel and --target2 options +-@DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_99 = arm_abs_global.sh \ ++@DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_100 = arm_abs_global.sh \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_branch_in_range.sh \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_branch_out_of_range.sh \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_fix_v4bx.sh \ +@@ -896,7 +897,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_target2_got_rel.sh + + # The test demonstrates why the constructor of a target object should not access options. +-@DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_100 = arm_abs_global.stdout \ ++@DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_101 = arm_abs_global.stdout \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_bl_in_range.stdout \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_bl_out_of_range.stdout \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ thumb_bl_in_range.stdout \ +@@ -949,7 +950,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_target2_abs.stdout \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_target2_got_rel.stdout \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_target_lazy_init +-@DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_101 = arm_abs_global \ ++@DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_102 = arm_abs_global \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_bl_in_range \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_bl_out_of_range \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ thumb_bl_in_range \ +@@ -1000,20 +1001,20 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_target2_abs \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_target2_got_rel \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_target_lazy_init +-@DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_102 = aarch64_reloc_none.sh \ ++@DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_103 = aarch64_reloc_none.sh \ + @DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ aarch64_relocs.sh \ + @DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ pr21430.sh \ + @DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ aarch64_tlsdesc.sh +-@DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_103 = aarch64_reloc_none.stdout \ ++@DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_104 = aarch64_reloc_none.stdout \ + @DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ aarch64_relocs.stdout \ + @DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ pr21430.stdout \ + @DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ aarch64_tlsdesc.stdout +-@DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_104 = aarch64_reloc_none \ ++@DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_105 = aarch64_reloc_none \ + @DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ aarch64_relocs \ + @DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ pr21430 \ + @DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ aarch64_tlsdesc +-@DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_105 = split_s390.sh +-@DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_106 = split_s390_z1.stdout split_s390_z2.stdout split_s390_z3.stdout \ ++@DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_106 = split_s390.sh ++@DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_107 = split_s390_z1.stdout split_s390_z2.stdout split_s390_z3.stdout \ + @DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_s390_z4.stdout split_s390_n1.stdout split_s390_n2.stdout \ + @DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_s390_a1.stdout split_s390_a2.stdout split_s390_z1_ns.stdout \ + @DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_s390_z2_ns.stdout split_s390_z3_ns.stdout split_s390_z4_ns.stdout \ +@@ -1025,7 +1026,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E + @DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_s390x_z4_ns.stdout split_s390x_n1_ns.stdout \ + @DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_s390x_n2_ns.stdout split_s390x_r.stdout + +-@DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_107 = split_s390_z1 split_s390_z2 split_s390_z3 \ ++@DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_108 = split_s390_z1 split_s390_z2 split_s390_z3 \ + @DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_s390_z4 split_s390_n1 split_s390_n2 split_s390_a1 \ + @DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_s390_a2 split_s390_z1_ns split_s390_z2_ns split_s390_z3_ns \ + @DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_s390_z4_ns split_s390_n1_ns split_s390_n2_ns split_s390_r \ +@@ -1034,10 +1035,10 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E + @DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_s390x_z1_ns split_s390x_z2_ns split_s390x_z3_ns \ + @DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_s390x_z4_ns split_s390x_n1_ns split_s390x_n2_ns split_s390x_r + +-@DEFAULT_TARGET_X86_64_TRUE@am__append_108 = *.dwo *.dwp +-@DEFAULT_TARGET_X86_64_TRUE@am__append_109 = dwp_test_1.sh \ ++@DEFAULT_TARGET_X86_64_TRUE@am__append_109 = *.dwo *.dwp ++@DEFAULT_TARGET_X86_64_TRUE@am__append_110 = dwp_test_1.sh \ + @DEFAULT_TARGET_X86_64_TRUE@ dwp_test_2.sh +-@DEFAULT_TARGET_X86_64_TRUE@am__append_110 = dwp_test_1.stdout \ ++@DEFAULT_TARGET_X86_64_TRUE@am__append_111 = dwp_test_1.stdout \ + @DEFAULT_TARGET_X86_64_TRUE@ dwp_test_2.stdout + subdir = testsuite + DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +@@ -1243,6 +1244,11 @@ libgoldtest_a_OBJECTS = $(am_libgoldtest + @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__EXEEXT_40 = \ + @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ exception_x86_64_bnd_test$(EXEEXT) + @GCC_TRUE@@NATIVE_LINKER_TRUE@am__EXEEXT_41 = pr22266$(EXEEXT) ++@DEFAULT_TARGET_AARCH64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__EXEEXT_42 = aarch64_pr23870$(EXEEXT) ++@DEFAULT_TARGET_AARCH64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am_aarch64_pr23870_OBJECTS = aarch64_pr23870_foo.$(OBJEXT) ++aarch64_pr23870_OBJECTS = $(am_aarch64_pr23870_OBJECTS) ++aarch64_pr23870_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(aarch64_pr23870_LDFLAGS) $(LDFLAGS) -o $@ + basic_pic_test_SOURCES = basic_pic_test.c + basic_pic_test_OBJECTS = basic_pic_test.$(OBJEXT) + basic_pic_test_LDADD = $(LDADD) +@@ -2392,7 +2398,7 @@ am__depfiles_maybe = depfiles + am__mv = mv -f + CCLD = $(CC) + CXXLD = $(CXX) +-SOURCES = $(libgoldtest_a_SOURCES) basic_pic_test.c basic_pie_test.c \ ++SOURCES = $(libgoldtest_a_SOURCES) $(aarch64_pr23870_SOURCES) basic_pic_test.c basic_pie_test.c \ + basic_static_pic_test.c basic_static_test.c basic_test.c \ + $(binary_test_SOURCES) $(binary_unittest_SOURCES) \ + $(common_test_1_SOURCES) $(common_test_2_SOURCES) \ +@@ -2830,9 +2836,9 @@ MOSTLYCLEANFILES = *.so *.syms *.stdout + $(am__append_34) $(am__append_37) $(am__append_41) \ + $(am__append_47) $(am__append_51) $(am__append_52) \ + $(am__append_58) $(am__append_78) $(am__append_81) \ +- $(am__append_83) $(am__append_89) $(am__append_92) \ +- $(am__append_95) $(am__append_98) $(am__append_101) \ +- $(am__append_104) $(am__append_107) $(am__append_108) ++ $(am__append_83) $(am__append_90) $(am__append_93) \ ++ $(am__append_96) $(am__append_99) $(am__append_102) \ ++ $(am__append_105) $(am__append_108) $(am__append_109) + + # We will add to these later, for each individual test. Note + # that we add each test under check_SCRIPTS or check_PROGRAMS; +@@ -2842,17 +2848,17 @@ check_SCRIPTS = $(am__append_2) $(am__ap + $(am__append_45) $(am__append_49) $(am__append_53) \ + $(am__append_56) $(am__append_62) $(am__append_73) \ + $(am__append_76) $(am__append_79) $(am__append_84) \ +- $(am__append_87) $(am__append_90) $(am__append_93) \ +- $(am__append_96) $(am__append_99) $(am__append_102) \ +- $(am__append_105) $(am__append_109) ++ $(am__append_88) $(am__append_91) $(am__append_94) \ ++ $(am__append_97) $(am__append_100) $(am__append_103) \ ++ $(am__append_106) $(am__append_110) + check_DATA = $(am__append_3) $(am__append_20) $(am__append_24) \ + $(am__append_30) $(am__append_36) $(am__append_43) \ + $(am__append_46) $(am__append_50) $(am__append_54) \ + $(am__append_57) $(am__append_63) $(am__append_74) \ + $(am__append_77) $(am__append_80) $(am__append_85) \ +- $(am__append_88) $(am__append_91) $(am__append_94) \ +- $(am__append_97) $(am__append_100) $(am__append_103) \ +- $(am__append_106) $(am__append_110) ++ $(am__append_89) $(am__append_92) $(am__append_95) \ ++ $(am__append_98) $(am__append_101) $(am__append_104) \ ++ $(am__append_107) $(am__append_111) + BUILT_SOURCES = $(am__append_40) + TESTS = $(check_SCRIPTS) $(check_PROGRAMS) + +@@ -3408,6 +3414,13 @@ LDADD = libgoldtest.a ../libgold.a ../.. + @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@exception_x86_64_bnd_test_DEPENDENCIES = gcctestdir/ld exception_x86_64_bnd_1.o exception_x86_64_bnd_2.o + @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@exception_x86_64_bnd_test_LDFLAGS = $(exception_test_LDFLAGS) -Wl,-z,bndplt + @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@exception_x86_64_bnd_test_LDADD = exception_x86_64_bnd_1.o exception_x86_64_bnd_2.o ++@DEFAULT_TARGET_AARCH64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@aarch64_pr23870_SOURCES = aarch64_pr23870_foo.c ++@DEFAULT_TARGET_AARCH64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@aarch64_pr23870_DEPENDENCIES = \ ++@DEFAULT_TARGET_AARCH64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ gcctestdir/ld gcctestdir/as aarch64_pr23870_main.o \ ++@DEFAULT_TARGET_AARCH64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ aarch64_pr23870_foo.o aarch64_pr23870_bar.so ++ ++@DEFAULT_TARGET_AARCH64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@aarch64_pr23870_LDFLAGS = -Wl,-R,. -L. -Wl,-l:aarch64_pr23870_bar.so ++@DEFAULT_TARGET_AARCH64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@aarch64_pr23870_LDADD = aarch64_pr23870_main.o + @DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@SPLIT_DEFSYMS = --defsym __morestack=0x100 --defsym __morestack_non_split=0x200 + @DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@SPLIT_DEFSYMS = --defsym __morestack=0x100 --defsym __morestack_non_split=0x200 + @DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@SPLIT_DEFSYMS = --defsym __morestack=0x100 --defsym __morestack_non_split=0x200 +@@ -3457,6 +3470,11 @@ libgoldtest.a: $(libgoldtest_a_OBJECTS) + + clean-checkPROGRAMS: + -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS) ++ ++aarch64_pr23870$(EXEEXT): $(aarch64_pr23870_OBJECTS) $(aarch64_pr23870_DEPENDENCIES) $(EXTRA_aarch64_pr23870_DEPENDENCIES) ++ @rm -f aarch64_pr23870$(EXEEXT) ++ $(AM_V_CCLD)$(aarch64_pr23870_LINK) $(aarch64_pr23870_OBJECTS) $(aarch64_pr23870_LDADD) $(LIBS) ++ + @GCC_FALSE@basic_pic_test$(EXEEXT): $(basic_pic_test_OBJECTS) $(basic_pic_test_DEPENDENCIES) $(EXTRA_basic_pic_test_DEPENDENCIES) + @GCC_FALSE@ @rm -f basic_pic_test$(EXEEXT) + @GCC_FALSE@ $(LINK) $(basic_pic_test_OBJECTS) $(basic_pic_test_LDADD) $(LIBS) +@@ -4397,6 +4415,7 @@ mostlyclean-compile: + distclean-compile: + -rm -f *.tab.c + ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aarch64_pr23870_foo.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basic_pic_test.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basic_pie_test.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basic_static_pic_test.Po@am__quote@ +@@ -5741,6 +5760,13 @@ pr22266.log: pr22266$(EXEEXT) + @p='pr22266$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) + gnu_property_test.sh.log: gnu_property_test.sh + @p='gnu_property_test.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) ++aarch64_pr23870.log: aarch64_pr23870$(EXEEXT) ++ @p='aarch64_pr23870$(EXEEXT)'; \ ++ b='aarch64_pr23870'; \ ++ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ ++ --log-file $$b.log --trs-file $$b.trs \ ++ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ ++ "$$tst" $(AM_TESTS_FD_REDIRECT) + .test.log: + @p='$<'; $(am__check_pre) $(TEST_LOG_COMPILE) "$$tst" $(am__check_post) + @am__EXEEXT_TRUE@.test$(EXEEXT).log: +@@ -7414,6 +7440,14 @@ uninstall-am: + @GCC_TRUE@@NATIVE_LINKER_TRUE@ $(LINK) -Bgcctestdir/ pr22266_main.o pr22266_ar.o + @GCC_TRUE@@NATIVE_LINKER_TRUE@pr22266_ar.o: pr22266_a.o gcctestdir/ld + @GCC_TRUE@@NATIVE_LINKER_TRUE@ gcctestdir/ld -r -T $(srcdir)/pr22266_script.t -o $@ pr22266_a.o ++@DEFAULT_TARGET_AARCH64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@aarch64_pr23870_main.o: aarch64_pr23870_main.S ++@DEFAULT_TARGET_AARCH64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(COMPILE) -c -o $@ $< ++@DEFAULT_TARGET_AARCH64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@aarch64_pr23870_foo.o: aarch64_pr23870_foo.c ++@DEFAULT_TARGET_AARCH64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(COMPILE) -c -o $@ $< ++@DEFAULT_TARGET_AARCH64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@aarch64_pr23870_bar.o: aarch64_pr23870_bar.c ++@DEFAULT_TARGET_AARCH64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(COMPILE) -c -fPIC -o $@ $< ++@DEFAULT_TARGET_AARCH64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@aarch64_pr23870_bar.so: aarch64_pr23870_bar.o ++@DEFAULT_TARGET_AARCH64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(COMPILE) -shared -o $@ $< + @NATIVE_OR_CROSS_LINKER_TRUE@script_test_10.o: script_test_10.s + @NATIVE_OR_CROSS_LINKER_TRUE@ $(TEST_AS) -o $@ $< + @NATIVE_OR_CROSS_LINKER_TRUE@script_test_10: $(srcdir)/script_test_10.t script_test_10.o gcctestdir/ld diff --git a/SOURCES/binutils-CVE-2018-10372.patch b/SOURCES/binutils-CVE-2018-10372.patch new file mode 100644 index 0000000..073a407 --- /dev/null +++ b/SOURCES/binutils-CVE-2018-10372.patch @@ -0,0 +1,22 @@ +--- binutils.orig/binutils/dwarf.c 2018-05-01 11:42:02.656431736 +0100 ++++ binutils-2.30/binutils/dwarf.c 2018-05-01 11:43:24.210383020 +0100 +@@ -9244,7 +9244,18 @@ process_cu_tu_index (struct dwarf_sectio + } + + if (!do_display) +- memcpy (&this_set[row - 1].signature, ph, sizeof (uint64_t)); ++ { ++ size_t num_copy = sizeof (uint64_t); ++ ++ /* PR 23064: Beware of buffer overflow. */ ++ if (ph + num_copy < limit) ++ memcpy (&this_set[row - 1].signature, ph, num_copy); ++ else ++ { ++ warn (_("Signature (%p) extends beyond end of space in section\n"), ph); ++ return 0; ++ } ++ } + + prow = poffsets + (row - 1) * ncols * 4; + /* PR 17531: file: b8ce60a8. */ diff --git a/SOURCES/binutils-CVE-2018-10373.patch b/SOURCES/binutils-CVE-2018-10373.patch new file mode 100644 index 0000000..21964f8 --- /dev/null +++ b/SOURCES/binutils-CVE-2018-10373.patch @@ -0,0 +1,11 @@ +--- binutils.orig/bfd/dwarf2.c 2018-05-01 11:42:03.152425647 +0100 ++++ binutils-2.30/bfd/dwarf2.c 2018-05-01 12:03:27.533735710 +0100 +@@ -1559,7 +1559,7 @@ concat_filename (struct line_info_table + { + char *filename; + +- if (file - 1 >= table->num_files) ++ if (table == NULL || file - 1 >= table->num_files) + { + /* FILE == 0 means unknown. */ + if (file) diff --git a/SOURCES/binutils-CVE-2018-10534.patch b/SOURCES/binutils-CVE-2018-10534.patch new file mode 100644 index 0000000..d06f9ea --- /dev/null +++ b/SOURCES/binutils-CVE-2018-10534.patch @@ -0,0 +1,18 @@ +--- binutils.orig/bfd/peXXigen.c 2018-05-10 10:09:03.619147342 +0100 ++++ binutils-2.30/bfd/peXXigen.c 2018-05-10 10:20:20.884883540 +0100 +@@ -2991,6 +2991,15 @@ _bfd_XX_bfd_copy_private_bfd_data_common + bfd_get_section_size (section) - (addr - section->vma)); + return FALSE; + } ++ /* PR 23110. */ ++ else if (ope->pe_opthdr.DataDirectory[PE_DEBUG_DATA].Size < 0) ++ { ++ /* xgettext:c-format */ ++ _bfd_error_handler ++ (_("%pB: Data Directory size (%#lx) is negative"), ++ obfd, ope->pe_opthdr.DataDirectory[PE_DEBUG_DATA].Size); ++ return FALSE; ++ } + + for (i = 0; i < ope->pe_opthdr.DataDirectory[PE_DEBUG_DATA].Size + / sizeof (struct external_IMAGE_DEBUG_DIRECTORY); i++) diff --git a/SOURCES/binutils-CVE-2018-10535.patch b/SOURCES/binutils-CVE-2018-10535.patch new file mode 100644 index 0000000..a442e47 --- /dev/null +++ b/SOURCES/binutils-CVE-2018-10535.patch @@ -0,0 +1,28 @@ +--- binutils.orig/bfd/elf.c 2018-05-10 10:09:03.622147305 +0100 ++++ binutils-2.30/bfd/elf.c 2018-05-10 10:29:09.895577234 +0100 +@@ -4021,16 +4021,23 @@ ignore_section_sym (bfd *abfd, asymbol * + { + elf_symbol_type *type_ptr; + ++ if (sym == NULL) ++ return FALSE; ++ + if ((sym->flags & BSF_SECTION_SYM) == 0) + return FALSE; + ++ if (sym->section == NULL) ++ return TRUE; ++ + type_ptr = elf_symbol_from (abfd, sym); + return ((type_ptr != NULL + && type_ptr->internal_elf_sym.st_shndx != 0 + && bfd_is_abs_section (sym->section)) + || !(sym->section->owner == abfd +- || (sym->section->output_section->owner == abfd +- && sym->section->output_offset == 0) ++ || (sym->section->output_section != NULL ++ && sym->section->output_section->owner == abfd ++ && sym->section->output_offset == 0) + || bfd_is_abs_section (sym->section))); + } + diff --git a/SOURCES/binutils-CVE-2018-17358.patch b/SOURCES/binutils-CVE-2018-17358.patch new file mode 100644 index 0000000..df860f5 --- /dev/null +++ b/SOURCES/binutils-CVE-2018-17358.patch @@ -0,0 +1,101 @@ +diff -rup binutils.orig/bfd/dwarf2.c binutils-2.30/bfd/dwarf2.c +--- binutils.orig/bfd/dwarf2.c 2018-09-26 15:07:47.162863937 +0100 ++++ binutils-2.30/bfd/dwarf2.c 2018-09-26 15:08:50.868368183 +0100 +@@ -527,6 +527,7 @@ read_section (bfd * abfd, + asection *msec; + const char *section_name = sec->uncompressed_name; + bfd_byte *contents = *section_buffer; ++ bfd_size_type amt; + + /* The section may have already been read. */ + if (contents == NULL) +@@ -549,7 +550,14 @@ read_section (bfd * abfd, + *section_size = msec->rawsize ? msec->rawsize : msec->size; + /* Paranoia - alloc one extra so that we can make sure a string + section is NUL terminated. */ +- contents = (bfd_byte *) bfd_malloc (*section_size + 1); ++ amt = *section_size + 1; ++ if (amt == 0) ++ { ++ bfd_set_error (bfd_error_no_memory); ++ return FALSE; ++ } ++ contents = (bfd_byte *) bfd_malloc (amt); ++ + if (contents == NULL) + return FALSE; + if (syms +diff -rup binutils.orig/bfd/syms.c binutils-2.30/bfd/syms.c +--- binutils.orig/bfd/syms.c 2018-09-26 15:07:47.162863937 +0100 ++++ binutils-2.30/bfd/syms.c 2018-09-26 15:11:41.671038993 +0100 +@@ -1035,6 +1035,10 @@ _bfd_stab_section_find_nearest_line (bfd + 0, strsize)) + return FALSE; + ++ /* Stab strings ought to be nul terminated. Ensure the last one ++ is, to prevent running off the end of the buffer. */ ++ info->strs[strsize - 1] = 0; ++ + /* If this is a relocatable object file, we have to relocate + the entries in .stab. This should always be simple 32 bit + relocations against symbols defined in this object file, so +@@ -1073,7 +1077,8 @@ _bfd_stab_section_find_nearest_line (bfd + || r->howto->bitsize != 32 + || r->howto->pc_relative + || r->howto->bitpos != 0 +- || r->howto->dst_mask != 0xffffffff) ++ || r->howto->dst_mask != 0xffffffff ++ || r->address * bfd_octets_per_byte (abfd) + 4 > stabsize) + { + _bfd_error_handler + (_("Unsupported .stab relocation")); +@@ -1195,7 +1200,8 @@ _bfd_stab_section_find_nearest_line (bfd + { + nul_fun = stab; + nul_str = str; +- if (file_name >= (char *) info->strs + strsize || file_name < (char *) str) ++ if (file_name >= (char *) info->strs + strsize ++ || file_name < (char *) str) + file_name = NULL; + if (stab + STABSIZE + TYPEOFF < info->stabs + stabsize + && *(stab + STABSIZE + TYPEOFF) == (bfd_byte) N_SO) +@@ -1206,7 +1212,8 @@ _bfd_stab_section_find_nearest_line (bfd + directory_name = file_name; + file_name = ((char *) str + + bfd_get_32 (abfd, stab + STRDXOFF)); +- if (file_name >= (char *) info->strs + strsize || file_name < (char *) str) ++ if (file_name >= (char *) info->strs + strsize ++ || file_name < (char *) str) + file_name = NULL; + } + } +@@ -1217,7 +1224,8 @@ _bfd_stab_section_find_nearest_line (bfd + file_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF); + /* PR 17512: file: 0c680a1f. */ + /* PR 17512: file: 5da8aec4. */ +- if (file_name >= (char *) info->strs + strsize || file_name < (char *) str) ++ if (file_name >= (char *) info->strs + strsize ++ || file_name < (char *) str) + file_name = NULL; + break; + +@@ -1226,7 +1234,8 @@ _bfd_stab_section_find_nearest_line (bfd + function_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF); + if (function_name == (char *) str) + continue; +- if (function_name >= (char *) info->strs + strsize) ++ if (function_name >= (char *) info->strs + strsize ++ || function_name < (char *) str) + function_name = NULL; + + nul_fun = NULL; +@@ -1335,7 +1344,8 @@ _bfd_stab_section_find_nearest_line (bfd + if (val <= offset) + { + file_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF); +- if (file_name >= (char *) info->strs + strsize || file_name < (char *) str) ++ if (file_name >= (char *) info->strs + strsize ++ || file_name < (char *) str) + file_name = NULL; + *pline = 0; + } diff --git a/SOURCES/binutils-CVE-2018-6323.patch b/SOURCES/binutils-CVE-2018-6323.patch new file mode 100644 index 0000000..bb698b8 --- /dev/null +++ b/SOURCES/binutils-CVE-2018-6323.patch @@ -0,0 +1,20 @@ +--- binutils.orig/bfd/elfcode.h 2018-05-01 11:42:03.250424443 +0100 ++++ binutils-2.30/bfd/elfcode.h 2018-05-01 12:41:00.745780026 +0100 +@@ -680,7 +680,7 @@ elf_object_p (bfd *abfd) + if (i_ehdrp->e_shnum > ((bfd_size_type) -1) / sizeof (*i_shdrp)) + goto got_wrong_format_error; + #endif +- amt = sizeof (*i_shdrp) * i_ehdrp->e_shnum; ++ amt = sizeof (*i_shdrp) * (bfd_size_type) i_ehdrp->e_shnum; + i_shdrp = (Elf_Internal_Shdr *) bfd_alloc (abfd, amt); + if (!i_shdrp) + goto got_no_match; +@@ -776,7 +776,7 @@ elf_object_p (bfd *abfd) + if (i_ehdrp->e_phnum > ((bfd_size_type) -1) / sizeof (*i_phdr)) + goto got_wrong_format_error; + #endif +- amt = i_ehdrp->e_phnum * sizeof (*i_phdr); ++ amt = (bfd_size_type) i_ehdrp->e_phnum * sizeof (*i_phdr); + elf_tdata (abfd)->phdr = (Elf_Internal_Phdr *) bfd_alloc (abfd, amt); + if (elf_tdata (abfd)->phdr == NULL) + goto got_no_match; diff --git a/SOURCES/binutils-CVE-2018-6759.patch b/SOURCES/binutils-CVE-2018-6759.patch new file mode 100644 index 0000000..c52a636 --- /dev/null +++ b/SOURCES/binutils-CVE-2018-6759.patch @@ -0,0 +1,69 @@ +--- binutils.orig/bfd/opncls.c 2018-05-01 11:42:03.266424248 +0100 ++++ binutils-2.30/bfd/opncls.c 2018-05-01 12:52:36.792579838 +0100 +@@ -1179,6 +1179,7 @@ bfd_get_debug_link_info_1 (bfd *abfd, vo + bfd_byte *contents; + unsigned int crc_offset; + char *name; ++ bfd_size_type size; + + BFD_ASSERT (abfd); + BFD_ASSERT (crc32_out); +@@ -1188,6 +1189,12 @@ bfd_get_debug_link_info_1 (bfd *abfd, vo + if (sect == NULL) + return NULL; + ++ size = bfd_get_section_size (sect); ++ ++ /* PR 22794: Make sure that the section has a reasonable size. */ ++ if (size < 8 || size >= bfd_get_size (abfd)) ++ return NULL; ++ + if (!bfd_malloc_and_get_section (abfd, sect, &contents)) + { + if (contents != NULL) +@@ -1198,9 +1205,9 @@ bfd_get_debug_link_info_1 (bfd *abfd, vo + /* CRC value is stored after the filename, aligned up to 4 bytes. */ + name = (char *) contents; + /* PR 17597: avoid reading off the end of the buffer. */ +- crc_offset = strnlen (name, bfd_get_section_size (sect)) + 1; ++ crc_offset = strnlen (name, size) + 1; + crc_offset = (crc_offset + 3) & ~3; +- if (crc_offset + 4 > bfd_get_section_size (sect)) ++ if (crc_offset + 4 > size) + return NULL; + + *crc32 = bfd_get_32 (abfd, contents + crc_offset); +@@ -1261,6 +1268,7 @@ bfd_get_alt_debug_link_info (bfd * abfd, + bfd_byte *contents; + unsigned int buildid_offset; + char *name; ++ bfd_size_type size; + + BFD_ASSERT (abfd); + BFD_ASSERT (buildid_len); +@@ -1271,6 +1279,10 @@ bfd_get_alt_debug_link_info (bfd * abfd, + if (sect == NULL) + return NULL; + ++ size = bfd_get_section_size (sect); ++ if (size < 8 || size >= bfd_get_size (abfd)) ++ return NULL; ++ + if (!bfd_malloc_and_get_section (abfd, sect, & contents)) + { + if (contents != NULL) +@@ -1280,11 +1292,11 @@ bfd_get_alt_debug_link_info (bfd * abfd, + + /* BuildID value is stored after the filename. */ + name = (char *) contents; +- buildid_offset = strnlen (name, bfd_get_section_size (sect)) + 1; +- if (buildid_offset >= bfd_get_section_size (sect)) ++ buildid_offset = strnlen (name, size) + 1; ++ if (buildid_offset >= size) + return NULL; + +- *buildid_len = bfd_get_section_size (sect) - buildid_offset; ++ *buildid_len = size - buildid_offset; + *buildid_out = bfd_malloc (*buildid_len); + memcpy (*buildid_out, contents + buildid_offset, *buildid_len); + diff --git a/SOURCES/binutils-CVE-2018-7208.patch b/SOURCES/binutils-CVE-2018-7208.patch new file mode 100644 index 0000000..c817edc --- /dev/null +++ b/SOURCES/binutils-CVE-2018-7208.patch @@ -0,0 +1,12 @@ +--- binutils.orig/bfd/coffgen.c 2018-04-27 09:23:33.449859052 +0100 ++++ binutils-2.30/bfd/coffgen.c 2018-04-27 09:34:34.530135122 +0100 +@@ -1555,7 +1555,8 @@ coff_pointerize_aux (bfd *abfd, + } + /* A negative tagndx is meaningless, but the SCO 3.2v4 cc can + generate one, so we must be careful to ignore it. */ +- if (auxent->u.auxent.x_sym.x_tagndx.l > 0) ++ if ((unsigned long) auxent->u.auxent.x_sym.x_tagndx.l ++ < obj_raw_syment_count (abfd)) + { + auxent->u.auxent.x_sym.x_tagndx.p = + table_base + auxent->u.auxent.x_sym.x_tagndx.l; diff --git a/SOURCES/binutils-CVE-2018-7568.patch b/SOURCES/binutils-CVE-2018-7568.patch new file mode 100644 index 0000000..7ce6f3e --- /dev/null +++ b/SOURCES/binutils-CVE-2018-7568.patch @@ -0,0 +1,37 @@ +--- binutils.orig/bfd/dwarf1.c 2018-05-01 13:04:35.060041875 +0100 ++++ binutils-2.30/bfd/dwarf1.c 2018-05-01 13:24:17.943833855 +0100 +@@ -213,6 +213,7 @@ parse_die (bfd * abfd, + /* Then the attributes. */ + while (xptr + 2 <= aDiePtrEnd) + { ++ unsigned int block_len; + unsigned short attr; + + /* Parse the attribute based on its form. This section +@@ -255,12 +256,24 @@ parse_die (bfd * abfd, + break; + case FORM_BLOCK2: + if (xptr + 2 <= aDiePtrEnd) +- xptr += bfd_get_16 (abfd, xptr); ++ { ++ block_len = bfd_get_16 (abfd, xptr); ++ if (xptr + block_len > aDiePtrEnd ++ || xptr + block_len < xptr) ++ return FALSE; ++ xptr += block_len; ++ } + xptr += 2; + break; + case FORM_BLOCK4: + if (xptr + 4 <= aDiePtrEnd) +- xptr += bfd_get_32 (abfd, xptr); ++ { ++ block_len = bfd_get_32 (abfd, xptr); ++ if (xptr + block_len > aDiePtrEnd ++ || xptr + block_len < xptr) ++ return FALSE; ++ xptr += block_len; ++ } + xptr += 4; + break; + case FORM_STRING: diff --git a/SOURCES/binutils-CVE-2018-7569.patch b/SOURCES/binutils-CVE-2018-7569.patch new file mode 100644 index 0000000..32962bd --- /dev/null +++ b/SOURCES/binutils-CVE-2018-7569.patch @@ -0,0 +1,75 @@ +--- binutils.orig/bfd/dwarf2.c 2018-05-01 13:04:35.055041935 +0100 ++++ binutils-2.30/bfd/dwarf2.c 2018-05-01 13:31:32.882624448 +0100 +@@ -622,14 +622,24 @@ read_8_bytes (bfd *abfd, bfd_byte *buf, + } + + static bfd_byte * +-read_n_bytes (bfd *abfd ATTRIBUTE_UNUSED, +- bfd_byte *buf, +- bfd_byte *end, +- unsigned int size ATTRIBUTE_UNUSED) +-{ +- if (buf + size > end) +- return NULL; +- return buf; ++read_n_bytes (bfd_byte * buf, ++ bfd_byte * end, ++ struct dwarf_block * block) ++{ ++ unsigned int size = block->size; ++ bfd_byte * block_end = buf + size; ++ ++ if (block_end > end || block_end < buf) ++ { ++ block->data = NULL; ++ block->size = 0; ++ return end; ++ } ++ else ++ { ++ block->data = buf; ++ return block_end; ++ } + } + + /* Scans a NUL terminated string starting at BUF, returning a pointer to it. +@@ -1127,8 +1137,7 @@ read_attribute_value (struct attribute * + return NULL; + blk->size = read_2_bytes (abfd, info_ptr, info_ptr_end); + info_ptr += 2; +- blk->data = read_n_bytes (abfd, info_ptr, info_ptr_end, blk->size); +- info_ptr += blk->size; ++ info_ptr = read_n_bytes (info_ptr, info_ptr_end, blk); + attr->u.blk = blk; + break; + case DW_FORM_block4: +@@ -1138,8 +1147,7 @@ read_attribute_value (struct attribute * + return NULL; + blk->size = read_4_bytes (abfd, info_ptr, info_ptr_end); + info_ptr += 4; +- blk->data = read_n_bytes (abfd, info_ptr, info_ptr_end, blk->size); +- info_ptr += blk->size; ++ info_ptr = read_n_bytes (info_ptr, info_ptr_end, blk); + attr->u.blk = blk; + break; + case DW_FORM_data2: +@@ -1179,8 +1187,7 @@ read_attribute_value (struct attribute * + blk->size = _bfd_safe_read_leb128 (abfd, info_ptr, &bytes_read, + FALSE, info_ptr_end); + info_ptr += bytes_read; +- blk->data = read_n_bytes (abfd, info_ptr, info_ptr_end, blk->size); +- info_ptr += blk->size; ++ info_ptr = read_n_bytes (info_ptr, info_ptr_end, blk); + attr->u.blk = blk; + break; + case DW_FORM_block1: +@@ -1190,8 +1197,7 @@ read_attribute_value (struct attribute * + return NULL; + blk->size = read_1_byte (abfd, info_ptr, info_ptr_end); + info_ptr += 1; +- blk->data = read_n_bytes (abfd, info_ptr, info_ptr_end, blk->size); +- info_ptr += blk->size; ++ info_ptr = read_n_bytes (info_ptr, info_ptr_end, blk); + attr->u.blk = blk; + break; + case DW_FORM_data1: diff --git a/SOURCES/binutils-CVE-2018-7570.patch b/SOURCES/binutils-CVE-2018-7570.patch new file mode 100644 index 0000000..e057d63 --- /dev/null +++ b/SOURCES/binutils-CVE-2018-7570.patch @@ -0,0 +1,156 @@ +--- binutils.orig/bfd/elf.c 2018-05-01 11:42:03.151425659 +0100 ++++ binutils-2.30/bfd/elf.c 2018-05-01 12:30:42.129206856 +0100 +@@ -5713,6 +5713,9 @@ assign_file_positions_for_load_sections + return TRUE; + } + ++#define IS_TBSS(s) \ ++ ((s->flags & (SEC_THREAD_LOCAL | SEC_LOAD)) == SEC_THREAD_LOCAL) ++ + /* Assign file positions for the other sections. */ + + static bfd_boolean +@@ -5862,65 +5865,100 @@ assign_file_positions_for_non_load_secti + { + if (p->p_type == PT_GNU_RELRO) + { +- const Elf_Internal_Phdr *lp; +- struct elf_segment_map *lm; ++ bfd_vma start, end; ++ bfd_boolean ok; + + if (link_info != NULL) + { + /* During linking the range of the RELRO segment is passed +- in link_info. */ ++ in link_info. Note that there may be padding between ++ relro_start and the first RELRO section. */ ++ start = link_info->relro_start; ++ end = link_info->relro_end; ++ } ++ else if (m->count != 0) ++ { ++ if (!m->p_size_valid) ++ abort (); ++ start = m->sections[0]->vma; ++ end = start + m->p_size; ++ } ++ else ++ { ++ start = 0; ++ end = 0; ++ } ++ ++ ok = FALSE; ++ if (start < end) ++ { ++ struct elf_segment_map *lm; ++ const Elf_Internal_Phdr *lp; ++ unsigned int i; ++ ++ /* Find a LOAD segment containing a section in the RELRO ++ segment. */ + for (lm = elf_seg_map (abfd), lp = phdrs; + lm != NULL; + lm = lm->next, lp++) + { + if (lp->p_type == PT_LOAD +- && lp->p_vaddr < link_info->relro_end + && lm->count != 0 +- && lm->sections[0]->vma >= link_info->relro_start) ++ && (lm->sections[lm->count - 1]->vma ++ + (!IS_TBSS (lm->sections[lm->count - 1]) ++ ? lm->sections[lm->count - 1]->size ++ : 0)) > start ++ && lm->sections[0]->vma < end) + break; + } + +- BFD_ASSERT (lm != NULL); +- } +- else +- { +- /* Otherwise we are copying an executable or shared +- library, but we need to use the same linker logic. */ +- for (lp = phdrs; lp < phdrs + count; ++lp) ++ if (lm != NULL) + { +- if (lp->p_type == PT_LOAD +- && lp->p_paddr == p->p_paddr) +- break; ++ /* Find the section starting the RELRO segment. */ ++ for (i = 0; i < lm->count; i++) ++ { ++ asection *s = lm->sections[i]; ++ if (s->vma >= start ++ && s->vma < end ++ && s->size != 0) ++ break; ++ } ++ ++ if (i < lm->count) ++ { ++ p->p_vaddr = lm->sections[i]->vma; ++ p->p_paddr = lm->sections[i]->lma; ++ p->p_offset = lm->sections[i]->filepos; ++ p->p_memsz = end - p->p_vaddr; ++ p->p_filesz = p->p_memsz; ++ ++ /* The RELRO segment typically ends a few bytes ++ into .got.plt but other layouts are possible. ++ In cases where the end does not match any ++ loaded section (for instance is in file ++ padding), trim p_filesz back to correspond to ++ the end of loaded section contents. */ ++ if (p->p_filesz > lp->p_vaddr + lp->p_filesz - p->p_vaddr) ++ p->p_filesz = lp->p_vaddr + lp->p_filesz - p->p_vaddr; ++ ++ /* Preserve the alignment and flags if they are ++ valid. The gold linker generates RW/4 for ++ the PT_GNU_RELRO section. It is better for ++ objcopy/strip to honor these attributes ++ otherwise gdb will choke when using separate ++ debug files. */ ++ if (!m->p_align_valid) ++ p->p_align = 1; ++ if (!m->p_flags_valid) ++ p->p_flags = PF_R; ++ ok = TRUE; ++ } + } + } +- +- if (lp < phdrs + count) +- { +- p->p_vaddr = lp->p_vaddr; +- p->p_paddr = lp->p_paddr; +- p->p_offset = lp->p_offset; +- if (link_info != NULL) +- p->p_filesz = link_info->relro_end - lp->p_vaddr; +- else if (m->p_size_valid) +- p->p_filesz = m->p_size; +- else +- abort (); +- p->p_memsz = p->p_filesz; +- /* Preserve the alignment and flags if they are valid. The +- gold linker generates RW/4 for the PT_GNU_RELRO section. +- It is better for objcopy/strip to honor these attributes +- otherwise gdb will choke when using separate debug files. +- */ +- if (!m->p_align_valid) +- p->p_align = 1; +- if (!m->p_flags_valid) +- p->p_flags = PF_R; +- } +- else +- { +- memset (p, 0, sizeof *p); +- p->p_type = PT_NULL; +- } ++ if (link_info != NULL) ++ BFD_ASSERT (ok); ++ if (!ok) ++ memset (p, 0, sizeof *p); + } + else if (p->p_type == PT_GNU_STACK) + { diff --git a/SOURCES/binutils-CVE-2018-7642.patch b/SOURCES/binutils-CVE-2018-7642.patch new file mode 100644 index 0000000..62178da --- /dev/null +++ b/SOURCES/binutils-CVE-2018-7642.patch @@ -0,0 +1,17 @@ +--- binutils.orig/bfd/aoutx.h 2018-04-26 15:14:18.411450291 +0100 ++++ binutils-2.30/bfd/aoutx.h 2018-04-26 17:22:38.328770529 +0100 +@@ -2283,10 +2283,12 @@ NAME (aout, swap_std_reloc_in) (bfd *abf + if (r_baserel) + r_extern = 1; + +- if (r_extern && r_index > symcount) ++ if (r_extern && r_index >= symcount) + { + /* We could arrange to return an error, but it might be useful +- to see the file even if it is bad. */ ++ to see the file even if it is bad. FIXME: Of course this ++ means that objdump -r *doesn't* see the actual reloc, and ++ objcopy silently writes a different reloc. */ + r_extern = 0; + r_index = N_ABS; + } diff --git a/SOURCES/binutils-CVE-2018-7643.patch b/SOURCES/binutils-CVE-2018-7643.patch new file mode 100644 index 0000000..6ccf257 --- /dev/null +++ b/SOURCES/binutils-CVE-2018-7643.patch @@ -0,0 +1,16 @@ +--- binutils.orig/binutils/dwarf.c 2018-04-27 09:22:07.402864408 +0100 ++++ binutils-2.30/binutils/dwarf.c 2018-04-27 09:24:26.794235786 +0100 +@@ -6810,6 +6810,13 @@ display_debug_ranges (struct dwarf_secti + continue; + } + ++ if (next < section_begin || next >= finish) ++ { ++ warn (_("Corrupt offset (%#8.8lx) in range entry %u\n"), ++ (unsigned long) offset, i); ++ continue; ++ } ++ + if (dwarf_check != 0 && i > 0) + { + if (start < next) diff --git a/SOURCES/binutils-CVE-2018-8945.patch b/SOURCES/binutils-CVE-2018-8945.patch new file mode 100644 index 0000000..33ec9f5 --- /dev/null +++ b/SOURCES/binutils-CVE-2018-8945.patch @@ -0,0 +1,29 @@ +diff -rup binutils.orig/bfd/elf-attrs.c binutils-2.30/bfd/elf-attrs.c +--- binutils.orig/bfd/elf-attrs.c 2018-05-17 14:14:04.341805666 +0100 ++++ binutils-2.30/bfd/elf-attrs.c 2018-05-17 14:15:19.729952453 +0100 +@@ -438,6 +438,14 @@ _bfd_elf_parse_attributes (bfd *abfd, El + /* PR 17512: file: 2844a11d. */ + if (hdr->sh_size == 0) + return; ++ if (hdr->sh_size > bfd_get_file_size (abfd)) ++ { ++ _bfd_error_handler (_("%pB: error: attribute section '%pA' too big: %#llx"), ++ abfd, hdr->bfd_section, (long long) hdr->sh_size); ++ bfd_set_error (bfd_error_invalid_operation); ++ return; ++ } ++ + contents = (bfd_byte *) bfd_malloc (hdr->sh_size + 1); + if (!contents) + return; +diff -rup binutils.orig/bfd/elf.c binutils-2.30/bfd/elf.c +--- binutils.orig/bfd/elf.c 2018-05-17 14:14:04.326805836 +0100 ++++ binutils-2.30/bfd/elf.c 2018-05-17 14:15:59.412503342 +0100 +@@ -298,6 +298,7 @@ bfd_elf_get_str_section (bfd *abfd, unsi + /* Allocate and clear an extra byte at the end, to prevent crashes + in case the string table is not terminated. */ + if (shstrtabsize + 1 <= 1 ++ || shstrtabsize > bfd_get_file_size (abfd) + || bfd_seek (abfd, offset, SEEK_SET) != 0 + || (shstrtab = (bfd_byte *) bfd_alloc (abfd, shstrtabsize + 1)) == NULL) + shstrtab = NULL; diff --git a/SOURCES/binutils-CVE-2019-1010204.patch b/SOURCES/binutils-CVE-2019-1010204.patch new file mode 100644 index 0000000..d1d949f --- /dev/null +++ b/SOURCES/binutils-CVE-2019-1010204.patch @@ -0,0 +1,15 @@ +--- binutils.orig/gold/fileread.cc 2019-11-08 10:33:58.911577903 +0000 ++++ binutils-2.30/gold/fileread.cc 2019-11-08 10:34:13.001470092 +0000 +@@ -381,6 +381,12 @@ File_read::do_read(off_t start, section_ + ssize_t bytes; + if (this->whole_file_view_ != NULL) + { ++ // See PR 23765 for an example of a testcase that triggers this error. ++ if (((ssize_t) start) < 0) ++ gold_fatal(_("%s: read failed, starting offset (%#llx) less than zero"), ++ this->filename().c_str(), ++ static_cast(start)); ++ + bytes = this->size_ - start; + if (static_cast(bytes) >= size) + { diff --git a/SOURCES/binutils-CVE-2019-14444.patch b/SOURCES/binutils-CVE-2019-14444.patch new file mode 100644 index 0000000..ad554f5 --- /dev/null +++ b/SOURCES/binutils-CVE-2019-14444.patch @@ -0,0 +1,11 @@ +--- 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 +@@ -13234,7 +13234,7 @@ apply_relocations (Filedata * + } + + rloc = start + rp->r_offset; +- if ((rloc + reloc_size) > end || (rloc < start)) ++ if (rloc >= end || (rloc + reloc_size) > end || (rloc < start)) + { + warn (_("skipping invalid relocation offset 0x%lx in section %s\n"), + (unsigned long) rp->r_offset, diff --git a/SOURCES/binutils-PowerPC-IEEE-long-double-warnings.patch b/SOURCES/binutils-PowerPC-IEEE-long-double-warnings.patch new file mode 100644 index 0000000..2c3d8d3 --- /dev/null +++ b/SOURCES/binutils-PowerPC-IEEE-long-double-warnings.patch @@ -0,0 +1,17 @@ +--- binutils.orig/bfd/elf32-ppc.c 2018-06-12 17:35:40.931551297 +0100 ++++ binutils-2.30/bfd/elf32-ppc.c 2018-06-12 17:37:22.252441292 +0100 +@@ -4677,12 +4677,12 @@ _bfd_elf_ppc_merge_fp_attributes (bfd *i + _bfd_error_handler + /* xgettext:c-format */ + (_("Warning: %B uses IBM long double, " +- "%B uses IEEE long double"), ibfd, obfd); ++ "%B uses IEEE long double"), obfd, ibfd); + else if (out_fp == 3 * 4 && in_fp == 1 * 4) + _bfd_error_handler + /* xgettext:c-format */ + (_("Warning: %B uses IBM long double, " +- "%B uses IEEE long double"), obfd, ibfd); ++ "%B uses IEEE long double"), ibfd, obfd); + } + } + diff --git a/SOURCES/binutils-aarch64-STO_AARCH64_VARIANT_PCS.patch b/SOURCES/binutils-aarch64-STO_AARCH64_VARIANT_PCS.patch new file mode 100644 index 0000000..89f4468 --- /dev/null +++ b/SOURCES/binutils-aarch64-STO_AARCH64_VARIANT_PCS.patch @@ -0,0 +1,855 @@ +diff -rup binutils.orig/bfd/elfnn-aarch64.c binutils-2.32/bfd/elfnn-aarch64.c +--- binutils.orig/bfd/elfnn-aarch64.c 2019-07-02 17:30:19.407892712 +0100 ++++ binutils-2.32/bfd/elfnn-aarch64.c 2019-07-02 17:35:21.874749884 +0100 +@@ -2579,6 +2579,9 @@ struct elf_aarch64_link_hash_table + unsigned int top_index; + asection **input_list; + ++ /* JUMP_SLOT relocs for variant PCS symbols may be present. */ ++ int variant_pcs; ++ + /* The offset into splt of the PLT entry for the TLS descriptor + resolver. Special values are 0, if not necessary (or not found + to be necessary yet), and -1 if needed but not determined +@@ -2790,6 +2793,31 @@ elfNN_aarch64_copy_indirect_symbol (stru + _bfd_elf_link_hash_copy_indirect (info, dir, ind); + } + ++/* Merge non-visibility st_other attributes. */ ++ ++static void ++elfNN_aarch64_merge_symbol_attribute (struct elf_link_hash_entry *h, ++ const Elf_Internal_Sym *isym, ++ bfd_boolean definition ATTRIBUTE_UNUSED, ++ bfd_boolean dynamic ATTRIBUTE_UNUSED) ++{ ++ unsigned int isym_sto = isym->st_other & ~ELF_ST_VISIBILITY (-1); ++ unsigned int h_sto = h->other & ~ELF_ST_VISIBILITY (-1); ++ ++ if (isym_sto == h_sto) ++ return; ++ ++ if (isym_sto & ~STO_AARCH64_VARIANT_PCS) ++ /* Not fatal, this callback cannot fail. */ ++ _bfd_error_handler (_("unknown attribute for symbol `%s': 0x%02x"), ++ h->root.root.string, isym_sto); ++ ++ /* Note: Ideally we would warn about any attribute mismatch, but ++ this api does not allow that without substantial changes. */ ++ if (isym_sto & STO_AARCH64_VARIANT_PCS) ++ h->other |= STO_AARCH64_VARIANT_PCS; ++} ++ + /* Destroy an AArch64 elf linker hash table. */ + + static void +@@ -8370,6 +8398,12 @@ elfNN_aarch64_allocate_dynrelocs (struct + updated. */ + + htab->root.srelplt->reloc_count++; ++ ++ /* Mark the DSO in case R__JUMP_SLOT relocs against ++ variant PCS symbols are present. */ ++ if (h->other & STO_AARCH64_VARIANT_PCS) ++ htab->variant_pcs = 1; ++ + } + else + { +@@ -8958,6 +8992,10 @@ elfNN_aarch64_size_dynamic_sections (bfd + || !add_dynamic_entry (DT_JMPREL, 0)) + return FALSE; + ++ if (htab->variant_pcs ++ && !add_dynamic_entry (DT_AARCH64_VARIANT_PCS, 0)) ++ return FALSE; ++ + if (htab->tlsdesc_plt + && (!add_dynamic_entry (DT_TLSDESC_PLT, 0) + || !add_dynamic_entry (DT_TLSDESC_GOT, 0))) +@@ -9708,6 +9746,9 @@ const struct elf_size_info elfNN_aarch64 + #define elf_backend_copy_indirect_symbol \ + elfNN_aarch64_copy_indirect_symbol + ++#define elf_backend_merge_symbol_attribute \ ++ elfNN_aarch64_merge_symbol_attribute ++ + /* Create .dynbss, and .rela.bss sections in DYNOBJ, and set up shortcuts + to them in our hash. */ + #define elf_backend_create_dynamic_sections \ +diff -rup binutils.orig/binutils/readelf.c binutils-2.32/binutils/readelf.c +--- binutils.orig/binutils/readelf.c 2019-07-02 17:30:18.890896375 +0100 ++++ binutils-2.32/binutils/readelf.c 2019-07-02 17:32:25.008002901 +0100 +@@ -1797,6 +1797,19 @@ dump_relocations (Filedata * fi + } + + static const char * ++get_aarch64_dynamic_type (unsigned long type) ++{ ++ switch (type) ++ { ++ case DT_AARCH64_BTI_PLT: return "AARCH64_BTI_PLT"; ++ case DT_AARCH64_PAC_PLT: return "AARCH64_PAC_PLT"; ++ case DT_AARCH64_VARIANT_PCS: return "AARCH64_VARIANT_PCS"; ++ default: ++ return NULL; ++ } ++} ++ ++static const char * + get_mips_dynamic_type (unsigned long type) + { + switch (type) +@@ -2169,6 +2182,9 @@ get_dynamic_type (Filedata * filedata, u + + switch (filedata->file_header.e_machine) + { ++ case EM_AARCH64: ++ result = get_aarch64_dynamic_type (type); ++ break; + case EM_MIPS: + case EM_MIPS_RS3_LE: + result = get_mips_dynamic_type (type); +@@ -11054,6 +11070,22 @@ get_solaris_symbol_visibility (unsigned + } + + static const char * ++get_aarch64_symbol_other (unsigned int other) ++{ ++ static char buf[32]; ++ ++ if (other & STO_AARCH64_VARIANT_PCS) ++ { ++ other &= ~STO_AARCH64_VARIANT_PCS; ++ if (other == 0) ++ return "VARIANT_PCS"; ++ snprintf (buf, sizeof buf, "VARIANT_PCS | %x", other); ++ return buf; ++ } ++ return NULL; ++} ++ ++static const char * + get_mips_symbol_other (unsigned int other) + { + switch (other) +@@ -11164,6 +11196,9 @@ get_symbol_other (Filedata * filedata, u + + switch (filedata->file_header.e_machine) + { ++ case EM_AARCH64: ++ result = get_aarch64_symbol_other (other); ++ break; + case EM_MIPS: + result = get_mips_symbol_other (other); + break; +diff -rup binutils.orig/gas/config/tc-aarch64.c binutils-2.32/gas/config/tc-aarch64.c +--- binutils.orig/gas/config/tc-aarch64.c 2019-07-02 17:30:19.131894667 +0100 ++++ binutils-2.32/gas/config/tc-aarch64.c 2019-07-02 17:35:45.202584620 +0100 +@@ -1938,6 +1938,28 @@ s_aarch64_elf_cons (int nbytes) + demand_empty_rest_of_line (); + } + ++/* Mark symbol that it follows a variant PCS convention. */ ++ ++static void ++s_variant_pcs (int ignored ATTRIBUTE_UNUSED) ++{ ++ char *name; ++ char c; ++ symbolS *sym; ++ asymbol *bfdsym; ++ elf_symbol_type *elfsym; ++ ++ c = get_symbol_name (&name); ++ if (!*name) ++ as_bad (_("Missing symbol name in directive")); ++ sym = symbol_find_or_make (name); ++ restore_line_pointer (c); ++ demand_empty_rest_of_line (); ++ bfdsym = symbol_get_bfdsym (sym); ++ elfsym = elf_symbol_from (bfd_asymbol_bfd (bfdsym), bfdsym); ++ gas_assert (elfsym); ++ elfsym->internal_elf_sym.st_other |= STO_AARCH64_VARIANT_PCS; ++} + #endif /* OBJ_ELF */ + + /* Output a 32-bit word, but mark as an instruction. */ +@@ -2084,6 +2106,7 @@ const pseudo_typeS md_pseudo_table[] = { + {"long", s_aarch64_elf_cons, 4}, + {"xword", s_aarch64_elf_cons, 8}, + {"dword", s_aarch64_elf_cons, 8}, ++ {"variant_pcs", s_variant_pcs, 0}, + #endif + {0, 0, 0} + }; +@@ -9320,3 +9343,35 @@ aarch64_copy_symbol_attributes (symbolS + { + AARCH64_GET_FLAG (dest) = AARCH64_GET_FLAG (src); + } ++ ++#ifdef OBJ_ELF ++/* Same as elf_copy_symbol_attributes, but without copying st_other. ++ This is needed so AArch64 specific st_other values can be independently ++ specified for an IFUNC resolver (that is called by the dynamic linker) ++ and the symbol it resolves (aliased to the resolver). In particular, ++ if a function symbol has special st_other value set via directives, ++ then attaching an IFUNC resolver to that symbol should not override ++ the st_other setting. Requiring the directive on the IFUNC resolver ++ symbol would be unexpected and problematic in C code, where the two ++ symbols appear as two independent function declarations. */ ++ ++void ++aarch64_elf_copy_symbol_attributes (symbolS *dest, symbolS *src) ++{ ++ struct elf_obj_sy *srcelf = symbol_get_obj (src); ++ struct elf_obj_sy *destelf = symbol_get_obj (dest); ++ if (srcelf->size) ++ { ++ if (destelf->size == NULL) ++ destelf->size = XNEW (expressionS); ++ *destelf->size = *srcelf->size; ++ } ++ else ++ { ++ if (destelf->size != NULL) ++ free (destelf->size); ++ destelf->size = NULL; ++ } ++ S_SET_SIZE (dest, S_GET_SIZE (src)); ++} ++#endif +diff -rup binutils.orig/gas/config/tc-aarch64.h binutils-2.32/gas/config/tc-aarch64.h +--- binutils.orig/gas/config/tc-aarch64.h 2019-07-02 17:30:19.136894632 +0100 ++++ binutils-2.32/gas/config/tc-aarch64.h 2019-07-02 17:35:45.202584620 +0100 +@@ -130,6 +130,12 @@ void aarch64_copy_symbol_attributes (sym + (aarch64_copy_symbol_attributes (DEST, SRC)) + #endif + ++#ifdef OBJ_ELF ++void aarch64_elf_copy_symbol_attributes (symbolS *, symbolS *); ++#define OBJ_COPY_SYMBOL_ATTRIBUTES(DEST, SRC) \ ++ aarch64_elf_copy_symbol_attributes (DEST, SRC) ++#endif ++ + #define TC_START_LABEL(STR, NUL_CHAR, NEXT_CHAR) \ + (NEXT_CHAR == ':' || (NEXT_CHAR == '/' && aarch64_data_in_code ())) + #define tc_canonicalize_symbol_name(str) aarch64_canonicalize_symbol_name (str); +diff -rup binutils.orig/gas/doc/c-aarch64.texi binutils-2.32/gas/doc/c-aarch64.texi +--- binutils.orig/gas/doc/c-aarch64.texi 2019-07-02 17:30:19.125894710 +0100 ++++ binutils-2.32/gas/doc/c-aarch64.texi 2019-07-02 17:35:11.362824354 +0100 +@@ -425,6 +425,12 @@ should only be done if it is really nece + + @c VVVVVVVVVVVVVVVVVVVVVVVVVV + ++@cindex @code{.variant_pcs} directive, AArch64 ++@item .variant_pcs @var{symbol} ++This directive marks @var{symbol} referencing a function that may ++follow a variant procedure call standard with different register ++usage convention from the base procedure call standard. ++ + @c WWWWWWWWWWWWWWWWWWWWWWWWWW + @c XXXXXXXXXXXXXXXXXXXXXXXXXX + +diff -rup binutils.orig/include/elf/aarch64.h binutils-2.32/include/elf/aarch64.h +--- binutils.orig/include/elf/aarch64.h 2019-07-02 17:30:18.850896658 +0100 ++++ binutils-2.32/include/elf/aarch64.h 2019-07-02 17:32:55.678785616 +0100 +@@ -36,6 +36,15 @@ + #define SHF_COMDEF 0x80000000 /* Section may be multiply defined + in the input to a link step. */ + ++/* Processor specific dynamic array tags. */ ++#define DT_AARCH64_BTI_PLT (DT_LOPROC + 1) ++#define DT_AARCH64_PAC_PLT (DT_LOPROC + 3) ++#define DT_AARCH64_VARIANT_PCS (DT_LOPROC + 5) ++ ++/* AArch64-specific values for st_other. */ ++#define STO_AARCH64_VARIANT_PCS 0x80 /* Symbol may follow different call ++ convention from the base PCS. */ ++ + /* Relocation types. */ + + START_RELOC_NUMBERS (elf_aarch64_reloc_type) +diff -rup binutils.orig/ld/testsuite/ld-aarch64/aarch64-elf.exp binutils-2.32/ld/testsuite/ld-aarch64/aarch64-elf.exp +--- binutils.orig/ld/testsuite/ld-aarch64/aarch64-elf.exp 2019-07-02 17:30:18.922896148 +0100 ++++ binutils-2.32/ld/testsuite/ld-aarch64/aarch64-elf.exp 2019-07-02 17:35:21.875749878 +0100 +@@ -371,6 +371,10 @@ run_dump_test_lp64 "rela-abs-relative-op + + run_dump_test_lp64 "pie-bind-locally" + ++run_dump_test_lp64 "variant_pcs-r" ++run_dump_test_lp64 "variant_pcs-shared" ++run_dump_test_lp64 "variant_pcs-now" ++ + set aarch64elflinktests { + {"ld-aarch64/so with global symbol" "-shared" "" "" {copy-reloc-so.s} + {} "copy-reloc-so.so"} +--- /dev/null 2019-07-02 08:01:33.386842704 +0100 ++++ binutils-2.32/gas/testsuite/gas/aarch64/symbol-variant_pcs-1.d 2019-07-02 17:35:11.362824354 +0100 +@@ -0,0 +1,10 @@ ++#objdump: -t ++ ++.*: file format .* ++ ++SYMBOL TABLE: ++0+ l d \.text 0+ \.text ++0+ l d \.data 0+ \.data ++0+ l d \.bss 0+ \.bss ++0+ l \.text 0+ func ++0+ \*UND\* 0+ 0x80 foobar +--- /dev/null 2019-07-02 08:01:33.386842704 +0100 ++++ binutils-2.32/gas/testsuite/gas/aarch64/symbol-variant_pcs-1.s 2019-07-02 17:35:11.362824354 +0100 +@@ -0,0 +1,8 @@ ++.text ++.variant_pcs foobar ++func: ++ bl foobar ++ b foobar ++ ++.data ++.xword foobar +--- /dev/null 2019-07-02 08:01:33.386842704 +0100 ++++ binutils-2.32/gas/testsuite/gas/aarch64/symbol-variant_pcs-2.d 2019-07-02 17:35:11.362824354 +0100 +@@ -0,0 +1,9 @@ ++#objdump: -t ++ ++.*: file format .* ++ ++SYMBOL TABLE: ++0+ l d \.text 0+ \.text ++0+ l d \.data 0+ \.data ++0+ l d \.bss 0+ \.bss ++0+ l \.text 0+ 0x80 foo +--- /dev/null 2019-07-02 08:01:33.386842704 +0100 ++++ binutils-2.32/gas/testsuite/gas/aarch64/symbol-variant_pcs-2.s 2019-07-02 17:35:11.362824354 +0100 +@@ -0,0 +1,4 @@ ++.text ++.variant_pcs foo ++foo: ++ ret +--- /dev/null 2019-07-02 08:01:33.386842704 +0100 ++++ binutils-2.32/gas/testsuite/gas/aarch64/symbol-variant_pcs-3.s 2019-07-02 17:35:45.202584620 +0100 +@@ -0,0 +1,20 @@ ++.text ++.global foo_vpcs ++.global foo_base ++.global alias_vpcs ++.global alias_base ++ ++.variant_pcs foo_vpcs ++.variant_pcs alias_vpcs ++ ++foo_vpcs: ++foo_base: ++ bl foo_vpcs ++ bl foo_base ++ bl alias_vpcs ++ bl alias_base ++ ++/* Check that the STO_AARCH64_VARIANT_PCS is not affected by .set. */ ++ ++.set alias_base, foo_vpcs ++.set alias_vpcs, foo_base +--- /dev/null 2019-07-02 08:01:33.386842704 +0100 ++++ binutils-2.32/gas/testsuite/gas/aarch64/symbol-variant_pcs-3.d 2019-07-02 17:35:45.202584620 +0100 +@@ -0,0 +1,12 @@ ++#objdump: -t ++ ++.*: file format .* ++ ++SYMBOL TABLE: ++0+ l d \.text 0+ \.text ++0+ l d \.data 0+ \.data ++0+ l d \.bss 0+ \.bss ++0+ g \.text 0+ 0x80 foo_vpcs ++0+ g \.text 0+ foo_base ++0+ g \.text 0+ 0x80 alias_vpcs ++0+ g \.text 0+ alias_base +--- /dev/null 2019-07-02 08:01:33.386842704 +0100 ++++ binutils-2.32/ld/testsuite/ld-aarch64/variant_pcs-1.s 2019-07-02 17:35:21.875749878 +0100 +@@ -0,0 +1,59 @@ ++.text ++ ++.variant_pcs f_spec_global_default_def ++.variant_pcs f_spec_global_default_undef ++.variant_pcs f_spec_global_hidden_def ++.variant_pcs f_spec_local ++.variant_pcs f_spec_global_default_ifunc ++.variant_pcs f_spec_global_hidden_ifunc ++.variant_pcs f_spec_local_ifunc ++ ++.global f_spec_global_default_def ++.global f_spec_global_default_undef ++.global f_spec_global_hidden_def ++.global f_spec_global_default_ifunc ++.global f_spec_global_hidden_ifunc ++.global f_base_global_default_def ++.global f_base_global_default_undef ++.global f_base_global_hidden_def ++.global f_base_global_default_ifunc ++.global f_base_global_hidden_ifunc ++ ++.hidden f_spec_global_hidden_def ++.hidden f_spec_global_hidden_ifunc ++.hidden f_base_global_hidden_def ++.hidden f_base_global_hidden_ifunc ++ ++.type f_spec_global_default_ifunc, %gnu_indirect_function ++.type f_spec_global_hidden_ifunc, %gnu_indirect_function ++.type f_spec_local_ifunc, %gnu_indirect_function ++.type f_base_global_default_ifunc, %gnu_indirect_function ++.type f_base_global_hidden_ifunc, %gnu_indirect_function ++.type f_base_local_ifunc, %gnu_indirect_function ++ ++f_spec_global_default_def: ++f_spec_global_hidden_def: ++f_spec_local: ++f_base_global_default_def: ++f_base_global_hidden_def: ++f_base_local: ++f_spec_global_default_ifunc: ++f_spec_global_hidden_ifunc: ++f_spec_local_ifunc: ++f_base_global_default_ifunc: ++f_base_global_hidden_ifunc: ++f_base_local_ifunc: ++ bl f_spec_global_default_def ++ bl f_spec_global_default_undef ++ bl f_spec_global_hidden_def ++ bl f_spec_local ++ bl f_base_global_default_def ++ bl f_base_global_default_undef ++ bl f_base_global_hidden_def ++ bl f_base_local ++ bl f_spec_global_default_ifunc ++ bl f_spec_global_hidden_ifunc ++ bl f_spec_local_ifunc ++ bl f_base_global_default_ifunc ++ bl f_base_global_hidden_ifunc ++ bl f_base_local_ifunc +--- /dev/null 2019-07-02 08:01:33.386842704 +0100 ++++ binutils-2.32/ld/testsuite/ld-aarch64/variant_pcs-2.s 2019-07-02 17:35:21.875749878 +0100 +@@ -0,0 +1,47 @@ ++.text ++ ++.variant_pcs f_spec_global_default_def ++.variant_pcs f_spec_global_default_undef ++.variant_pcs f_spec_global_hidden_def ++.variant_pcs f_spec_local2 ++.variant_pcs f_spec_global_default_ifunc ++.variant_pcs f_spec_global_hidden_ifunc ++.variant_pcs f_spec_local2_ifunc ++ ++.global f_spec_global_default_def ++.global f_spec_global_default_undef ++.global f_spec_global_hidden_def ++.global f_spec_global_default_ifunc ++.global f_spec_global_hidden_ifunc ++.global f_base_global_default_def ++.global f_base_global_default_undef ++.global f_base_global_hidden_def ++.global f_base_global_default_ifunc ++.global f_base_global_hidden_ifunc ++ ++.hidden f_spec_global_hidden_def ++.hidden f_spec_global_hidden_ifunc ++.hidden f_base_global_hidden_def ++.hidden f_base_global_hidden_ifunc ++ ++.type f_spec_local2_ifunc, %gnu_indirect_function ++.type f_base_local2_ifunc, %gnu_indirect_function ++ ++f_spec_local2: ++f_base_local2: ++f_spec_local2_ifunc: ++f_base_local2_ifunc: ++ bl f_spec_global_default_def ++ bl f_spec_global_default_undef ++ bl f_spec_global_hidden_def ++ bl f_spec_local2 ++ bl f_base_global_default_def ++ bl f_base_global_default_undef ++ bl f_base_global_hidden_def ++ bl f_base_local2 ++ bl f_spec_global_default_ifunc ++ bl f_spec_global_hidden_ifunc ++ bl f_spec_local2_ifunc ++ bl f_base_global_default_ifunc ++ bl f_base_global_hidden_ifunc ++ bl f_base_local2_ifunc +--- /dev/null 2019-07-02 08:01:33.386842704 +0100 ++++ binutils-2.32/ld/testsuite/ld-aarch64/variant_pcs.ld 2019-07-02 17:35:37.100642017 +0100 +@@ -0,0 +1,23 @@ ++/* Script for .variant_pcs symbol tests. */ ++OUTPUT_ARCH(aarch64) ++ENTRY(_start) ++SECTIONS ++{ ++ /* Read-only sections, merged into text segment: */ ++ PROVIDE (__executable_start = 0x8000); . = 0x8000; ++ .text : ++ { ++ *(.before) ++ *(.text) ++ *(.after) ++ } =0 ++ . = 0x9000; ++ .got : { *(.got) *(.got.plt)} ++ . = 0x10000; ++ .rela.dyn : { *(.rela.ifunc) } ++ . = 0x11000; ++ .rela.plt : { *(.rela.plt) *(.rela.iplt) } ++ . = 0x12340000; ++ .far : { *(.far) } ++ .ARM.attributes 0 : { *(.ARM.atttributes) } ++} +--- /dev/null 2019-07-02 08:01:33.386842704 +0100 ++++ binutils-2.32/ld/testsuite/ld-aarch64/variant_pcs-now.d 2019-07-02 17:34:37.557063849 +0100 +@@ -0,0 +1,67 @@ ++#source: variant_pcs-1.s ++#source: variant_pcs-2.s ++#ld: -shared --hash-style=sysv -T variant_pcs.ld -z now ++#readelf: -rsW ++ ++Relocation section '\.rela\.plt' at offset 0x11000 contains 12 entries: ++ Offset Info Type Symbol's Value Symbol's Name \+ Addend ++0000000000009020 0000000100000402 R_AARCH64_JUMP_SLOT 0000000000000000 f_base_global_default_undef \+ 0 ++0000000000009028 0000000200000402 R_AARCH64_JUMP_SLOT 0000000000000000 f_spec_global_default_undef \+ 0 ++0000000000009030 0000000400000402 R_AARCH64_JUMP_SLOT 0000000000008000 f_base_global_default_def \+ 0 ++0000000000009038 0000000500000402 R_AARCH64_JUMP_SLOT 0000000000008000 f_spec_global_default_def \+ 0 ++0000000000009040 0000000000000408 R_AARCH64_IRELATIVE 8000 ++0000000000009048 0000000300000402 R_AARCH64_JUMP_SLOT f_spec_global_default_ifunc\(\) f_spec_global_default_ifunc \+ 0 ++0000000000009050 0000000000000408 R_AARCH64_IRELATIVE 8000 ++0000000000009058 0000000600000402 R_AARCH64_JUMP_SLOT f_base_global_default_ifunc\(\) f_base_global_default_ifunc \+ 0 ++0000000000009060 0000000000000408 R_AARCH64_IRELATIVE 8038 ++0000000000009068 0000000000000408 R_AARCH64_IRELATIVE 8000 ++0000000000009070 0000000000000408 R_AARCH64_IRELATIVE 8000 ++0000000000009078 0000000000000408 R_AARCH64_IRELATIVE 8038 ++ ++Symbol table '\.dynsym' contains 7 entries: ++ Num: Value Size Type Bind Vis Ndx Name ++ 0: 0000000000000000 0 NOTYPE LOCAL DEFAULT UND ++ 1: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND f_base_global_default_undef ++ 2: 0000000000000000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] UND f_spec_global_default_undef ++ 3: 0000000000008000 0 IFUNC GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_ifunc ++ 4: 0000000000008000 0 NOTYPE GLOBAL DEFAULT 1 f_base_global_default_def ++ 5: 0000000000008000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_def ++ 6: 0000000000008000 0 IFUNC GLOBAL DEFAULT 1 f_base_global_default_ifunc ++ ++Symbol table '\.symtab' contains 35 entries: ++ Num: Value Size Type Bind Vis Ndx Name ++ 0: 0000000000000000 0 NOTYPE LOCAL DEFAULT UND ++ 1: 0000000000008000 0 SECTION LOCAL DEFAULT 1 ++ 2: 0000000000008070 0 SECTION LOCAL DEFAULT 2 ++ 3: 0000000000009000 0 SECTION LOCAL DEFAULT 3 ++ 4: 0000000000009080 0 SECTION LOCAL DEFAULT 4 ++ 5: 0000000000011000 0 SECTION LOCAL DEFAULT 5 ++ 6: 0000000000011120 0 SECTION LOCAL DEFAULT 6 ++ 7: 00000000000111c8 0 SECTION LOCAL DEFAULT 7 ++ 8: 0000000000011270 0 SECTION LOCAL DEFAULT 8 ++ 9: 0000000000000000 0 FILE LOCAL DEFAULT ABS .*variant_pcs-1\.o ++ 10: 0000000000008000 0 NOTYPE LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local ++ 11: 0000000000008000 0 IFUNC LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local_ifunc ++ 12: 0000000000008000 0 IFUNC LOCAL DEFAULT 1 f_base_local_ifunc ++ 13: 0000000000008000 0 NOTYPE LOCAL DEFAULT 1 f_base_local ++ 14: 0000000000008000 0 NOTYPE LOCAL DEFAULT 1 \$x ++ 15: 0000000000000000 0 FILE LOCAL DEFAULT ABS .*variant_pcs-2\.o ++ 16: 0000000000008038 0 NOTYPE LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local2 ++ 17: 0000000000008038 0 IFUNC LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local2_ifunc ++ 18: 0000000000008038 0 IFUNC LOCAL DEFAULT 1 f_base_local2_ifunc ++ 19: 0000000000008038 0 NOTYPE LOCAL DEFAULT 1 f_base_local2 ++ 20: 0000000000008038 0 NOTYPE LOCAL DEFAULT 1 \$x ++ 21: 0000000000000000 0 FILE LOCAL DEFAULT ABS ++ 22: 0000000000009080 0 OBJECT LOCAL DEFAULT ABS _DYNAMIC ++ 23: 0000000000008000 0 NOTYPE LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_hidden_def ++ 24: 0000000000008000 0 IFUNC LOCAL DEFAULT 1 f_base_global_hidden_ifunc ++ 25: 0000000000008000 0 NOTYPE LOCAL DEFAULT 1 f_base_global_hidden_def ++ 26: 0000000000009000 0 OBJECT LOCAL DEFAULT ABS _GLOBAL_OFFSET_TABLE_ ++ 27: 0000000000008000 0 IFUNC LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_hidden_ifunc ++ 28: 0000000000008070 0 NOTYPE LOCAL DEFAULT 2 \$x ++ 29: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND f_base_global_default_undef ++ 30: 0000000000000000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] UND f_spec_global_default_undef ++ 31: 0000000000008000 0 IFUNC GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_ifunc ++ 32: 0000000000008000 0 NOTYPE GLOBAL DEFAULT 1 f_base_global_default_def ++ 33: 0000000000008000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_def ++ 34: 0000000000008000 0 IFUNC GLOBAL DEFAULT 1 f_base_global_default_ifunc +--- /dev/null 2019-07-02 08:01:33.386842704 +0100 ++++ binutils-2.32/ld/testsuite/ld-aarch64/variant_pcs-r.d 2019-07-02 17:35:35.244655166 +0100 +@@ -0,0 +1,60 @@ ++#source: variant_pcs-1.s ++#source: variant_pcs-2.s ++#ld: -r ++#readelf: -rsW ++ ++Relocation section '\.rela\.text' at offset .* contains 24 entries: ++ Offset Info Type Symbol's Value Symbol's Name \+ Addend ++0000000000000000 000000180000011b R_AARCH64_CALL26 0000000000000000 f_spec_global_default_def \+ 0 ++0000000000000004 000000110000011b R_AARCH64_CALL26 0000000000000000 f_spec_global_default_undef \+ 0 ++0000000000000008 000000120000011b R_AARCH64_CALL26 0000000000000000 f_spec_global_hidden_def \+ 0 ++0000000000000010 000000170000011b R_AARCH64_CALL26 0000000000000000 f_base_global_default_def \+ 0 ++0000000000000014 000000100000011b R_AARCH64_CALL26 0000000000000000 f_base_global_default_undef \+ 0 ++0000000000000018 000000150000011b R_AARCH64_CALL26 0000000000000000 f_base_global_hidden_def \+ 0 ++0000000000000020 000000140000011b R_AARCH64_CALL26 f_spec_global_default_ifunc\(\) f_spec_global_default_ifunc \+ 0 ++0000000000000024 000000160000011b R_AARCH64_CALL26 f_spec_global_hidden_ifunc\(\) f_spec_global_hidden_ifunc \+ 0 ++0000000000000028 000000060000011b R_AARCH64_CALL26 f_spec_local_ifunc\(\) f_spec_local_ifunc \+ 0 ++000000000000002c 000000190000011b R_AARCH64_CALL26 f_base_global_default_ifunc\(\) f_base_global_default_ifunc \+ 0 ++0000000000000030 000000130000011b R_AARCH64_CALL26 f_base_global_hidden_ifunc\(\) f_base_global_hidden_ifunc \+ 0 ++0000000000000034 000000070000011b R_AARCH64_CALL26 f_base_local_ifunc\(\) f_base_local_ifunc \+ 0 ++0000000000000038 000000180000011b R_AARCH64_CALL26 0000000000000000 f_spec_global_default_def \+ 0 ++000000000000003c 000000110000011b R_AARCH64_CALL26 0000000000000000 f_spec_global_default_undef \+ 0 ++0000000000000040 000000120000011b R_AARCH64_CALL26 0000000000000000 f_spec_global_hidden_def \+ 0 ++0000000000000048 000000170000011b R_AARCH64_CALL26 0000000000000000 f_base_global_default_def \+ 0 ++000000000000004c 000000100000011b R_AARCH64_CALL26 0000000000000000 f_base_global_default_undef \+ 0 ++0000000000000050 000000150000011b R_AARCH64_CALL26 0000000000000000 f_base_global_hidden_def \+ 0 ++0000000000000058 000000140000011b R_AARCH64_CALL26 f_spec_global_default_ifunc\(\) f_spec_global_default_ifunc \+ 0 ++000000000000005c 000000160000011b R_AARCH64_CALL26 f_spec_global_hidden_ifunc\(\) f_spec_global_hidden_ifunc \+ 0 ++0000000000000060 0000000c0000011b R_AARCH64_CALL26 f_spec_local2_ifunc\(\) f_spec_local2_ifunc \+ 0 ++0000000000000064 000000190000011b R_AARCH64_CALL26 f_base_global_default_ifunc\(\) f_base_global_default_ifunc \+ 0 ++0000000000000068 000000130000011b R_AARCH64_CALL26 f_base_global_hidden_ifunc\(\) f_base_global_hidden_ifunc \+ 0 ++000000000000006c 0000000d0000011b R_AARCH64_CALL26 f_base_local2_ifunc\(\) f_base_local2_ifunc \+ 0 ++ ++Symbol table '\.symtab' contains 26 entries: ++ Num: Value Size Type Bind Vis Ndx Name ++ 0: 0000000000000000 0 NOTYPE LOCAL DEFAULT UND ++ 1: 0000000000000000 0 SECTION LOCAL DEFAULT 1 ++ 2: 0000000000000000 0 SECTION LOCAL DEFAULT 3 ++ 3: 0000000000000000 0 SECTION LOCAL DEFAULT 4 ++ 4: 0000000000000000 0 FILE LOCAL DEFAULT ABS .*variant_pcs-1\.o ++ 5: 0000000000000000 0 NOTYPE LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local ++ 6: 0000000000000000 0 IFUNC LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local_ifunc ++ 7: 0000000000000000 0 IFUNC LOCAL DEFAULT 1 f_base_local_ifunc ++ 8: 0000000000000000 0 NOTYPE LOCAL DEFAULT 1 f_base_local ++ 9: 0000000000000000 0 NOTYPE LOCAL DEFAULT 1 \$x ++ 10: 0000000000000000 0 FILE LOCAL DEFAULT ABS .*variant_pcs-2\.o ++ 11: 0000000000000038 0 NOTYPE LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local2 ++ 12: 0000000000000038 0 IFUNC LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local2_ifunc ++ 13: 0000000000000038 0 IFUNC LOCAL DEFAULT 1 f_base_local2_ifunc ++ 14: 0000000000000038 0 NOTYPE LOCAL DEFAULT 1 f_base_local2 ++ 15: 0000000000000038 0 NOTYPE LOCAL DEFAULT 1 \$x ++ 16: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND f_base_global_default_undef ++ 17: 0000000000000000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] UND f_spec_global_default_undef ++ 18: 0000000000000000 0 NOTYPE GLOBAL HIDDEN \[VARIANT_PCS\] 1 f_spec_global_hidden_def ++ 19: 0000000000000000 0 IFUNC GLOBAL HIDDEN 1 f_base_global_hidden_ifunc ++ 20: 0000000000000000 0 IFUNC GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_ifunc ++ 21: 0000000000000000 0 NOTYPE GLOBAL HIDDEN 1 f_base_global_hidden_def ++ 22: 0000000000000000 0 IFUNC GLOBAL HIDDEN \[VARIANT_PCS\] 1 f_spec_global_hidden_ifunc ++ 23: 0000000000000000 0 NOTYPE GLOBAL DEFAULT 1 f_base_global_default_def ++ 24: 0000000000000000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_def ++ 25: 0000000000000000 0 IFUNC GLOBAL DEFAULT 1 f_base_global_default_ifunc +--- /dev/null 2019-07-02 08:01:33.386842704 +0100 ++++ binutils-2.32/ld/testsuite/ld-aarch64/variant_pcs-shared.d 2019-07-02 17:34:45.635006622 +0100 +@@ -0,0 +1,67 @@ ++#source: variant_pcs-1.s ++#source: variant_pcs-2.s ++#ld: -shared --hash-style=sysv -T variant_pcs.ld ++#readelf: -rsW ++ ++Relocation section '\.rela\.plt' at offset 0x11000 contains 12 entries: ++ Offset Info Type Symbol's Value Symbol's Name \+ Addend ++0000000000009020 0000000100000402 R_AARCH64_JUMP_SLOT 0000000000000000 f_base_global_default_undef \+ 0 ++0000000000009028 0000000200000402 R_AARCH64_JUMP_SLOT 0000000000000000 f_spec_global_default_undef \+ 0 ++0000000000009030 0000000400000402 R_AARCH64_JUMP_SLOT 0000000000008000 f_base_global_default_def \+ 0 ++0000000000009038 0000000500000402 R_AARCH64_JUMP_SLOT 0000000000008000 f_spec_global_default_def \+ 0 ++0000000000009040 0000000000000408 R_AARCH64_IRELATIVE 8000 ++0000000000009048 0000000300000402 R_AARCH64_JUMP_SLOT f_spec_global_default_ifunc\(\) f_spec_global_default_ifunc \+ 0 ++0000000000009050 0000000000000408 R_AARCH64_IRELATIVE 8000 ++0000000000009058 0000000600000402 R_AARCH64_JUMP_SLOT f_base_global_default_ifunc\(\) f_base_global_default_ifunc \+ 0 ++0000000000009060 0000000000000408 R_AARCH64_IRELATIVE 8038 ++0000000000009068 0000000000000408 R_AARCH64_IRELATIVE 8000 ++0000000000009070 0000000000000408 R_AARCH64_IRELATIVE 8000 ++0000000000009078 0000000000000408 R_AARCH64_IRELATIVE 8038 ++ ++Symbol table '\.dynsym' contains 7 entries: ++ Num: Value Size Type Bind Vis Ndx Name ++ 0: 0000000000000000 0 NOTYPE LOCAL DEFAULT UND ++ 1: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND f_base_global_default_undef ++ 2: 0000000000000000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] UND f_spec_global_default_undef ++ 3: 0000000000008000 0 IFUNC GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_ifunc ++ 4: 0000000000008000 0 NOTYPE GLOBAL DEFAULT 1 f_base_global_default_def ++ 5: 0000000000008000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_def ++ 6: 0000000000008000 0 IFUNC GLOBAL DEFAULT 1 f_base_global_default_ifunc ++ ++Symbol table '\.symtab' contains 35 entries: ++ Num: Value Size Type Bind Vis Ndx Name ++ 0: 0000000000000000 0 NOTYPE LOCAL DEFAULT UND ++ 1: 0000000000008000 0 SECTION LOCAL DEFAULT 1 ++ 2: 0000000000008070 0 SECTION LOCAL DEFAULT 2 ++ 3: 0000000000009000 0 SECTION LOCAL DEFAULT 3 ++ 4: 0000000000009080 0 SECTION LOCAL DEFAULT 4 ++ 5: 0000000000011000 0 SECTION LOCAL DEFAULT 5 ++ 6: 0000000000011120 0 SECTION LOCAL DEFAULT 6 ++ 7: 00000000000111c8 0 SECTION LOCAL DEFAULT 7 ++ 8: 0000000000011270 0 SECTION LOCAL DEFAULT 8 ++ 9: 0000000000000000 0 FILE LOCAL DEFAULT ABS .*variant_pcs-1\.o ++ 10: 0000000000008000 0 NOTYPE LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local ++ 11: 0000000000008000 0 IFUNC LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local_ifunc ++ 12: 0000000000008000 0 IFUNC LOCAL DEFAULT 1 f_base_local_ifunc ++ 13: 0000000000008000 0 NOTYPE LOCAL DEFAULT 1 f_base_local ++ 14: 0000000000008000 0 NOTYPE LOCAL DEFAULT 1 \$x ++ 15: 0000000000000000 0 FILE LOCAL DEFAULT ABS .*variant_pcs-2\.o ++ 16: 0000000000008038 0 NOTYPE LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local2 ++ 17: 0000000000008038 0 IFUNC LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local2_ifunc ++ 18: 0000000000008038 0 IFUNC LOCAL DEFAULT 1 f_base_local2_ifunc ++ 19: 0000000000008038 0 NOTYPE LOCAL DEFAULT 1 f_base_local2 ++ 20: 0000000000008038 0 NOTYPE LOCAL DEFAULT 1 \$x ++ 21: 0000000000000000 0 FILE LOCAL DEFAULT ABS ++ 22: 0000000000009080 0 OBJECT LOCAL DEFAULT ABS _DYNAMIC ++ 23: 0000000000008000 0 NOTYPE LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_hidden_def ++ 24: 0000000000008000 0 IFUNC LOCAL DEFAULT 1 f_base_global_hidden_ifunc ++ 25: 0000000000008000 0 NOTYPE LOCAL DEFAULT 1 f_base_global_hidden_def ++ 26: 0000000000009000 0 OBJECT LOCAL DEFAULT ABS _GLOBAL_OFFSET_TABLE_ ++ 27: 0000000000008000 0 IFUNC LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_hidden_ifunc ++ 28: 0000000000008070 0 NOTYPE LOCAL DEFAULT 2 \$x ++ 29: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND f_base_global_default_undef ++ 30: 0000000000000000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] UND f_spec_global_default_undef ++ 31: 0000000000008000 0 IFUNC GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_ifunc ++ 32: 0000000000008000 0 NOTYPE GLOBAL DEFAULT 1 f_base_global_default_def ++ 33: 0000000000008000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_def ++ 34: 0000000000008000 0 IFUNC GLOBAL DEFAULT 1 f_base_global_default_ifunc +diff -rup binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-now.d binutils-2.32/ld/testsuite/ld-aarch64/variant_pcs-now.d +--- binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-now.d 2019-07-03 10:06:20.012412075 +0100 ++++ binutils-2.32/ld/testsuite/ld-aarch64/variant_pcs-now.d 2019-07-03 10:20:51.959203582 +0100 +@@ -22,10 +22,10 @@ Symbol table '\.dynsym' contains 7 entri + Num: Value Size Type Bind Vis Ndx Name + 0: 0000000000000000 0 NOTYPE LOCAL DEFAULT UND + 1: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND f_base_global_default_undef +- 2: 0000000000000000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] UND f_spec_global_default_undef +- 3: 0000000000008000 0 IFUNC GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_ifunc ++ 2: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND f_spec_global_default_undef \[VARIANT_PCS\] ++ 3: 0000000000008000 0 IFUNC GLOBAL DEFAULT 1 f_spec_global_default_ifunc \[VARIANT_PCS\] + 4: 0000000000008000 0 NOTYPE GLOBAL DEFAULT 1 f_base_global_default_def +- 5: 0000000000008000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_def ++ 5: 0000000000008000 0 NOTYPE GLOBAL DEFAULT 1 f_spec_global_default_def \[VARIANT_PCS\] + 6: 0000000000008000 0 IFUNC GLOBAL DEFAULT 1 f_base_global_default_ifunc + + Symbol table '\.symtab' contains 35 entries: +@@ -40,28 +40,28 @@ Symbol table '\.symtab' contains 35 entr + 7: 00000000000111c8 0 SECTION LOCAL DEFAULT 7 + 8: 0000000000011270 0 SECTION LOCAL DEFAULT 8 + 9: 0000000000000000 0 FILE LOCAL DEFAULT ABS .*variant_pcs-1\.o +- 10: 0000000000008000 0 NOTYPE LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local +- 11: 0000000000008000 0 IFUNC LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local_ifunc ++ 10: 0000000000008000 0 NOTYPE LOCAL DEFAULT 1 f_spec_local \[VARIANT_PCS\] ++ 11: 0000000000008000 0 IFUNC LOCAL DEFAULT 1 f_spec_local_ifunc \[VARIANT_PCS\] + 12: 0000000000008000 0 IFUNC LOCAL DEFAULT 1 f_base_local_ifunc + 13: 0000000000008000 0 NOTYPE LOCAL DEFAULT 1 f_base_local + 14: 0000000000008000 0 NOTYPE LOCAL DEFAULT 1 \$x + 15: 0000000000000000 0 FILE LOCAL DEFAULT ABS .*variant_pcs-2\.o +- 16: 0000000000008038 0 NOTYPE LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local2 +- 17: 0000000000008038 0 IFUNC LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local2_ifunc ++ 16: 0000000000008038 0 NOTYPE LOCAL DEFAULT 1 f_spec_local2 \[VARIANT_PCS\] ++ 17: 0000000000008038 0 IFUNC LOCAL DEFAULT 1 f_spec_local2_ifunc \[VARIANT_PCS\] + 18: 0000000000008038 0 IFUNC LOCAL DEFAULT 1 f_base_local2_ifunc + 19: 0000000000008038 0 NOTYPE LOCAL DEFAULT 1 f_base_local2 + 20: 0000000000008038 0 NOTYPE LOCAL DEFAULT 1 \$x + 21: 0000000000000000 0 FILE LOCAL DEFAULT ABS + 22: 0000000000009080 0 OBJECT LOCAL DEFAULT ABS _DYNAMIC +- 23: 0000000000008000 0 NOTYPE LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_hidden_def ++ 23: 0000000000008000 0 NOTYPE LOCAL DEFAULT 1 f_spec_global_hidden_def \[VARIANT_PCS\] + 24: 0000000000008000 0 IFUNC LOCAL DEFAULT 1 f_base_global_hidden_ifunc + 25: 0000000000008000 0 NOTYPE LOCAL DEFAULT 1 f_base_global_hidden_def + 26: 0000000000009000 0 OBJECT LOCAL DEFAULT ABS _GLOBAL_OFFSET_TABLE_ +- 27: 0000000000008000 0 IFUNC LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_hidden_ifunc ++ 27: 0000000000008000 0 IFUNC LOCAL DEFAULT 1 f_spec_global_hidden_ifunc \[VARIANT_PCS\] + 28: 0000000000008070 0 NOTYPE LOCAL DEFAULT 2 \$x + 29: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND f_base_global_default_undef +- 30: 0000000000000000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] UND f_spec_global_default_undef +- 31: 0000000000008000 0 IFUNC GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_ifunc ++ 30: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND f_spec_global_default_undef \[VARIANT_PCS\] ++ 31: 0000000000008000 0 IFUNC GLOBAL DEFAULT 1 f_spec_global_default_ifunc \[VARIANT_PCS\] + 32: 0000000000008000 0 NOTYPE GLOBAL DEFAULT 1 f_base_global_default_def +- 33: 0000000000008000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_def ++ 33: 0000000000008000 0 NOTYPE GLOBAL DEFAULT 1 f_spec_global_default_def \[VARIANT_PCS\] + 34: 0000000000008000 0 IFUNC GLOBAL DEFAULT 1 f_base_global_default_ifunc +diff -rup binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-r.d binutils-2.32/ld/testsuite/ld-aarch64/variant_pcs-r.d +--- binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-r.d 2019-07-03 10:06:20.012412075 +0100 ++++ binutils-2.32/ld/testsuite/ld-aarch64/variant_pcs-r.d 2019-07-03 10:14:28.152933189 +0100 +@@ -37,24 +37,24 @@ Symbol table '\.symtab' contains 26 entr + 2: 0000000000000000 0 SECTION LOCAL DEFAULT 3 + 3: 0000000000000000 0 SECTION LOCAL DEFAULT 4 + 4: 0000000000000000 0 FILE LOCAL DEFAULT ABS .*variant_pcs-1\.o +- 5: 0000000000000000 0 NOTYPE LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local +- 6: 0000000000000000 0 IFUNC LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local_ifunc ++ 5: 0000000000000000 0 NOTYPE LOCAL DEFAULT 1 f_spec_local \[VARIANT_PCS\] ++ 6: 0000000000000000 0 IFUNC LOCAL DEFAULT 1 f_spec_local_ifunc \[VARIANT_PCS\] + 7: 0000000000000000 0 IFUNC LOCAL DEFAULT 1 f_base_local_ifunc + 8: 0000000000000000 0 NOTYPE LOCAL DEFAULT 1 f_base_local + 9: 0000000000000000 0 NOTYPE LOCAL DEFAULT 1 \$x + 10: 0000000000000000 0 FILE LOCAL DEFAULT ABS .*variant_pcs-2\.o +- 11: 0000000000000038 0 NOTYPE LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local2 +- 12: 0000000000000038 0 IFUNC LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local2_ifunc ++ 11: 0000000000000038 0 NOTYPE LOCAL DEFAULT 1 f_spec_local2 \[VARIANT_PCS\] ++ 12: 0000000000000038 0 IFUNC LOCAL DEFAULT 1 f_spec_local2_ifunc \[VARIANT_PCS\] + 13: 0000000000000038 0 IFUNC LOCAL DEFAULT 1 f_base_local2_ifunc + 14: 0000000000000038 0 NOTYPE LOCAL DEFAULT 1 f_base_local2 + 15: 0000000000000038 0 NOTYPE LOCAL DEFAULT 1 \$x + 16: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND f_base_global_default_undef +- 17: 0000000000000000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] UND f_spec_global_default_undef +- 18: 0000000000000000 0 NOTYPE GLOBAL HIDDEN \[VARIANT_PCS\] 1 f_spec_global_hidden_def ++ 17: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND f_spec_global_default_undef \[VARIANT_PCS\] ++ 18: 0000000000000000 0 NOTYPE GLOBAL HIDDEN 1 f_spec_global_hidden_def \[VARIANT_PCS\] + 19: 0000000000000000 0 IFUNC GLOBAL HIDDEN 1 f_base_global_hidden_ifunc +- 20: 0000000000000000 0 IFUNC GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_ifunc ++ 20: 0000000000000000 0 IFUNC GLOBAL DEFAULT 1 f_spec_global_default_ifunc \[VARIANT_PCS\] + 21: 0000000000000000 0 NOTYPE GLOBAL HIDDEN 1 f_base_global_hidden_def +- 22: 0000000000000000 0 IFUNC GLOBAL HIDDEN \[VARIANT_PCS\] 1 f_spec_global_hidden_ifunc ++ 22: 0000000000000000 0 IFUNC GLOBAL HIDDEN 1 f_spec_global_hidden_ifunc \[VARIANT_PCS\] + 23: 0000000000000000 0 NOTYPE GLOBAL DEFAULT 1 f_base_global_default_def +- 24: 0000000000000000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_def ++ 24: 0000000000000000 0 NOTYPE GLOBAL DEFAULT 1 f_spec_global_default_def \[VARIANT_PCS\] + 25: 0000000000000000 0 IFUNC GLOBAL DEFAULT 1 f_base_global_default_ifunc +diff -rup binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-shared.d binutils-2.32/ld/testsuite/ld-aarch64/variant_pcs-shared.d +--- binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-shared.d 2019-07-03 10:06:20.012412075 +0100 ++++ binutils-2.32/ld/testsuite/ld-aarch64/variant_pcs-shared.d 2019-07-03 10:19:00.760994532 +0100 +@@ -22,10 +22,10 @@ Symbol table '\.dynsym' contains 7 entri + Num: Value Size Type Bind Vis Ndx Name + 0: 0000000000000000 0 NOTYPE LOCAL DEFAULT UND + 1: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND f_base_global_default_undef +- 2: 0000000000000000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] UND f_spec_global_default_undef +- 3: 0000000000008000 0 IFUNC GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_ifunc ++ 2: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND f_spec_global_default_undef \[VARIANT_PCS\] ++ 3: 0000000000008000 0 IFUNC GLOBAL DEFAULT 1 f_spec_global_default_ifunc \[VARIANT_PCS\] + 4: 0000000000008000 0 NOTYPE GLOBAL DEFAULT 1 f_base_global_default_def +- 5: 0000000000008000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_def ++ 5: 0000000000008000 0 NOTYPE GLOBAL DEFAULT 1 f_spec_global_default_def \[VARIANT_PCS\] + 6: 0000000000008000 0 IFUNC GLOBAL DEFAULT 1 f_base_global_default_ifunc + + Symbol table '\.symtab' contains 35 entries: +@@ -40,28 +40,28 @@ Symbol table '\.symtab' contains 35 entr + 7: 00000000000111c8 0 SECTION LOCAL DEFAULT 7 + 8: 0000000000011270 0 SECTION LOCAL DEFAULT 8 + 9: 0000000000000000 0 FILE LOCAL DEFAULT ABS .*variant_pcs-1\.o +- 10: 0000000000008000 0 NOTYPE LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local +- 11: 0000000000008000 0 IFUNC LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local_ifunc ++ 10: 0000000000008000 0 NOTYPE LOCAL DEFAULT 1 f_spec_local \[VARIANT_PCS\] ++ 11: 0000000000008000 0 IFUNC LOCAL DEFAULT 1 f_spec_local_ifunc \[VARIANT_PCS\] + 12: 0000000000008000 0 IFUNC LOCAL DEFAULT 1 f_base_local_ifunc + 13: 0000000000008000 0 NOTYPE LOCAL DEFAULT 1 f_base_local + 14: 0000000000008000 0 NOTYPE LOCAL DEFAULT 1 \$x + 15: 0000000000000000 0 FILE LOCAL DEFAULT ABS .*variant_pcs-2\.o +- 16: 0000000000008038 0 NOTYPE LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local2 +- 17: 0000000000008038 0 IFUNC LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local2_ifunc ++ 16: 0000000000008038 0 NOTYPE LOCAL DEFAULT 1 f_spec_local2 \[VARIANT_PCS\] ++ 17: 0000000000008038 0 IFUNC LOCAL DEFAULT 1 f_spec_local2_ifunc \[VARIANT_PCS\] + 18: 0000000000008038 0 IFUNC LOCAL DEFAULT 1 f_base_local2_ifunc + 19: 0000000000008038 0 NOTYPE LOCAL DEFAULT 1 f_base_local2 + 20: 0000000000008038 0 NOTYPE LOCAL DEFAULT 1 \$x + 21: 0000000000000000 0 FILE LOCAL DEFAULT ABS + 22: 0000000000009080 0 OBJECT LOCAL DEFAULT ABS _DYNAMIC +- 23: 0000000000008000 0 NOTYPE LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_hidden_def ++ 23: 0000000000008000 0 NOTYPE LOCAL DEFAULT 1 f_spec_global_hidden_def \[VARIANT_PCS\] + 24: 0000000000008000 0 IFUNC LOCAL DEFAULT 1 f_base_global_hidden_ifunc + 25: 0000000000008000 0 NOTYPE LOCAL DEFAULT 1 f_base_global_hidden_def + 26: 0000000000009000 0 OBJECT LOCAL DEFAULT ABS _GLOBAL_OFFSET_TABLE_ +- 27: 0000000000008000 0 IFUNC LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_hidden_ifunc ++ 27: 0000000000008000 0 IFUNC LOCAL DEFAULT 1 f_spec_global_hidden_ifunc \[VARIANT_PCS\] + 28: 0000000000008070 0 NOTYPE LOCAL DEFAULT 2 \$x + 29: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND f_base_global_default_undef +- 30: 0000000000000000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] UND f_spec_global_default_undef +- 31: 0000000000008000 0 IFUNC GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_ifunc ++ 30: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND f_spec_global_default_undef \[VARIANT_PCS\] ++ 31: 0000000000008000 0 IFUNC GLOBAL DEFAULT 1 f_spec_global_default_ifunc \[VARIANT_PCS\] + 32: 0000000000008000 0 NOTYPE GLOBAL DEFAULT 1 f_base_global_default_def +- 33: 0000000000008000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_def ++ 33: 0000000000008000 0 NOTYPE GLOBAL DEFAULT 1 f_spec_global_default_def \[VARIANT_PCS\] + 34: 0000000000008000 0 IFUNC GLOBAL DEFAULT 1 f_base_global_default_ifunc diff --git a/SOURCES/binutils-attach-to-group.patch b/SOURCES/binutils-attach-to-group.patch new file mode 100644 index 0000000..6226525 --- /dev/null +++ b/SOURCES/binutils-attach-to-group.patch @@ -0,0 +1,68 @@ +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.texinfo 2018-09-24 17:50:06.984172788 +0100 ++++ binutils-2.30/gas/doc/as.texinfo 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}} + +Only in binutils-2.30/gas/doc: as.texinfo.orig diff --git a/SOURCES/binutils-coverity-fixes.patch b/SOURCES/binutils-coverity-fixes.patch new file mode 100644 index 0000000..328ea45 --- /dev/null +++ b/SOURCES/binutils-coverity-fixes.patch @@ -0,0 +1,2307 @@ +--- binutils.orig/bfd/archive.c 2019-10-04 15:26:08.544327573 +0100 ++++ binutils-2.30/bfd/archive.c 2019-10-04 16:58:45.088039134 +0100 +@@ -734,6 +734,9 @@ _bfd_get_elt_at_filepos (bfd *archive, f + /* Copy is_linker_input. */ + n_bfd->is_linker_input = archive->is_linker_input; + ++ /* Coverity does not realise that _bfd_add_bfd_to_archive_cache actually ++ stores the newly created bfd and so flags a resource leak. */ ++ /* coverity[noescape: FALSE] */ + if (_bfd_add_bfd_to_archive_cache (archive, filepos, n_bfd)) + return n_bfd; + +diff -rup binutils.orig/bfd/coffcode.h binutils-2.30/bfd/coffcode.h +--- binutils.orig/bfd/coffcode.h 2019-10-07 15:49:39.425618524 +0100 ++++ binutils-2.30/bfd/coffcode.h 2019-10-07 15:53:18.335157361 +0100 +@@ -3737,6 +3737,9 @@ coff_write_object_contents (bfd * abfd) + + internal_f.f_nscns++; + ++ /* Coverity flags this strncpy as possibly creating a string ++ that is not NUL terminated. This is in fact OK. */ ++ /* coverity[buffer_size_warning: FALSE] */ + strncpy (section.s_name, current->name, SCNNMLEN); + + #ifdef COFF_LONG_SECTION_NAMES +@@ -3775,6 +3778,9 @@ coff_write_object_contents (bfd * abfd) + buffer, just in case. */ + sprintf (s_name_buf, "/%lu", (unsigned long) string_size); + /* Then strncpy takes care of any padding for us. */ ++ /* Coverity flags this strncpy as possibly creating a string ++ that is not NUL terminated. This is in fact OK. */ ++ /* coverity[buffer_size_warning: FALSE] */ + strncpy (section.s_name, s_name_buf, SCNNMLEN); + string_size += len + 1; + long_section_names = TRUE; +diff -rup binutils.orig/bfd/coffgen.c binutils-2.30/bfd/coffgen.c +--- binutils.orig/bfd/coffgen.c 2019-10-07 15:49:37.845629069 +0100 ++++ binutils-2.30/bfd/coffgen.c 2019-10-07 15:53:46.443969714 +0100 +@@ -923,6 +923,9 @@ coff_fix_symbol_name (bfd *abfd, + { + if (name_length <= SYMNMLEN && !bfd_coff_force_symnames_in_strings (abfd)) + /* This name will fit into the symbol neatly. */ ++ /* Coverity flags this strncpy as possibly creating a string ++ that is not NUL terminated. This is in fact OK. */ ++ /* coverity[buffer_size_warning: FALSE] */ + strncpy (native->u.syment._n._n_name, symbol->name, SYMNMLEN); + + else if (!bfd_coff_symname_in_debug (abfd, &native->u.syment)) +diff -rup binutils.orig/bfd/cofflink.c binutils-2.30/bfd/cofflink.c +--- binutils.orig/bfd/cofflink.c 2019-10-07 15:49:37.565630938 +0100 ++++ binutils-2.30/bfd/cofflink.c 2019-10-07 15:54:21.177736099 +0100 +@@ -2633,6 +2633,9 @@ _bfd_coff_write_global_sym (struct bfd_h + } + + if (strlen (h->root.root.string) <= SYMNMLEN) ++ /* Coverity flags this strncpy as possibly creating a string ++ that is not NUL terminated. This is in fact OK. */ ++ /* coverity[buffer_size_warning: FALSE] */ + strncpy (isym._n._n_name, h->root.root.string, SYMNMLEN); + else + { +diff -rup binutils.orig/bfd/elf64-x86-64.c binutils-2.30/bfd/elf64-x86-64.c +--- binutils.orig/bfd/elf64-x86-64.c 2019-10-07 15:49:38.144627073 +0100 ++++ binutils-2.30/bfd/elf64-x86-64.c 2019-10-07 15:56:53.559674302 +0100 +@@ -463,7 +463,13 @@ elf_x86_64_write_core_note (bfd *abfd, c + { + prpsinfo32_t data; + memset (&data, 0, sizeof (data)); ++ /* Coverity flags this strncpy as possibly creating a string ++ that is not NUL terminated. This is in fact OK. */ ++ /* coverity[buffer_size_warning: FALSE] */ + strncpy (data.pr_fname, fname, sizeof (data.pr_fname)); ++ /* Coverity flags this strncpy as possibly creating a string ++ that is not NUL terminated. This is in fact OK. */ ++ /* coverity[buffer_size_warning: FALSE] */ + strncpy (data.pr_psargs, psargs, sizeof (data.pr_psargs)); + return elfcore_write_note (abfd, buf, bufsiz, "CORE", note_type, + &data, sizeof (data)); +@@ -472,7 +478,13 @@ elf_x86_64_write_core_note (bfd *abfd, c + { + prpsinfo64_t data; + memset (&data, 0, sizeof (data)); ++ /* Coverity flags this strncpy as possibly creating a string ++ that is not NUL terminated. This is in fact OK. */ ++ /* coverity[buffer_size_warning: FALSE] */ + strncpy (data.pr_fname, fname, sizeof (data.pr_fname)); ++ /* Coverity flags this strncpy as possibly creating a string ++ that is not NUL terminated. This is in fact OK. */ ++ /* coverity[buffer_size_warning: FALSE] */ + strncpy (data.pr_psargs, psargs, sizeof (data.pr_psargs)); + return elfcore_write_note (abfd, buf, bufsiz, "CORE", note_type, + &data, sizeof (data)); +diff -rup binutils.orig/bfd/elf.c binutils-2.30/bfd/elf.c +--- binutils.orig/bfd/elf.c 2019-10-07 15:49:37.616630597 +0100 ++++ binutils-2.30/bfd/elf.c 2019-10-07 15:56:16.776930603 +0100 +@@ -10549,7 +10549,13 @@ elfcore_write_prpsinfo (bfd *abfd, + #endif + + memset (&data, 0, sizeof (data)); ++ /* Coverity flags this strncpy as possibly creating a string ++ that is not NUL terminated. This is in fact OK. */ ++ /* coverity[buffer_size_warning: FALSE] */ + strncpy (data.pr_fname, fname, sizeof (data.pr_fname)); ++ /* Coverity flags this strncpy as possibly creating a string ++ that is not NUL terminated. This is in fact OK. */ ++ /* coverity[buffer_size_warning: FALSE] */ + strncpy (data.pr_psargs, psargs, sizeof (data.pr_psargs)); + return elfcore_write_note (abfd, buf, bufsiz, + "CORE", note_type, &data, sizeof (data)); +@@ -10566,7 +10572,13 @@ elfcore_write_prpsinfo (bfd *abfd, + #endif + + memset (&data, 0, sizeof (data)); ++ /* Coverity flags this strncpy as possibly creating a string ++ that is not NUL terminated. This is in fact OK. */ ++ /* coverity[buffer_size_warning: FALSE] */ + strncpy (data.pr_fname, fname, sizeof (data.pr_fname)); ++ /* Coverity flags this strncpy as possibly creating a string ++ that is not NUL terminated. This is in fact OK. */ ++ /* coverity[buffer_size_warning: FALSE] */ + strncpy (data.pr_psargs, psargs, sizeof (data.pr_psargs)); + return elfcore_write_note (abfd, buf, bufsiz, + "CORE", note_type, &data, sizeof (data)); +diff -rup binutils.orig/bfd/elf-linux-core.h binutils-2.30/bfd/elf-linux-core.h +--- binutils.orig/bfd/elf-linux-core.h 2019-10-07 15:49:37.744629743 +0100 ++++ binutils-2.30/bfd/elf-linux-core.h 2019-10-07 15:55:43.976159158 +0100 +@@ -69,7 +69,13 @@ swap_linux_prpsinfo32_ugid32_out + bfd_put_32 (obfd, from->pr_ppid, to->pr_ppid); + bfd_put_32 (obfd, from->pr_pgrp, to->pr_pgrp); + bfd_put_32 (obfd, from->pr_sid, to->pr_sid); ++ /* Coverity flags this strncpy as possibly creating a string ++ that is not NUL terminated. This is in fact OK. */ ++ /* coverity[buffer_size_warning: FALSE] */ + strncpy (to->pr_fname, from->pr_fname, sizeof (to->pr_fname)); ++ /* Coverity flags this strncpy as possibly creating a string ++ that is not NUL terminated. This is in fact OK. */ ++ /* coverity[buffer_size_warning: FALSE] */ + strncpy (to->pr_psargs, from->pr_psargs, sizeof (to->pr_psargs)); + } + +@@ -121,7 +127,13 @@ swap_linux_prpsinfo32_ugid16_out + bfd_put_32 (obfd, from->pr_ppid, to->pr_ppid); + bfd_put_32 (obfd, from->pr_pgrp, to->pr_pgrp); + bfd_put_32 (obfd, from->pr_sid, to->pr_sid); ++ /* Coverity flags this strncpy as possibly creating a string ++ that is not NUL terminated. This is in fact OK. */ ++ /* coverity[buffer_size_warning: FALSE] */ + strncpy (to->pr_fname, from->pr_fname, sizeof (to->pr_fname)); ++ /* Coverity flags this strncpy as possibly creating a string ++ that is not NUL terminated. This is in fact OK. */ ++ /* coverity[buffer_size_warning: FALSE] */ + strncpy (to->pr_psargs, from->pr_psargs, sizeof (to->pr_psargs)); + } + +@@ -174,7 +186,13 @@ swap_linux_prpsinfo64_ugid32_out + bfd_put_32 (obfd, from->pr_ppid, to->pr_ppid); + bfd_put_32 (obfd, from->pr_pgrp, to->pr_pgrp); + bfd_put_32 (obfd, from->pr_sid, to->pr_sid); ++ /* Coverity flags this strncpy as possibly creating a string ++ that is not NUL terminated. This is in fact OK. */ ++ /* coverity[buffer_size_warning: FALSE] */ + strncpy (to->pr_fname, from->pr_fname, sizeof (to->pr_fname)); ++ /* Coverity flags this strncpy as possibly creating a string ++ that is not NUL terminated. This is in fact OK. */ ++ /* coverity[buffer_size_warning: FALSE] */ + strncpy (to->pr_psargs, from->pr_psargs, sizeof (to->pr_psargs)); + } + +@@ -227,7 +245,13 @@ swap_linux_prpsinfo64_ugid16_out + bfd_put_32 (obfd, from->pr_ppid, to->pr_ppid); + bfd_put_32 (obfd, from->pr_pgrp, to->pr_pgrp); + bfd_put_32 (obfd, from->pr_sid, to->pr_sid); ++ /* Coverity flags this strncpy as possibly creating a string ++ that is not NUL terminated. This is in fact OK. */ ++ /* coverity[buffer_size_warning: FALSE] */ + strncpy (to->pr_fname, from->pr_fname, sizeof (to->pr_fname)); ++ /* Coverity flags this strncpy as possibly creating a string ++ that is not NUL terminated. This is in fact OK. */ ++ /* coverity[buffer_size_warning: FALSE] */ + strncpy (to->pr_psargs, from->pr_psargs, sizeof (to->pr_psargs)); + } + +diff -rup binutils.orig/bfd/peXXigen.c binutils-2.30/bfd/peXXigen.c +--- binutils.orig/bfd/peXXigen.c 2019-10-07 15:49:37.695630070 +0100 ++++ binutils-2.30/bfd/peXXigen.c 2019-10-07 16:02:02.117524278 +0100 +@@ -385,7 +385,7 @@ _bfd_XXi_swap_aux_out (bfd * abfd, + H_PUT_32 (abfd, in->x_file.x_n.x_offset, ext->x_file.x_n.x_offset); + } + else +- memcpy (ext->x_file.x_fname, in->x_file.x_fname, FILNMLEN); ++ memcpy (ext->x_file.x_fname, in->x_file.x_fname, E_FILNMLEN); + + return AUXESZ; + +diff -rup binutils.orig/ld/pe-dll.c binutils-2.30/ld/pe-dll.c +--- binutils.orig/ld/pe-dll.c 2019-10-07 15:48:49.851949423 +0100 ++++ binutils-2.30/ld/pe-dll.c 2019-10-07 16:04:09.055639773 +0100 +@@ -2929,7 +2929,7 @@ pe_find_cdecl_alias_match (struct bfd_li + if (pe_details->underscored) + lname[0] = '_'; + else +- strcpy (lname, lname + 1); ++ memmove (lname, lname + 1, strlen (lname) + 1); + key.key = lname; + kv = bsearch (&key, udef_table, undef_count, + sizeof (struct key_value), undef_sort_cmp); +diff -rup binutils.orig/libiberty/sha1.c binutils-2.30/libiberty/sha1.c +--- binutils.orig/libiberty/sha1.c 2019-10-07 15:49:37.016634602 +0100 ++++ binutils-2.30/libiberty/sha1.c 2019-10-07 16:04:41.788411691 +0100 +@@ -258,7 +258,7 @@ sha1_process_bytes (const void *buffer, + { + sha1_process_block (ctx->buffer, 64, ctx); + left_over -= 64; +- memcpy (ctx->buffer, &ctx->buffer[16], left_over); ++ memmove (ctx->buffer, &ctx->buffer[16], left_over); + } + ctx->buflen = left_over; + } +diff -rup binutils.orig/bfd/cofflink.c binutils-2.30/bfd/cofflink.c +--- binutils.orig/bfd/cofflink.c 2019-10-07 17:01:58.787679337 +0100 ++++ binutils-2.30/bfd/cofflink.c 2019-10-07 17:02:20.641529805 +0100 +@@ -1406,6 +1406,8 @@ mark_relocs (struct coff_final_link_info + for (; irel < irelend; irel++) + if ((unsigned long) irel->r_symndx < obj_raw_syment_count (input_bfd)) + flaginfo->sym_indices[irel->r_symndx] = -1; ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + } + +diff -rup binutils.orig/bfd/doc/chew.c binutils-2.30/bfd/doc/chew.c +--- binutils.orig/bfd/doc/chew.c 2019-10-07 17:01:58.796679276 +0100 ++++ binutils-2.30/bfd/doc/chew.c 2019-10-07 17:04:21.265720634 +0100 +@@ -1264,6 +1264,7 @@ free_words (void) + if (ptr->code[i] == push_text + && ptr->code[i + 1]) + { ++ /* coverity[fnptr_free: FALSE] */ + free (ptr->code[i + 1] - 1); + ++ i; + } +@@ -1387,6 +1388,7 @@ compile (string) + ptr = newentry (word); + string = nextword (string, &word); + ++ /* coverity[use_after_free: FALSE] */ + while (word[0] != ';') + { + switch (word[0]) +diff -rup binutils.orig/bfd/elflink.c binutils-2.30/bfd/elflink.c +--- binutils.orig/bfd/elflink.c 2019-10-07 17:01:58.779679392 +0100 ++++ binutils-2.30/bfd/elflink.c 2019-10-07 17:04:57.025483171 +0100 +@@ -10579,6 +10579,8 @@ elf_link_input_bfd (struct elf_final_lin + "that references a non-existent global symbol"), + input_bfd, rel->r_info, o); + bfd_set_error (bfd_error_bad_value); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + +diff -rup binutils.orig/bfd/peXXigen.c binutils-2.30/bfd/peXXigen.c +--- binutils.orig/bfd/peXXigen.c 2019-10-07 17:01:58.784679358 +0100 ++++ binutils-2.30/bfd/peXXigen.c 2019-10-07 17:07:22.047520136 +0100 +@@ -385,7 +385,9 @@ _bfd_XXi_swap_aux_out (bfd * abfd, + H_PUT_32 (abfd, in->x_file.x_n.x_offset, ext->x_file.x_n.x_offset); + } + else +- memcpy (ext->x_file.x_fname, in->x_file.x_fname, E_FILNMLEN); ++ /* Coverity gets confused about the size of these buffers. */ ++ /* coverity[buffer_size: FALSE] */ ++ memcpy (ext->x_file.x_fname, in->x_file.x_fname, FILNMLEN); + + return AUXESZ; + +@@ -4343,6 +4345,8 @@ rsrc_process_section (bfd * abfd, + /* FIXME: Free the resource tree, if we have one. */ + free (datastart); + free (rsrc_sizes); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + + /* Handle the .idata section and other things that need symbol table +diff -rup binutils.orig/bfd/plugin.c binutils-2.30/bfd/plugin.c +--- binutils.orig/bfd/plugin.c 2019-10-07 17:01:58.780679385 +0100 ++++ binutils-2.30/bfd/plugin.c 2019-10-07 17:07:45.871361935 +0100 +@@ -403,9 +403,13 @@ try_load_plugin (const char *pname, bfd + + abfd->plugin_format = bfd_plugin_yes; + ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return 1; + + err: ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return 0; + } + +diff -rup binutils.orig/bfd/stabs.c binutils-2.30/bfd/stabs.c +--- binutils.orig/bfd/stabs.c 2019-10-07 17:01:58.778679399 +0100 ++++ binutils-2.30/bfd/stabs.c 2019-10-07 17:08:14.655170795 +0100 +@@ -377,6 +377,8 @@ _bfd_link_section_stabs (bfd *abfd, + amt = sizeof *ne; + ne = (struct stab_excl_list *) bfd_alloc (abfd, amt); + if (ne == NULL) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + goto error_return; + ne->offset = sym - stabbuf; + ne->val = sum_chars; +diff -rup binutils.orig/binutils/ar.c binutils-2.30/binutils/ar.c +--- binutils.orig/binutils/ar.c 2019-10-07 17:01:57.998684736 +0100 ++++ binutils-2.30/binutils/ar.c 2019-10-07 17:10:18.109350993 +0100 +@@ -228,6 +228,8 @@ map_over_members (bfd *arch, void (*func + filename = normalize (filename, arch); + } + ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + if (filename != NULL + && !FILENAME_CMP (normalize (*files, arch), filename)) + { +@@ -237,6 +239,8 @@ map_over_members (bfd *arch, void (*func + { + /* Counting, and didn't match on count; go on to the + next one. */ ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + continue; + } + +@@ -250,6 +254,8 @@ map_over_members (bfd *arch, void (*func + to the ar command. */ + break; + } ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + + if (!found) +@@ -1268,6 +1274,8 @@ delete_members (bfd *arch, char **files_ + current_ptr_ptr = &(arch->archive_next); + while (*current_ptr_ptr) + { ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + if (FILENAME_CMP (normalize (*files_to_delete, arch), + (*current_ptr_ptr)->filename) == 0) + { +@@ -1323,6 +1331,8 @@ move_members (bfd *arch, char **files_to + while (*current_ptr_ptr) + { + bfd *current_ptr = *current_ptr_ptr; ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + if (FILENAME_CMP (normalize (*files_to_move, arch), + current_ptr->filename) == 0) + { +@@ -1375,6 +1385,8 @@ replace_members (bfd *arch, char **files + + /* For compatibility with existing ar programs, we + permit the same file to be added multiple times. */ ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + if (FILENAME_CMP (normalize (*files_to_move, arch), + normalize (current->filename, arch)) == 0 + && current->arelt_data != NULL) +diff -rup binutils.orig/binutils/arparse.c binutils-2.30/binutils/arparse.c +--- binutils.orig/binutils/arparse.c 2019-10-07 17:01:58.003684702 +0100 ++++ binutils-2.30/binutils/arparse.c 2019-10-07 17:10:55.998099392 +0100 +@@ -1193,6 +1193,8 @@ yyparse (void) + # undef YYSTACK_RELOCATE + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + # endif + #endif /* no yyoverflow */ +diff -rup binutils.orig/binutils/arsup.c binutils-2.30/binutils/arsup.c +--- binutils.orig/binutils/arsup.c 2019-10-07 17:01:58.006684681 +0100 ++++ binutils-2.30/binutils/arsup.c 2019-10-07 17:11:21.789928112 +0100 +@@ -209,6 +209,8 @@ ar_open (char *name, int t) + obfd->has_armap = 1; + obfd->is_thin_archive = 0; + } ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + + static void +diff -rup binutils.orig/binutils/dwarf.c binutils-2.30/binutils/dwarf.c +--- binutils.orig/binutils/dwarf.c 2019-10-07 17:01:57.958685010 +0100 ++++ binutils-2.30/binutils/dwarf.c 2019-10-07 17:13:31.950063779 +0100 +@@ -4098,6 +4098,8 @@ display_debug_lines_decoded (struct dwar + if (data == end) + { + warn (_("Corrupt file name list\n")); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + break; + } + +@@ -4234,6 +4236,8 @@ display_debug_lines_decoded (struct dwar + { + warn (_("file table ends unexpectedly\n")); + n_files = 0; ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + break; + } + +@@ -7231,6 +7235,8 @@ read_cie (unsigned char *start, unsigned + if (start == end) + { + warn (_("No terminator for augmentation name\n")); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return start; + } + +@@ -7243,6 +7249,8 @@ read_cie (unsigned char *start, unsigned + if (fc->ptr_size < 1 || fc->ptr_size > 8) + { + warn (_("Invalid pointer size (%d) in CIE data\n"), fc->ptr_size); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return end; + } + +@@ -7251,6 +7259,8 @@ read_cie (unsigned char *start, unsigned + if (fc->segment_size > 8 || fc->segment_size + fc->ptr_size > 8) + { + warn (_("Invalid segment size (%d) in CIE data\n"), fc->segment_size); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return end; + } + +@@ -8305,6 +8315,8 @@ display_debug_frames (struct dwarf_secti + + printf ("\n"); + ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return 1; + } + +@@ -9733,6 +9745,8 @@ load_separate_debug_info (const char * + if (debugfile == NULL) + { + warn (_("Out of memory")); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return NULL; + } + +diff -rup binutils.orig/binutils/elfedit.c binutils-2.30/binutils/elfedit.c +--- binutils.orig/binutils/elfedit.c 2019-10-07 17:01:58.000684722 +0100 ++++ binutils-2.30/binutils/elfedit.c 2019-10-07 17:13:51.916931183 +0100 +@@ -468,6 +468,8 @@ process_archive (const char * file_name, + } + + free (qualified_name); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + + out: +diff -rup binutils.orig/binutils/ieee.c binutils-2.30/binutils/ieee.c +--- binutils.orig/binutils/ieee.c 2019-10-07 17:01:57.963684975 +0100 ++++ binutils-2.30/binutils/ieee.c 2019-10-07 17:18:54.442922250 +0100 +@@ -1503,6 +1503,8 @@ parse_ieee_ty (struct ieee_info *info, c + bfd_boolean present; + + if (! ieee_read_optional_id (info, pp, &name, &namlen, &present)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + if (! present) + break; +@@ -1516,6 +1518,8 @@ parse_ieee_ty (struct ieee_info *info, c + + names[c] = savestring (name, namlen); + if (names[c] == NULL) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + ++c; + } +@@ -1554,12 +1558,16 @@ parse_ieee_ty (struct ieee_info *info, c + bfd_vma bitpos, bitsize; + + if (! ieee_read_optional_id (info, pp, &name, &namlen, &present)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + if (! present) + break; + if (! ieee_read_type_index (info, pp, &ftype) + || ! ieee_read_number (info, pp, &bitpos) + || ! ieee_read_number (info, pp, &bitsize)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + + if (c + 1 >= alloc) +@@ -1573,6 +1581,8 @@ parse_ieee_ty (struct ieee_info *info, c + ftype, bitpos, bitsize, + DEBUG_VISIBILITY_PUBLIC); + if (fields[c] == NULL) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + ++c; + } +@@ -1604,10 +1614,14 @@ parse_ieee_ty (struct ieee_info *info, c + bfd_vma val; + + if (! ieee_read_optional_id (info, pp, &name, &namlen, &present)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + if (! present) + break; + if (! ieee_read_number (info, pp, &val)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + + /* If the length of the name is zero, then the value is +@@ -1627,6 +1641,8 @@ parse_ieee_ty (struct ieee_info *info, c + + names[c] = savestring (name, namlen); + if (names[c] == NULL) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + vals[c] = (bfd_signed_vma) val; + ++c; +@@ -1646,6 +1662,8 @@ parse_ieee_ty (struct ieee_info *info, c + debug_type t; + + if (! ieee_read_type_index (info, pp, &t)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + type = debug_make_pointer_type (dhandle, t); + } +@@ -1660,6 +1678,8 @@ parse_ieee_ty (struct ieee_info *info, c + || ! ieee_read_number (info, pp, &high) + || ! ieee_read_number (info, pp, &signedp) + || ! ieee_read_number (info, pp, &size)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + + type = debug_make_range_type (dhandle, +@@ -1679,6 +1699,8 @@ parse_ieee_ty (struct ieee_info *info, c + unsigned int c; + + if (! ieee_read_number (info, pp, &size)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + + alloc = 10; +@@ -1695,11 +1717,15 @@ parse_ieee_ty (struct ieee_info *info, c + bfd_vma bitsize; + + if (! ieee_read_optional_id (info, pp, &name, &namlen, &present)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + if (! present) + break; + if (! ieee_read_number (info, pp, &tindx) + || ! ieee_read_number (info, pp, &offset)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + + if (tindx < 256) +@@ -1733,6 +1759,8 @@ parse_ieee_ty (struct ieee_info *info, c + ftype, offset, bitsize, + DEBUG_VISIBILITY_PUBLIC); + if (fields[c] == NULL) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + ++c; + } +@@ -1747,6 +1775,8 @@ parse_ieee_ty (struct ieee_info *info, c + case 'T': + /* Typedef. */ + if (! ieee_read_type_index (info, pp, &type)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + typdef = TRUE; + break; +@@ -1766,6 +1796,8 @@ parse_ieee_ty (struct ieee_info *info, c + if (! ieee_read_number (info, pp, &attr) + || ! ieee_read_type_index (info, pp, &rtype) + || ! ieee_read_number (info, pp, &nargs)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + do + { +@@ -1773,6 +1805,8 @@ parse_ieee_ty (struct ieee_info *info, c + unsigned long namlen; + + if (! ieee_read_optional_id (info, pp, &name, &namlen, &present)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + while (present); +@@ -1810,6 +1844,8 @@ parse_ieee_ty (struct ieee_info *info, c + + if (! ieee_read_type_index (info, pp, &etype) + || ! ieee_read_number (info, pp, &high)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + + type = debug_make_array_type (dhandle, etype, +@@ -1829,6 +1865,8 @@ parse_ieee_ty (struct ieee_info *info, c + /* FIXME: I don't know what the name means. */ + + if (! ieee_read_id (info, pp, &name, &namlen)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + + type = debug_make_complex_type (dhandle, tc == 'c' ? 4 : 8); +@@ -1838,6 +1876,8 @@ parse_ieee_ty (struct ieee_info *info, c + case 'f': + /* Pascal file name. FIXME. */ + ieee_error (info, ty_code_start, _("Pascal file name not supported")); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + + case 'g': +@@ -1849,12 +1889,16 @@ parse_ieee_ty (struct ieee_info *info, c + + if (! ieee_read_number (info, pp, &signedp) + || ! ieee_read_number (info, pp, &bitsize)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + + /* I think the documentation says that there is a type index, + but some actual files do not have one. */ + hold = *pp; + if (! ieee_read_optional_number (info, pp, &dummy, &present)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + if (! present) + { +@@ -1866,6 +1910,8 @@ parse_ieee_ty (struct ieee_info *info, c + { + *pp = hold; + if (! ieee_read_type_index (info, pp, &type)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + type_bitsize = bitsize; +@@ -1880,12 +1926,16 @@ parse_ieee_ty (struct ieee_info *info, c + + if (! ieee_read_number (info, pp, &kind) + || ! ieee_read_type_index (info, pp, &t)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + + switch (kind) + { + default: + ieee_error (info, ty_start, _("unsupported qualifier")); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + + case 1: +@@ -1907,6 +1957,8 @@ parse_ieee_ty (struct ieee_info *info, c + + if (! ieee_read_number (info, pp, &size) + || ! ieee_read_type_index (info, pp, &etype)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + + /* FIXME: We ignore the size. */ +@@ -1934,6 +1986,8 @@ parse_ieee_ty (struct ieee_info *info, c + || ! ieee_read_number (info, pp, &push_mask) + || ! ieee_read_type_index (info, pp, &rtype) + || ! ieee_read_number (info, pp, &nargs)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + if (nargs == (bfd_vma) -1) + { +@@ -1948,6 +2002,8 @@ parse_ieee_ty (struct ieee_info *info, c + xmalloc ((nargs + 1) * sizeof *arg_types)); + for (i = 0; i < nargs; i++) + if (! ieee_read_type_index (info, pp, arg_types + i)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + + /* If the last type is pointer to void, this is really a +@@ -1995,6 +2051,8 @@ parse_ieee_ty (struct ieee_info *info, c + } + if (! ieee_read_number (info, pp, &level) + || ! ieee_read_optional_number (info, pp, &father, &present)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + + /* We can't distinguish between a global function and a static +diff -rup binutils.orig/binutils/objcopy.c binutils-2.30/binutils/objcopy.c +--- binutils.orig/binutils/objcopy.c 2019-10-07 17:01:58.036684476 +0100 ++++ binutils-2.30/binutils/objcopy.c 2019-10-07 17:26:39.304812562 +0100 +@@ -1142,6 +1142,8 @@ add_specific_symbols (const char *filena + line = eol; + line_count ++; + } ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + + /* See whether a symbol should be stripped or kept +@@ -1817,6 +1819,8 @@ add_redefine_syms_file (const char *file + fatal (_("%s:%d: premature end of file"), filename, lineno); + + free (buf); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + + /* Copy unknown object file IBFD onto OBFD. +@@ -2855,6 +2859,8 @@ copy_object (bfd *ibfd, bfd *obfd, const + strerror (errno)); + free (contents); + return FALSE; ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + } + else +@@ -3063,6 +3069,8 @@ copy_object (bfd *ibfd, bfd *obfd, const + { + status = 1; + return FALSE; ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + } + +@@ -3097,6 +3105,8 @@ copy_object (bfd *ibfd, bfd *obfd, const + 0, padd->size)) + { + bfd_nonfatal_message (NULL, obfd, padd->section, NULL); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + } +@@ -3115,6 +3125,8 @@ copy_object (bfd *ibfd, bfd *obfd, const + 0, pupdate->size)) + { + bfd_nonfatal_message (NULL, obfd, osec, NULL); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + } +@@ -3128,6 +3140,8 @@ copy_object (bfd *ibfd, bfd *obfd, const + if (! bfd_set_section_contents (obfd, osec, merged_notes, 0, merged_size)) + { + bfd_nonfatal_message (NULL, obfd, osec, _("error: failed to copy merged notes into output")); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + } +@@ -3146,6 +3160,8 @@ copy_object (bfd *ibfd, bfd *obfd, const + bfd_nonfatal_message (NULL, obfd, NULL, + _("cannot fill debug link section `%s'"), + gnu_debuglink_filename); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + } +@@ -3184,6 +3200,8 @@ copy_object (bfd *ibfd, bfd *obfd, const + off, now)) + { + bfd_nonfatal_message (NULL, obfd, osections[i], NULL); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + +@@ -3202,6 +3220,8 @@ copy_object (bfd *ibfd, bfd *obfd, const + { + bfd_nonfatal_message (NULL, obfd, NULL, + _("error copying private BFD data")); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + +@@ -3224,6 +3244,8 @@ copy_object (bfd *ibfd, bfd *obfd, const + } + } + ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return TRUE; + } + +@@ -3302,6 +3324,7 @@ copy_archive (bfd *ibfd, bfd *obfd, cons + /* If the file already exists, make another temp dir. */ + if (stat (output_name, &buf) >= 0) + { ++ free (output_name); + output_name = make_tempdir (output_name); + if (output_name == NULL) + { +@@ -3435,6 +3458,7 @@ copy_archive (bfd *ibfd, bfd *obfd, cons + } + + rmdir (dir); ++ free (dir); + } + + static void +@@ -4310,6 +4334,8 @@ write_debugging_info (bfd *obfd, void *d + { + bfd_nonfatal_message (NULL, obfd, NULL, + _("can't create debugging section")); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + +@@ -4323,6 +4349,8 @@ write_debugging_info (bfd *obfd, void *d + { + bfd_nonfatal_message (NULL, obfd, NULL, + _("can't set debugging section contents")); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + +@@ -5569,6 +5597,8 @@ copy_main (int argc, char *argv[]) + } + } + ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return 0; + } + +diff -rup binutils-2.30/binutils/ieee.c binutils.new/binutils/ieee.c +--- binutils-2.30/binutils/ieee.c 2019-10-08 10:20:47.186432611 +0100 ++++ binutils.new/binutils/ieee.c 2019-10-08 10:20:33.515525367 +0100 +@@ -2661,13 +2661,18 @@ ieee_read_cxx_class (struct ieee_info *i + spec_start = *pp; + + if (! ieee_require_asn (info, pp, &id)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; ++ + --count; + + switch (id) + { + default: + ieee_error (info, spec_start, _("unrecognized C++ object spec")); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + + case 'b': +@@ -2704,6 +2709,8 @@ ieee_read_cxx_class (struct ieee_info *i + if ((fieldlen == 0) == (cinline == 0)) + { + ieee_error (info, start, _("unsupported C++ object type")); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + +@@ -2887,12 +2894,16 @@ ieee_read_cxx_class (struct ieee_info *i + } + } + if (ftype == DEBUG_TYPE_NULL) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + + switch (flags & CXXFLAGS_VISIBILITY) + { + default: + ieee_error (info, start, _("unknown C++ visibility")); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + + case CXXFLAGS_VISIBILITY_PUBLIC: +@@ -2927,6 +2938,8 @@ ieee_read_cxx_class (struct ieee_info *i + if (bitpos == (bfd_vma) -1 || bitsize == (bfd_vma) -1) + { + ieee_error (info, start, _("bad C++ field bit pos or size")); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + field = debug_make_field (dhandle, fieldcopy, ftype, bitpos, +@@ -3043,6 +3056,8 @@ ieee_read_cxx_class (struct ieee_info *i + { + default: + ieee_error (info, start, _("unknown C++ visibility")); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + + case CXXFLAGS_VISIBILITY_PUBLIC: +@@ -3229,6 +3244,8 @@ ieee_read_cxx_class (struct ieee_info *i + dmethods[i] = debug_make_method (dhandle, namcopy, + methods[i].variants); + if (dmethods[i] == DEBUG_METHOD_NULL) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + dmethods[i] = DEBUG_METHOD_NULL; +diff -rup binutils-2.30/binutils/objcopy.c binutils.new/binutils/objcopy.c +--- binutils-2.30/binutils/objcopy.c 2019-10-08 10:20:47.186432611 +0100 ++++ binutils.new/binutils/objcopy.c 2019-10-08 10:20:33.513525381 +0100 +@@ -2858,9 +2858,9 @@ copy_object (bfd *ibfd, bfd *obfd, const + pdump->filename, + strerror (errno)); + free (contents); +- return FALSE; + /* There is a potential resource leak here, but it is not important. */ + /* coverity[leaked_storage: FALSE] */ ++ return FALSE; + } + } + else +@@ -3068,9 +3068,9 @@ copy_object (bfd *ibfd, bfd *obfd, const + if (bfd_get_error () != bfd_error_no_error) + { + status = 1; +- return FALSE; + /* There is a potential resource leak here, but it is not important. */ + /* coverity[leaked_storage: FALSE] */ ++ return FALSE; + } + } + +@@ -3083,6 +3083,8 @@ copy_object (bfd *ibfd, bfd *obfd, const + if (! write_debugging_info (obfd, dhandle, &symcount, &osympp)) + { + status = 1; ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + } +@@ -3210,6 +3212,8 @@ copy_object (bfd *ibfd, bfd *obfd, const + } + } + } ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + + /* Allow the BFD backend to copy any private data it understands +@@ -3324,8 +3328,10 @@ copy_archive (bfd *ibfd, bfd *obfd, cons + /* If the file already exists, make another temp dir. */ + if (stat (output_name, &buf) >= 0) + { ++ char * on; ++ on = make_tempdir (output_name); + free (output_name); +- output_name = make_tempdir (output_name); ++ output_name = on; + if (output_name == NULL) + { + non_fatal (_("cannot create tempdir for archive copying (error: %s)"), +diff -rup binutils-2.30/binutils/rdcoff.c binutils.new/binutils/rdcoff.c +--- binutils-2.30/binutils/rdcoff.c 2018-01-13 13:31:15.000000000 +0000 ++++ binutils.new/binutils/rdcoff.c 2019-10-08 10:20:33.512525387 +0100 +@@ -409,6 +409,8 @@ parse_coff_struct_type (bfd *abfd, struc + { + non_fatal (_("bfd_coff_get_syment failed: %s"), + bfd_errmsg (bfd_get_error ())); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return DEBUG_TYPE_NULL; + } + +@@ -425,6 +427,8 @@ parse_coff_struct_type (bfd *abfd, struc + { + non_fatal (_("bfd_coff_get_auxent failed: %s"), + bfd_errmsg (bfd_get_error ())); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return DEBUG_TYPE_NULL; + } + psubaux = &auxent; +@@ -514,6 +518,8 @@ parse_coff_enum_type (bfd *abfd, struct + { + non_fatal (_("bfd_coff_get_syment failed: %s"), + bfd_errmsg (bfd_get_error ())); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return DEBUG_TYPE_NULL; + } + +diff -rup binutils-2.30/binutils/readelf.c binutils.new/binutils/readelf.c +--- binutils-2.30/binutils/readelf.c 2019-10-08 10:20:47.161432781 +0100 ++++ binutils.new/binutils/readelf.c 2019-10-08 10:20:33.507525422 +0100 +@@ -5304,6 +5304,8 @@ get_32bit_section_headers (Filedata * fi + { + if (!probe) + error (_("Out of memory reading %u section headers\n"), num); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + +@@ -5370,6 +5372,8 @@ get_64bit_section_headers (Filedata * fi + { + if (! probe) + error (_("Out of memory reading %u section headers\n"), num); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + +@@ -5456,6 +5460,7 @@ get_32bit_elf_symbols (Filedata * + for (entry = symtab_shndx_list; entry != NULL; entry = entry->next) + if (entry->hdr->sh_link == (unsigned long) (section - filedata->section_headers)) + { ++ free (shndx); + shndx = (Elf_External_Sym_Shndx *) get_data (NULL, filedata, + entry->hdr->sh_offset, + 1, entry->hdr->sh_size, +@@ -5569,6 +5574,7 @@ get_64bit_elf_symbols (Filedata * + for (entry = symtab_shndx_list; entry != NULL; entry = entry->next) + if (entry->hdr->sh_link == (unsigned long) (section - filedata->section_headers)) + { ++ free (shndx); + shndx = (Elf_External_Sym_Shndx *) get_data (NULL, filedata, + entry->hdr->sh_offset, + 1, entry->hdr->sh_size, +@@ -9647,6 +9653,7 @@ process_dynamic_section (Filedata * file + section.sh_entsize = sizeof (Elf64_External_Sym); + section.sh_name = filedata->string_table_length; + ++ free (dynamic_symbols); + dynamic_symbols = GET_ELF_SYMBOLS (filedata, §ion, & num_dynamic_syms); + if (num_dynamic_syms < 1) + { +@@ -11500,6 +11507,8 @@ process_symbol_table (Filedata * filedat + if (gnubuckets[i] != 0) + { + if (gnubuckets[i] < gnusymidx) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + + if (maxchain == 0xffffffff || gnubuckets[i] > maxchain) +@@ -12950,6 +12959,8 @@ apply_relocations (Filedata * + symsec = filedata->section_headers + relsec->sh_link; + if (symsec->sh_type != SHT_SYMTAB + && symsec->sh_type != SHT_DYNSYM) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + symtab = GET_ELF_SYMBOLS (filedata, symsec, & num_syms); + +@@ -16096,6 +16107,8 @@ process_mips_specific (Filedata * fileda + } + else + res = FALSE; ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + + if (conflicts_offset != 0 && conflictsno != 0) +@@ -16133,6 +16146,8 @@ process_mips_specific (Filedata * fileda + get_data (NULL, filedata, conflicts_offset, conflictsno, + sizeof (* econf32), _("conflict")); + if (!econf32) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + + for (cnt = 0; cnt < conflictsno; ++cnt) +@@ -16148,6 +16163,8 @@ process_mips_specific (Filedata * fileda + get_data (NULL, filedata, conflicts_offset, conflictsno, + sizeof (* econf64), _("conflict")); + if (!econf64) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + + for (cnt = 0; cnt < conflictsno; ++cnt) +@@ -16350,6 +16367,8 @@ process_mips_specific (Filedata * fileda + data = (unsigned char *) get_data (NULL, filedata, offset, end - mips_pltgot, + 1, _("Procedure Linkage Table data")); + if (data == NULL) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + + printf ("\nPLT GOT:\n\n"); +@@ -16434,6 +16453,8 @@ process_nds32_specific (Filedata * filed + printf ("(VEC_SIZE):\treserved\n"); + break; + } ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + + return TRUE; +@@ -17488,9 +17509,9 @@ get_symbol_for_build_attribute (Filedata + const char ** pname) + { + static Filedata * saved_filedata = NULL; +- static char * strtab; ++ static char * strtab = NULL; + static unsigned long strtablen; +- static Elf_Internal_Sym * symtab; ++ static Elf_Internal_Sym * symtab = NULL; + static unsigned long nsyms; + Elf_Internal_Sym * saved_sym = NULL; + Elf_Internal_Sym * sym; +@@ -17507,12 +17528,14 @@ get_symbol_for_build_attribute (Filedata + { + if (symsec->sh_type == SHT_SYMTAB) + { ++ free (symtab); + symtab = GET_ELF_SYMBOLS (filedata, symsec, & nsyms); + + if (symsec->sh_link < filedata->file_header.e_shnum) + { + Elf_Internal_Shdr * strtab_sec = filedata->section_headers + symsec->sh_link; + ++ free (strtab); + strtab = (char *) get_data (NULL, filedata, strtab_sec->sh_offset, + 1, strtab_sec->sh_size, + _("string table")); +@@ -18095,6 +18118,8 @@ process_notes_at (Filedata * f + { + warn (_("Corrupt note: alignment %ld, expecting 4 or 8\n"), + (long) align); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + +diff -rup binutils.orig/binutils/ieee.c binutils-2.30/binutils/ieee.c +--- binutils.orig/binutils/ieee.c 2019-10-08 11:33:02.620958088 +0100 ++++ binutils-2.30/binutils/ieee.c 2019-10-08 11:34:44.609294479 +0100 +@@ -2838,6 +2838,8 @@ ieee_read_cxx_class (struct ieee_info *i + if (structfields == NULL) + { + ieee_error (info, start, _("C++ object has no fields")); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + +diff -rup binutils.orig/binutils/rddbg.c binutils-2.30/binutils/rddbg.c +--- binutils.orig/binutils/rddbg.c 2019-10-08 11:33:02.619958094 +0100 ++++ binutils-2.30/binutils/rddbg.c 2019-10-08 11:34:35.169355901 +0100 +@@ -86,6 +86,8 @@ read_debugging_info (bfd *abfd, asymbol + if (! no_messages) + non_fatal (_("%s: no recognized debugging information"), + bfd_get_filename (abfd)); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return NULL; + } + +@@ -300,6 +302,8 @@ read_symbol_stabs_debugging_info (bfd *a + + s = i.name; + if (s == NULL || strlen (s) < 1) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + f = NULL; + +diff -rup binutils.orig/binutils/stabs.c binutils-2.30/binutils/stabs.c +--- binutils.orig/binutils/stabs.c 2019-10-08 11:33:02.607958173 +0100 ++++ binutils-2.30/binutils/stabs.c 2019-10-08 11:34:25.489418884 +0100 +@@ -758,6 +758,8 @@ parse_stab_string (void *dhandle, struct + if (*p != '=') + { + bad_stab (string); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + ++p; +@@ -791,6 +793,8 @@ parse_stab_string (void *dhandle, struct + if (*p != ',') + { + bad_stab (string); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + if (! debug_record_typed_const (dhandle, name, dtype, atoi (p))) +@@ -798,6 +802,8 @@ parse_stab_string (void *dhandle, struct + break; + default: + bad_stab (string); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + +@@ -810,6 +816,8 @@ parse_stab_string (void *dhandle, struct + if (dtype == DEBUG_TYPE_NULL) + return FALSE; + if (! debug_record_label (dhandle, name, dtype, value)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + break; + +@@ -1114,6 +1122,8 @@ parse_stab_string (void *dhandle, struct + while (*p != ';') + ++p; + ++p; ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return TRUE; + } + /* TODO SUNPro C++ support: +@@ -1127,12 +1137,16 @@ parse_stab_string (void *dhandle, struct + + default: + bad_stab (string); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + + /* FIXME: gdb converts structure values to structure pointers in a + couple of cases, depending upon the target. */ + ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return TRUE; + } + +@@ -1499,6 +1513,8 @@ parse_stab_type (void *dhandle, struct s + if (**pp != ',') + { + bad_stab (orig); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return DEBUG_TYPE_NULL; + } + ++*pp; +@@ -1513,6 +1529,8 @@ parse_stab_type (void *dhandle, struct s + args[n] = parse_stab_type (dhandle, info, (const char *) NULL, + pp, (debug_type **) NULL); + if (args[n] == DEBUG_TYPE_NULL) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return DEBUG_TYPE_NULL; + ++n; + } +@@ -2290,6 +2308,8 @@ parse_stab_struct_fields (void *dhandle, + + if (! parse_stab_one_struct_field (dhandle, info, pp, p, fields + c, + staticsp)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + + ++c; +@@ -2365,6 +2385,8 @@ parse_stab_cpp_abbrev (void *dhandle, st + if (**pp != ':') + { + bad_stab (orig); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + ++*pp; +@@ -2374,6 +2396,8 @@ parse_stab_cpp_abbrev (void *dhandle, st + if (**pp != ',') + { + bad_stab (orig); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + ++*pp; +@@ -2382,6 +2406,8 @@ parse_stab_cpp_abbrev (void *dhandle, st + if (**pp != ';') + { + bad_stab (orig); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + ++*pp; +@@ -2787,6 +2813,8 @@ parse_stab_members (void *dhandle, struc + if (return_type == DEBUG_TYPE_NULL) + { + bad_stab (orig); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + goto fail; + } + type = parse_stab_argtypes (dhandle, info, class_type, name, +@@ -3104,6 +3132,8 @@ parse_stab_array_type (void *dhandle, st + if (**pp != ';') + { + bad_stab (orig); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return DEBUG_TYPE_NULL; + } + ++*pp; +@@ -3120,6 +3150,8 @@ parse_stab_array_type (void *dhandle, st + if (**pp != ';') + { + bad_stab (orig); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return DEBUG_TYPE_NULL; + } + ++*pp; +@@ -3134,6 +3166,8 @@ parse_stab_array_type (void *dhandle, st + if (**pp != ';') + { + bad_stab (orig); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return DEBUG_TYPE_NULL; + } + ++*pp; +@@ -3141,6 +3175,8 @@ parse_stab_array_type (void *dhandle, st + element_type = parse_stab_type (dhandle, info, (const char *) NULL, pp, + (debug_type **) NULL); + if (element_type == DEBUG_TYPE_NULL) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return DEBUG_TYPE_NULL; + + if (adjustable) +@@ -5366,6 +5402,8 @@ stab_demangle_v3_arg (void *dhandle, str + dc->u.s_binary.right, + &varargs); + if (pargs == NULL) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return NULL; + + return debug_make_function_type (dhandle, dt, pargs, varargs); +diff -rup binutils.orig/gas/as.c binutils-2.30/gas/as.c +--- binutils.orig/gas/as.c 2019-10-08 11:33:02.834956696 +0100 ++++ binutils-2.30/gas/as.c 2019-10-08 11:34:17.073473644 +0100 +@@ -934,6 +934,8 @@ This program has absolutely no warranty. + case OPTION_AL: + listing |= LISTING_LISTING; + if (optarg) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + listing_filename = xstrdup (optarg); + break; + +@@ -988,6 +990,8 @@ This program has absolutely no warranty. + listing |= LISTING_SYMBOLS; + break; + case '=': ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + listing_filename = xstrdup (optarg + 1); + optarg += strlen (listing_filename); + break; +@@ -1021,6 +1025,8 @@ This program has absolutely no warranty. + } + + case 'o': ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + out_file_name = xstrdup (optarg); + break; + +diff -rup binutils.orig/gas/config/obj-elf.c binutils-2.30/gas/config/obj-elf.c +--- binutils.orig/gas/config/obj-elf.c 2019-10-08 11:33:02.848956604 +0100 ++++ binutils-2.30/gas/config/obj-elf.c 2019-10-08 11:34:09.473523094 +0100 +@@ -1028,6 +1028,8 @@ obj_elf_attach_to_group (int dummy ATTRI + + elf_group_name (now_seg) = xstrdup (gname); + elf_section_flags (now_seg) |= SHF_GROUP; ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + + void +@@ -1103,6 +1105,8 @@ obj_elf_section (int push) + if (beg == NULL) + { + ignore_rest_of_line (); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return; + } + attr |= obj_elf_parse_section_letters (beg, strlen (beg), &is_clone); +@@ -1233,6 +1237,8 @@ obj_elf_section (int push) + { + as_bad (_("character following name is not '#'")); + ignore_rest_of_line (); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return; + } + ++input_line_pointer; +diff -rup binutils.orig/gas/dwarf2dbg.c binutils-2.30/gas/dwarf2dbg.c +--- binutils.orig/gas/dwarf2dbg.c 2019-10-08 11:33:02.839956663 +0100 ++++ binutils-2.30/gas/dwarf2dbg.c 2019-10-08 11:34:00.913578791 +0100 +@@ -1701,6 +1701,8 @@ out_file_list (void) + + /* Terminate filename list. */ + out_byte (0); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + + /* Switch to SEC and output a header length field. Return the size of +@@ -2115,6 +2117,8 @@ out_debug_str (segT str_seg, symbolS **n + len = strlen (producer) + 1; + p = frag_more (len); + memcpy (p, producer, len); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + + void +diff -rup binutils.orig/gas/read.c binutils-2.30/gas/read.c +--- binutils.orig/gas/read.c 2019-10-08 11:33:02.852956578 +0100 ++++ binutils-2.30/gas/read.c 2019-10-08 11:33:51.537639797 +0100 +@@ -1714,6 +1714,8 @@ read_symbol_name (void) + { + as_bad (_("expected symbol name")); + ignore_rest_of_line (); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return NULL; + } + +diff -rup binutils.orig/gas/write.c binutils-2.30/gas/write.c +--- binutils.orig/gas/write.c 2019-10-08 11:33:02.833956702 +0100 ++++ binutils-2.30/gas/write.c 2019-10-08 11:33:36.033740679 +0100 +@@ -1366,6 +1366,8 @@ write_relocs (bfd *abfd, asection *sec, + } + } + #endif ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + + static int +@@ -1868,6 +1870,8 @@ create_note_reloc (segT sec, + if (reloc->u.b.r.howto == NULL) + { + as_bad (_("unable to create reloc for build note")); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return; + } + +diff -rup binutils.orig/gas/as.c binutils-2.30/gas/as.c +--- binutils.orig/gas/as.c 2019-10-08 13:45:17.382428420 +0100 ++++ binutils-2.30/gas/as.c 2019-10-08 13:46:01.613135558 +0100 +@@ -935,7 +935,7 @@ This program has absolutely no warranty. + listing |= LISTING_LISTING; + if (optarg) + /* There is a potential resource leak here, but it is not important. */ +- /* coverity[leaked_storage: FALSE] */ ++ /* coverity[overwrite_var: FALSE] */ + listing_filename = xstrdup (optarg); + break; + +@@ -991,7 +991,7 @@ This program has absolutely no warranty. + break; + case '=': + /* There is a potential resource leak here, but it is not important. */ +- /* coverity[leaked_storage: FALSE] */ ++ /* coverity[overwrite_var: FALSE] */ + listing_filename = xstrdup (optarg + 1); + optarg += strlen (listing_filename); + break; +@@ -1026,7 +1026,7 @@ This program has absolutely no warranty. + + case 'o': + /* There is a potential resource leak here, but it is not important. */ +- /* coverity[leaked_storage: FALSE] */ ++ /* coverity[overwrite_var: FALSE] */ + out_file_name = xstrdup (optarg); + break; + +diff -rup binutils.orig/gas/config/obj-elf.c binutils-2.30/gas/config/obj-elf.c +--- binutils.orig/gas/config/obj-elf.c 2019-10-08 13:45:17.371428492 +0100 ++++ binutils-2.30/gas/config/obj-elf.c 2019-10-08 13:46:49.916815725 +0100 +@@ -1023,6 +1023,8 @@ obj_elf_attach_to_group (int dummy ATTRI + if (elf_group_name (now_seg)) + { + as_warn ("already has a group"); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return; + } + +diff -rup binutils.orig/gas/dwarf2dbg.c binutils-2.30/gas/dwarf2dbg.c +--- binutils.orig/gas/dwarf2dbg.c 2019-10-08 13:45:17.384428407 +0100 ++++ binutils-2.30/gas/dwarf2dbg.c 2019-10-08 13:47:29.198555634 +0100 +@@ -1664,6 +1664,8 @@ out_file_list (void) + /* Emit directory list. */ + for (i = 1; i < dirs_in_use; ++i) + { ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[overwrite_var: FALSE] */ + dir = remap_debug_filename (dirs[i]); + size = strlen (dir) + 1; + cp = frag_more (size); +diff -rup binutils.orig/gold/cref.cc binutils-2.30/gold/cref.cc +--- binutils.orig/gold/cref.cc 2019-10-08 13:45:17.653426626 +0100 ++++ binutils-2.30/gold/cref.cc 2019-10-08 13:47:46.669439951 +0100 +@@ -391,6 +391,8 @@ Cref::print_symbol_counts(const Symbol_t + } + if (f != NULL) + this->inputs_->print_symbol_counts(symtab, f); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + } + +diff -rup binutils.orig/gold/dwarf_reader.cc binutils-2.30/gold/dwarf_reader.cc +--- binutils.orig/gold/dwarf_reader.cc 2019-10-08 13:45:17.654426619 +0100 ++++ binutils-2.30/gold/dwarf_reader.cc 2019-10-08 13:48:03.292329889 +0100 +@@ -265,12 +265,16 @@ Dwarf_abbrev_table::do_get_abbrev(unsign + { + // Read the attribute. + if (this->buffer_pos_ >= this->buffer_end_) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return NULL; + uint64_t attr = read_unsigned_LEB_128(this->buffer_pos_, &len); + this->buffer_pos_ += len; + + // Read the form. + if (this->buffer_pos_ >= this->buffer_end_) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return NULL; + uint64_t form = read_unsigned_LEB_128(this->buffer_pos_, &len); + this->buffer_pos_ += len; +diff -rup binutils.orig/gold/dwp.cc binutils-2.30/gold/dwp.cc +--- binutils.orig/gold/dwp.cc 2019-10-08 13:45:17.656426606 +0100 ++++ binutils-2.30/gold/dwp.cc 2019-10-08 13:48:12.317270132 +0100 +@@ -803,6 +803,8 @@ Sized_relobj_dwo::setu + pshdrs, this->shnum(), names, section_names_size, this, true); + if (compressed_sections != NULL && !compressed_sections->empty()) + this->set_compressed_sections(compressed_sections); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + + // Return a view of the contents of a section. +@@ -1163,6 +1165,8 @@ Dwo_file::sized_read_unit_index(unsigned + elfcpp::Swap_unaligned<32, big_endian>::readval(contents + + 2 * sizeof(uint32_t)); + if (ncols == 0 || nused == 0) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return; + + gold_assert(info_shndx > 0); +@@ -1305,6 +1309,8 @@ Dwo_file::sized_verify_dwo_list(unsigned + elfcpp::Swap_unaligned<32, big_endian>::readval(contents + + 2 * sizeof(uint32_t)); + if (ncols == 0 || nused == 0) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return true; + + unsigned int nslots = +diff -rup binutils.orig/gold/ehframe.cc binutils-2.30/gold/ehframe.cc +--- binutils.orig/gold/ehframe.cc 2019-10-08 13:45:17.653426626 +0100 ++++ binutils-2.30/gold/ehframe.cc 2019-10-08 13:48:21.580208800 +0100 +@@ -1187,6 +1187,8 @@ Eh_frame::remove_ehframe_for_plt(Output_ + + if (this->mappings_are_done_) + this->final_data_size_ -= align_address(fde_length + 8, this->addralign()); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + + // Return the number of FDEs. +diff -rup binutils.orig/gold/fileread.cc binutils-2.30/gold/fileread.cc +--- binutils.orig/gold/fileread.cc 2019-10-08 13:45:17.657426599 +0100 ++++ binutils-2.30/gold/fileread.cc 2019-10-08 13:48:33.645128913 +0100 +@@ -873,6 +873,8 @@ File_view::~File_view() + Input_file::Input_file(const char* name) + : found_name_(), file_(), is_in_sysroot_(false), format_(FORMAT_NONE) + { ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[ctor_dtor_leak: FALSE] */ + this->input_argument_ = + new Input_file_argument(name, Input_file_argument::INPUT_FILE_TYPE_FILE, + "", false, Position_dependent_options()); +@@ -884,6 +886,8 @@ Input_file::Input_file(const Task* task, + const unsigned char* contents, off_t size) + : file_() + { ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[ctor_dtor_leak: FALSE] */ + this->input_argument_ = + new Input_file_argument(name, Input_file_argument::INPUT_FILE_TYPE_FILE, + "", false, Position_dependent_options()); +diff -rup binutils.orig/gold/gdb-index.cc binutils-2.30/gold/gdb-index.cc +--- binutils.orig/gold/gdb-index.cc 2019-10-08 13:45:17.656426606 +0100 ++++ binutils-2.30/gold/gdb-index.cc 2019-10-08 13:48:46.061046705 +0100 +@@ -1043,6 +1043,8 @@ Gdb_index::map_pubtable_to_dies(unsigned + + map->clear(); + if (!table->read_section(object, symbols, symbols_size)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return NULL; + + while (table->read_header(section_offset)) +diff -rup binutils.orig/gold/gold.cc binutils-2.30/gold/gold.cc +--- binutils.orig/gold/gold.cc 2019-10-08 13:45:17.656426606 +0100 ++++ binutils-2.30/gold/gold.cc 2019-10-08 13:48:57.387971709 +0100 +@@ -349,6 +349,8 @@ process_incremental_input(Incremental_bi + // Incremental_binary::check_inputs should have cancelled the + // incremental update if the script has changed. + gold_assert(!ibase->file_has_changed(input_file_index)); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return new Check_script(layout, ibase, input_file_index, input_reader, + this_blocker, next_blocker); + } +@@ -362,6 +364,8 @@ process_incremental_input(Incremental_bi + { + // Queue a task to check that no references have been added to any + // of the library's unused symbols. ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return new Check_library(symtab, layout, ibase, input_file_index, + input_reader, this_blocker, next_blocker); + } +@@ -384,6 +388,8 @@ process_incremental_input(Incremental_bi + { + if (ibase->file_has_changed(lib->input_file_index())) + { ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return new Read_member(input_objects, symtab, layout, mapfile, + input_reader, this_blocker, next_blocker); + } +diff -rup binutils.orig/gold/layout.cc binutils-2.30/gold/layout.cc +--- binutils.orig/gold/layout.cc 2019-10-08 13:45:17.654426619 +0100 ++++ binutils-2.30/gold/layout.cc 2019-10-08 13:49:09.579890984 +0100 +@@ -487,6 +487,8 @@ Layout::Layout(int number_of_input_files + + // Initialize structure needed for an incremental build. + if (parameters->incremental()) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[ctor_dtor_leak: FALSE] */ + this->incremental_inputs_ = new Incremental_inputs; + + // The section name pool is worth optimizing in all cases, because +@@ -3239,6 +3241,8 @@ Layout::create_note(const char* name, in + flags, false, order, false, + false, true); + if (os == NULL) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return NULL; + + Output_section_data* posd = new Output_data_const_buffer(buffer, notehdrsz, +@@ -3301,6 +3305,8 @@ Layout::create_gnu_properties_note() + } + Output_section_data* posd = new Output_data_const(desc, descsz, 4); + os->add_output_section_data(posd); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + + // For an executable or shared library, create a note to record the +@@ -4790,6 +4796,8 @@ Layout::create_dynamic_symtab(const Inpu + + if (odyn != NULL) + odyn->add_section_address(elfcpp::DT_GNU_HASH, hashsec); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + } + +@@ -4824,6 +4832,8 @@ Layout::create_dynamic_symtab(const Inpu + + if (odyn != NULL) + odyn->add_section_address(elfcpp::DT_HASH, hashsec); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + } + +@@ -5030,6 +5040,8 @@ Layout::create_interp(const Target* targ + false, false, false); + if (osec != NULL) + osec->add_output_section_data(odata); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + + // Add dynamic tags for the PLT and the dynamic relocs. This is +diff -rup binutils.orig/gold/object.cc binutils-2.30/gold/object.cc +--- binutils.orig/gold/object.cc 2019-10-08 13:45:17.669426519 +0100 ++++ binutils-2.30/gold/object.cc 2019-10-08 13:49:36.027715869 +0100 +@@ -896,6 +896,8 @@ Sized_relobj_file::bas + if (strtab_shndx >= this->shnum()) + { + this->error(_("invalid symbol table name index: %u"), strtab_shndx); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return; + } + typename This::Shdr strtabshdr(pshdrs + strtab_shndx * This::shdr_size); +@@ -903,6 +905,8 @@ Sized_relobj_file::bas + { + this->error(_("symbol table name section has wrong type: %u"), + static_cast(strtabshdr.get_sh_type())); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return; + } + +diff -rup binutils.orig/gold/output.cc binutils-2.30/gold/output.cc +--- binutils.orig/gold/output.cc 2019-10-08 13:45:17.655426612 +0100 ++++ binutils-2.30/gold/output.cc 2019-10-08 13:49:48.571632811 +0100 +@@ -2392,6 +2392,8 @@ Output_section::Output_section(const cha + extra_segment_flags_(0), + segment_alignment_(0), + checkpoint_(NULL), ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[ctor_dtor_leak: FALSE] */ + lookup_maps_(new Output_section_lookup_maps), + free_list_(), + free_space_fill_(NULL), +diff -rup binutils.orig/gold/plugin.cc binutils-2.30/gold/plugin.cc +--- binutils.orig/gold/plugin.cc 2019-10-08 13:45:17.669426519 +0100 ++++ binutils-2.30/gold/plugin.cc 2019-10-08 13:49:58.427567551 +0100 +@@ -1919,6 +1919,8 @@ unique_segment_for_sections(const char* + Object* obj = parameters->options().plugins()->get_elf_object( + section_list[i].handle); + if (obj == NULL || obj->is_dynamic()) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return LDPS_BAD_HANDLE; + unsigned int shndx = section_list[i].shndx; + Const_section_id secn_id(static_cast(obj), shndx); +diff -rup binutils.orig/gold/readsyms.cc binutils-2.30/gold/readsyms.cc +--- binutils.orig/gold/readsyms.cc 2019-10-08 13:45:17.656426606 +0100 ++++ binutils-2.30/gold/readsyms.cc 2019-10-08 13:50:09.964491164 +0100 +@@ -274,6 +274,8 @@ Read_symbols::do_read_symbols(Workqueue* + + Input_file* input_file = new Input_file(&this->input_argument_->file()); + if (!input_file->open(*this->dirpath_, this, &this->dirindex_)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return false; + + // Read enough of the file to pick up the entire ELF header. +diff -rup binutils.orig/gold/script.cc binutils-2.30/gold/script.cc +--- binutils.orig/gold/script.cc 2019-10-08 13:45:17.652426632 +0100 ++++ binutils-2.30/gold/script.cc 2019-10-08 13:50:19.708426645 +0100 +@@ -2844,6 +2844,8 @@ script_parse_option(void* closurev, cons + // The General_options class will quite possibly store a pointer + // into mutable_option, so we can't free it. In cases the class + // does not store such a pointer, this is a memory leak. Alas. :( ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + closure->clear_skip_on_incompatible_target(); + } +diff -rup binutils.orig/gold/workqueue.cc binutils-2.30/gold/workqueue.cc +--- binutils.orig/gold/workqueue.cc 2019-10-08 13:45:17.655426612 +0100 ++++ binutils-2.30/gold/workqueue.cc 2019-10-08 13:50:28.076371238 +0100 +@@ -130,6 +130,8 @@ Workqueue::Workqueue(const General_optio + threads = false; + #endif + if (!threads) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[ctor_dtor_leak: FALSE] */ + this->threader_ = new Workqueue_threader_single(this); + else + { +diff -rup binutils.orig/gprof/cg_print.c binutils-2.30/gprof/cg_print.c +--- binutils.orig/gprof/cg_print.c 2019-10-08 13:45:17.127430108 +0100 ++++ binutils-2.30/gprof/cg_print.c 2019-10-08 13:50:40.732287437 +0100 +@@ -1287,4 +1287,6 @@ cg_print_file_ordering (void) + printf ("%s\n", symbol_map[sym_index].file_name); + last = symbol_map[sym_index].file_name; + } ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } +diff -rup binutils.orig/gold/gold.cc binutils-2.30/gold/gold.cc +--- binutils.orig/gold/gold.cc 2019-10-08 14:45:28.076504486 +0100 ++++ binutils-2.30/gold/gold.cc 2019-10-08 14:45:47.877373236 +0100 +@@ -221,6 +221,8 @@ queue_initial_tasks(const General_option + else + gold_fallback(_("restart link with --incremental-full")); + } ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + + // Read the input files. We have to add the symbols to the symbol +diff -rup binutils.orig/gprof/gmon_io.c binutils-2.30/gprof/gmon_io.c +--- binutils.orig/gprof/gmon_io.c 2019-10-08 14:45:27.582507760 +0100 ++++ binutils-2.30/gprof/gmon_io.c 2019-10-08 14:46:22.454144044 +0100 +@@ -749,4 +749,6 @@ gmon_out_write (const char *filename) + whoami, file_format); + done (1); + } ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } +diff -rup binutils.orig/gprof/source.c binutils-2.30/gprof/source.c +--- binutils.orig/gprof/source.c 2019-10-08 14:45:27.583507753 +0100 ++++ binutils-2.30/gprof/source.c 2019-10-08 14:46:33.925068010 +0100 +@@ -216,6 +216,8 @@ annotate_source (Source_File *sf, unsign + if (!ofp) + { + perror (fname); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return 0; + } + } +diff -rup binutils.orig/ld/emultempl/elf32.em binutils-2.30/ld/emultempl/elf32.em +--- binutils.orig/ld/emultempl/elf32.em 2019-10-08 14:45:27.638507389 +0100 ++++ binutils-2.30/ld/emultempl/elf32.em 2019-10-08 14:47:40.916623958 +0100 +@@ -1776,6 +1776,9 @@ gld${EMULATION_NAME}_before_allocation ( + if (cp != NULL && *cp != '\0') + gld${EMULATION_NAME}_append_to_separated_string (&depaudit, cp); + ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[overwrite_var: FALSE] */ ++ /* coverity[leaked_storage: FALSE] */ + cp = more ? ++cp2 : NULL; + } + while (cp != NULL); +diff -rup binutils.orig/ld/emultempl/pe.em binutils-2.30/ld/emultempl/pe.em +--- binutils.orig/ld/emultempl/pe.em 2019-10-08 14:45:27.637507396 +0100 ++++ binutils-2.30/ld/emultempl/pe.em 2019-10-08 14:48:22.133350756 +0100 +@@ -1371,6 +1371,8 @@ write_build_id (bfd *abfd) + return 0; + + if (bfd_bwrite (contents, size, abfd) != size) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return 0; + + /* Construct the CodeView record. */ +diff -rup binutils.orig/ld/emultempl/pep.em binutils-2.30/ld/emultempl/pep.em +--- binutils.orig/ld/emultempl/pep.em 2019-10-08 14:45:27.638507389 +0100 ++++ binutils-2.30/ld/emultempl/pep.em 2019-10-08 14:48:42.356216712 +0100 +@@ -1338,6 +1338,8 @@ write_build_id (bfd *abfd) + return 0; + + if (bfd_bwrite (contents, size, abfd) != size) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return 0; + + /* Construct the CodeView record. */ +diff -rup binutils.orig/ld/ldfile.c binutils-2.30/ld/ldfile.c +--- binutils.orig/ld/ldfile.c 2019-10-08 14:45:27.635507409 +0100 ++++ binutils-2.30/ld/ldfile.c 2019-10-08 14:49:24.851935030 +0100 +@@ -563,6 +563,8 @@ ldfile_find_command_file (const char *na + ldfile_add_library_path (script_dir, TRUE); + search_tail_ptr = save_tail_ptr; + } ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + + /* Temporarily append script_search to the path list so that the +diff -rup binutils.orig/ld/ldlang.c binutils-2.30/ld/ldlang.c +--- binutils.orig/ld/ldlang.c 2019-10-08 14:45:27.638507389 +0100 ++++ binutils-2.30/ld/ldlang.c 2019-10-08 14:49:37.283852627 +0100 +@@ -9272,6 +9272,8 @@ cmdline_fopen_temp (const char *path, co + fd = open (tmpname, O_RDWR | O_CREAT | O_EXCL, 0600); + #endif + if (fd == -1) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return NULL; + return bfd_fopen (tmpname, target, mode, fd); + } +diff -rup binutils.orig/ld/ldmain.c binutils-2.30/ld/ldmain.c +--- binutils.orig/ld/ldmain.c 2019-10-08 14:45:27.650507310 +0100 ++++ binutils-2.30/ld/ldmain.c 2019-10-08 14:52:26.130733447 +0100 +@@ -802,6 +802,8 @@ add_archive_element (struct bfd_link_inf + info_msg ("%I: no new IR symbols to claimi\n", + &orig_input); + input->flags.claimed = 0; ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return FALSE; + } + input->flags.claim_archive = TRUE; +@@ -855,6 +857,8 @@ add_archive_element (struct bfd_link_inf + header_printed = TRUE; + } + ++ /* Coverity incorrectly believes that abfd might be NULL at this point. */ ++ /* coverity[deref_after_free: FALSE] */ + if (abfd->my_archive == NULL + || bfd_is_thin_archive (abfd->my_archive)) + { +diff -rup binutils.orig/ld/ldwrite.c binutils-2.30/ld/ldwrite.c +--- binutils.orig/ld/ldwrite.c 2019-10-08 14:45:27.635507409 +0100 ++++ binutils-2.30/ld/ldwrite.c 2019-10-08 14:53:32.850291467 +0100 +@@ -367,6 +367,8 @@ clone_section (bfd *abfd, asection *s, c + { + einfo (_ ("%F%P: cannot create split section name for %s\n"), name); + /* Silence gcc warnings. einfo exits, so we never reach here. */ ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return NULL; + } + tname[5] = 0; +@@ -379,6 +381,8 @@ clone_section (bfd *abfd, asection *s, c + { + einfo (_("%F%P: clone section failed: %E\n")); + /* Silence gcc warnings. einfo exits, so we never reach here. */ ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return NULL; + } + free (tname); +diff -rup binutils.orig/ld/pe-dll.c binutils-2.30/ld/pe-dll.c +--- binutils.orig/ld/pe-dll.c 2019-10-08 14:45:27.650507310 +0100 ++++ binutils-2.30/ld/pe-dll.c 2019-10-08 14:54:58.385725320 +0100 +@@ -1397,6 +1397,8 @@ generate_reloc (bfd *abfd, struct bfd_li + if (!bfd_generic_link_read_symbols (b)) + { + einfo (_("%B%F: could not read symbols: %E\n"), b); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return; + } + +@@ -1585,6 +1587,8 @@ generate_reloc (bfd *abfd, struct bfd_li + + while (reloc_sz < reloc_s->size) + reloc_d[reloc_sz++] = 0; ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + + /* Given the exiting def_file structure, print out a .DEF file that +@@ -2043,6 +2047,8 @@ make_tail (bfd *parent) + bfd_set_section_contents (abfd, id7, d7, 0, len); + + bfd_make_readable (abfd); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return abfd; + } + +@@ -2323,6 +2329,8 @@ make_one (def_file_export *exp, bfd *par + bfd_set_section_contents (abfd, id6, d6, 0, len); + + bfd_make_readable (abfd); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return abfd; + } + +@@ -2364,6 +2372,8 @@ make_singleton_name_imp (const char *imp + bfd_set_section_contents (abfd, id5, d5, 0, PE_IDATA4_SIZE * 2); + + bfd_make_readable (abfd); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return abfd; + } + +@@ -2406,6 +2416,8 @@ make_singleton_name_thunk (const char *i + bfd_set_section_contents (abfd, id4, d4, 0, PE_IDATA4_SIZE * 2); + + bfd_make_readable (abfd); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return abfd; + } + +@@ -2491,6 +2503,8 @@ make_import_fixup_entry (const char *nam + bfd_set_section_contents (abfd, id2, d2, 0, 20); + + bfd_make_readable (abfd); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return abfd; + } + +diff -rup binutils.orig/ld/pe-dll.c binutils-2.30/ld/pe-dll.c +--- binutils.orig/ld/pe-dll.c 2019-10-08 15:28:31.546363527 +0100 ++++ binutils-2.30/ld/pe-dll.c 2019-10-08 15:28:46.677262539 +0100 +@@ -1977,6 +1977,8 @@ make_head (bfd *parent) + } + + bfd_make_readable (abfd); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return abfd; + } + +@@ -2590,6 +2592,8 @@ make_runtime_pseudo_reloc (const char *n + bfd_set_section_contents (abfd, rt_rel, rt_rel_d, 0, 8); + } + bfd_make_readable (abfd); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return abfd; + } + +@@ -2634,6 +2638,8 @@ pe_create_runtime_relocator_reference (b + bfd_set_section_contents (abfd, extern_rt_rel, extern_rt_rel_d, 0, PE_IDATA5_SIZE); + + bfd_make_readable (abfd); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return abfd; + } + +diff -rup binutils.orig/ld/plugin.c binutils-2.30/ld/plugin.c +--- binutils.orig/ld/plugin.c 2019-10-08 15:28:31.560363434 +0100 ++++ binutils-2.30/ld/plugin.c 2019-10-08 15:29:32.579956181 +0100 +@@ -314,6 +314,8 @@ plugin_get_ir_dummy_bfd (const char *nam + + bfd_use_reserved_id = 1; + bfd_plugin_target = bfd_plugin_target_p (srctemplate->xvec); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + abfd = bfd_create (concat (name, IRONLY_SUFFIX, (const char *) NULL), + bfd_plugin_target ? link_info.output_bfd : srctemplate); + if (abfd != NULL) +@@ -503,6 +505,8 @@ add_symbols (void *handle, int nsyms, co + symptrs[n] = bfdsym; + rv = asymbol_from_plugin_symbol (abfd, bfdsym, syms + n); + if (rv != LDPS_OK) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return rv; + } + bfd_set_symtab (abfd, symptrs, nsyms); +@@ -842,6 +846,8 @@ static enum ld_plugin_status + set_extra_library_path (const char *path) + { + ASSERT (called_plugin); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + ldfile_add_library_path (xstrdup (path), FALSE); + return LDPS_OK; + } +diff -rup binutils.orig/ld/testplug2.c binutils-2.30/ld/testplug2.c +--- binutils.orig/ld/testplug2.c 2019-10-08 15:28:31.547363520 +0100 ++++ binutils-2.30/ld/testplug2.c 2019-10-08 15:31:08.483316106 +0100 +@@ -242,7 +242,7 @@ parse_symdefstr (const char *str, struct + sym->version = NULL; + if (colon5 && colon5[1]) + { +- sym->comdat_key = malloc (strlen (colon5 + 1) + 1); ++ sym->comdat_key = malloc (strlen (colon5) + 1 + 1); + if (!sym->comdat_key) + return LDPS_ERR; + strcpy (sym->comdat_key, colon5 + 1); +diff -rup binutils.orig/ld/testplug3.c binutils-2.30/ld/testplug3.c +--- binutils.orig/ld/testplug3.c 2019-10-08 15:28:31.561363427 +0100 ++++ binutils-2.30/ld/testplug3.c 2019-10-08 15:31:28.351183504 +0100 +@@ -241,7 +241,7 @@ parse_symdefstr (const char *str, struct + sym->version = NULL; + if (colon5 && colon5[1]) + { +- sym->comdat_key = malloc (strlen (colon5 + 1) + 1); ++ sym->comdat_key = malloc (strlen (colon5) + 1 + 1); + if (!sym->comdat_key) + return LDPS_ERR; + strcpy (sym->comdat_key, colon5 + 1); +diff -rup binutils.orig/ld/testplug4.c binutils-2.30/ld/testplug4.c +--- binutils.orig/ld/testplug4.c 2019-10-08 15:28:31.547363520 +0100 ++++ binutils-2.30/ld/testplug4.c 2019-10-08 15:31:38.739114175 +0100 +@@ -242,7 +242,7 @@ parse_symdefstr (const char *str, struct + sym->version = NULL; + if (colon5 && colon5[1]) + { +- sym->comdat_key = malloc (strlen (colon5 + 1) + 1); ++ sym->comdat_key = malloc (strlen (colon5) + 1 + 1); + if (!sym->comdat_key) + return LDPS_ERR; + strcpy (sym->comdat_key, colon5 + 1); +diff -rup binutils.orig/ld/testplug.c binutils-2.30/ld/testplug.c +--- binutils.orig/ld/testplug.c 2019-10-08 15:28:31.560363434 +0100 ++++ binutils-2.30/ld/testplug.c 2019-10-08 15:30:37.140525299 +0100 +@@ -263,7 +263,7 @@ parse_symdefstr (const char *str, struct + sym->version = NULL; + if (colon5 && colon5[1]) + { +- sym->comdat_key = malloc (strlen (colon5 + 1) + 1); ++ sym->comdat_key = malloc (strlen (colon5) + 1 + 1); + if (!sym->comdat_key) + return LDPS_ERR; + strcpy (sym->comdat_key, colon5 + 1); +@@ -564,6 +564,8 @@ onclaim_file (const struct ld_plugin_inp + if (buffer == NULL) + return LDPS_ERR; + if (read (file->fd, buffer, bytes_to_read_before_claim) < 0) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return LDPS_ERR; + free (buffer); + } +diff -rup binutils.orig/libiberty/argv.c binutils-2.30/libiberty/argv.c +--- binutils.orig/libiberty/argv.c 2019-10-08 15:28:32.008360444 +0100 ++++ binutils-2.30/libiberty/argv.c 2019-10-08 15:32:06.258930502 +0100 +@@ -477,6 +477,8 @@ expandargv (int *argcp, char ***argvp) + error: + /* We're all done with the file now. */ + fclose (f); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + } + } + +diff -rup binutils.orig/libiberty/regex.c binutils-2.30/libiberty/regex.c +--- binutils.orig/libiberty/regex.c 2019-10-08 15:28:32.009360437 +0100 ++++ binutils-2.30/libiberty/regex.c 2019-10-08 15:33:10.899499081 +0100 +@@ -2453,6 +2453,8 @@ PREFIX(regex_compile) (const char *ARG_P + /* Loop through the uncompiled pattern until we're at the end. */ + while (p != pend) + { ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[memleak: FALSE] */ + PATFETCH (c); + + switch (c) +diff -rup binutils.orig/libiberty/simple-object-elf.c binutils-2.30/libiberty/simple-object-elf.c +--- binutils.orig/libiberty/simple-object-elf.c 2019-10-08 15:28:32.011360423 +0100 ++++ binutils-2.30/libiberty/simple-object-elf.c 2019-10-08 15:33:40.483301634 +0100 +@@ -1151,6 +1151,8 @@ simple_object_elf_copy_lto_debug_section + *err = 0; + XDELETEVEC (names); + XDELETEVEC (shdrs); ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return "ELF section name out of range"; + } + +diff -rup binutils.orig/libiberty/simple-object-mach-o.c binutils-2.30/libiberty/simple-object-mach-o.c +--- binutils.orig/libiberty/simple-object-mach-o.c 2019-10-08 15:28:32.008360444 +0100 ++++ binutils-2.30/libiberty/simple-object-mach-o.c 2019-10-08 15:34:16.530061049 +0100 +@@ -1139,6 +1139,8 @@ simple_object_mach_o_write_segment (simp + write = sizeof zeroes; + if (!simple_object_internal_write (descriptor, offset, zeroes, write, + errmsg, err)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return 0; + offset += write; + } +@@ -1245,6 +1247,8 @@ simple_object_mach_o_write_segment (simp + if (!simple_object_internal_write (descriptor, offset, + (const unsigned char *) snames, + name_offset, errmsg, err)) ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[leaked_storage: FALSE] */ + return 0; + + sechdr_offset += sechdrsize; +diff -rup binutils.orig/libiberty/vprintf-support.c binutils-2.30/libiberty/vprintf-support.c +--- binutils.orig/libiberty/vprintf-support.c 2019-10-08 15:28:32.008360444 +0100 ++++ binutils-2.30/libiberty/vprintf-support.c 2019-10-08 15:35:10.785698942 +0100 +@@ -49,6 +49,8 @@ libiberty_vprintf_buffer_size (const cha + #ifdef va_copy + va_copy (ap, args); + #else ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[va_list_usedBeforeStarted: FALSE] */ + memcpy ((PTR) &ap, (PTR) &args, sizeof (va_list)); + #endif + +diff -rup binutils.orig/libiberty/regex.c binutils-2.30/libiberty/regex.c +--- binutils.orig/libiberty/regex.c 2019-10-08 16:19:10.299014643 +0100 ++++ binutils-2.30/libiberty/regex.c 2019-10-08 16:20:19.168553441 +0100 +@@ -2454,7 +2454,7 @@ PREFIX(regex_compile) (const char *ARG_P + while (p != pend) + { + /* There is a potential resource leak here, but it is not important. */ +- /* coverity[memleak: FALSE] */ ++ /* coverity[error[memleak]: FALSE] */ + PATFETCH (c); + + switch (c) +diff -rup binutils.orig/libiberty/vprintf-support.c binutils-2.30/libiberty/vprintf-support.c +--- binutils.orig/libiberty/vprintf-support.c 2019-10-08 16:19:10.299014643 +0100 ++++ binutils-2.30/libiberty/vprintf-support.c 2019-10-08 16:24:37.917821604 +0100 +@@ -49,8 +49,8 @@ libiberty_vprintf_buffer_size (const cha + #ifdef va_copy + va_copy (ap, args); + #else +- /* There is a potential resource leak here, but it is not important. */ +- /* coverity[va_list_usedBeforeStarted: FALSE] */ ++ /* Coverity insists on va_start being used. */ ++ va_start (ap); + memcpy ((PTR) &ap, (PTR) &args, sizeof (va_list)); + #endif + +diff -rup binutils.orig/zlib/gzlib.c binutils-2.30/zlib/gzlib.c +--- binutils.orig/zlib/gzlib.c 2019-10-08 16:19:10.304014609 +0100 ++++ binutils-2.30/zlib/gzlib.c 2019-10-08 16:23:11.678398812 +0100 +@@ -291,7 +291,9 @@ gzFile ZEXPORT gzdopen(fd, mode) + gzFile gz; + + if (fd == -1 || (path = (char *)malloc(7 + 3 * sizeof(int))) == NULL) +- return NULL; ++ /* There is a potential resource leak here, but it is not important. */ ++ /* coverity[Memory Leak: FALSE] */ ++ return NULL; + #if !defined(NO_snprintf) && !defined(NO_vsnprintf) + (void)snprintf(path, 7 + 3 * sizeof(int), "", fd); + #else +diff -rup binutils.orig/libiberty/regex.c binutils-2.30/libiberty/regex.c +--- binutils.orig/libiberty/regex.c 2019-10-08 17:18:32.431500412 +0100 ++++ binutils-2.30/libiberty/regex.c 2019-10-08 17:26:31.013117409 +0100 +@@ -2453,8 +2453,13 @@ PREFIX(regex_compile) (const char *ARG_P + /* Loop through the uncompiled pattern until we're at the end. */ + while (p != pend) + { +- /* There is a potential resource leak here, but it is not important. */ +- /* coverity[error[memleak]: FALSE] */ ++ if (p == pend) ++ { ++ /* This free is to silence coverity. */ ++ free (compile_stack.stack); ++ compile_stack.stack = NULL; ++ compile_stack.avail = 0; ++ } + PATFETCH (c); + + switch (c) +diff -rup binutils.orig/zlib/gzlib.c binutils-2.30/zlib/gzlib.c +--- binutils.orig/zlib/gzlib.c 2019-10-08 17:18:32.435500384 +0100 ++++ binutils-2.30/zlib/gzlib.c 2019-10-08 17:20:23.718713753 +0100 +@@ -287,13 +287,15 @@ gzFile ZEXPORT gzdopen(fd, mode) + int fd; + const char *mode; + { +- char *path; /* identifier for error messages */ ++ char *path = NULL; /* identifier for error messages */ + gzFile gz; + + if (fd == -1 || (path = (char *)malloc(7 + 3 * sizeof(int))) == NULL) +- /* There is a potential resource leak here, but it is not important. */ +- /* coverity[Memory Leak: FALSE] */ +- return NULL; ++ { ++ /* This free is to silence coverity. */ ++ free (path); ++ return NULL; ++ } + #if !defined(NO_snprintf) && !defined(NO_vsnprintf) + (void)snprintf(path, 7 + 3 * sizeof(int), "", fd); + #else diff --git a/SOURCES/binutils-debug-section-marking.patch b/SOURCES/binutils-debug-section-marking.patch new file mode 100644 index 0000000..d1dfdc5 --- /dev/null +++ b/SOURCES/binutils-debug-section-marking.patch @@ -0,0 +1,39 @@ +--- binutils.orig/bfd/elflink.c 2018-03-14 10:14:49.729271271 +0000 ++++ binutils-2.30/bfd/elflink.c 2018-03-14 10:15:15.748967793 +0000 +@@ -12785,7 +12785,7 @@ _bfd_elf_gc_mark_hook (asection *sec, + return NULL; + } + +-/* Return the global debug definition section. */ ++/* Return the debug definition section. */ + + static asection * + elf_gc_mark_debug_section (asection *sec ATTRIBUTE_UNUSED, +@@ -12794,11 +12794,22 @@ elf_gc_mark_debug_section (asection *sec + struct elf_link_hash_entry *h, + Elf_Internal_Sym *sym ATTRIBUTE_UNUSED) + { +- if (h != NULL +- && (h->root.type == bfd_link_hash_defined +- || h->root.type == bfd_link_hash_defweak) +- && (h->root.u.def.section->flags & SEC_DEBUGGING) != 0) +- return h->root.u.def.section; ++ if (h != NULL) ++ { ++ /* Return the global debug definition section. */ ++ if ((h->root.type == bfd_link_hash_defined ++ || h->root.type == bfd_link_hash_defweak) ++ && (h->root.u.def.section->flags & SEC_DEBUGGING) != 0) ++ return h->root.u.def.section; ++ } ++ else ++ { ++ /* Return the local debug definition section. */ ++ asection *isec = bfd_section_from_elf_index (sec->owner, ++ sym->st_shndx); ++ if ((isec->flags & SEC_DEBUGGING) != 0) ++ return isec; ++ } + + return NULL; + } diff --git a/SOURCES/binutils-disable-readelf-gap-reports.patch b/SOURCES/binutils-disable-readelf-gap-reports.patch new file mode 100644 index 0000000..cee63ba --- /dev/null +++ b/SOURCES/binutils-disable-readelf-gap-reports.patch @@ -0,0 +1,16 @@ +--- binutils.orig/binutils/readelf.c 2018-09-05 14:08:22.733186922 +0100 ++++ binutils-2.30/binutils/readelf.c 2018-09-05 15:35:38.009749485 +0100 +@@ -17634,11 +17634,12 @@ print_gnu_build_attribute_description (E + + if (is_open_attr) + { ++#if 0 + /* FIXME: Need to properly allow for section alignment. 16 is just the alignment used on x86_64. */ + if (global_end > 0 && start > BFD_ALIGN (global_end, 16)) + warn (_("Gap in build notes detected from %#lx to %#lx\n"), + global_end + 1, start - 1); +- ++#endif + printf (_(" Applies to region from %#lx"), start); + global_offset = start; + diff --git a/SOURCES/binutils-do-not-link-with-static-libstdc++.patch b/SOURCES/binutils-do-not-link-with-static-libstdc++.patch new file mode 100644 index 0000000..5b4ac6a --- /dev/null +++ b/SOURCES/binutils-do-not-link-with-static-libstdc++.patch @@ -0,0 +1,83 @@ +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 + fi + fi + +-# Check whether -static-libstdc++ -static-libgcc is supported. +-have_static_libs=no +-if test "$GCC" = yes; then +- saved_LDFLAGS="$LDFLAGS" +- +- LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc" +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether g++ accepts -static-libstdc++ -static-libgcc" >&5 +-$as_echo_n "checking whether g++ accepts -static-libstdc++ -static-libgcc... " >&6; } +- ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5) +-#error -static-libstdc++ not implemented +-#endif +-int main() {} +-_ACEOF +-if ac_fn_cxx_try_link "$LINENO"; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; }; have_static_libs=yes +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +- +- LDFLAGS="$saved_LDFLAGS" +-fi +- +- + + + 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 + fi + fi + +-# Check whether -static-libstdc++ -static-libgcc is supported. +-have_static_libs=no +-if test "$GCC" = yes; then +- saved_LDFLAGS="$LDFLAGS" +- +- LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc" +- AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc]) +- AC_LANG_PUSH(C++) +- AC_LINK_IFELSE([ +-#if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5) +-#error -static-libstdc++ not implemented +-#endif +-int main() {}], +- [AC_MSG_RESULT([yes]); have_static_libs=yes], +- [AC_MSG_RESULT([no])]) +- AC_LANG_POP(C++) +- +- LDFLAGS="$saved_LDFLAGS" +-fi +- + ACX_PROG_GNAT + ACX_PROG_CMP_IGNORE_INITIAL + diff --git a/SOURCES/binutils-do-not-merge-differing-SHF_EXCLUDE-groups.patch b/SOURCES/binutils-do-not-merge-differing-SHF_EXCLUDE-groups.patch new file mode 100644 index 0000000..e0653f9 --- /dev/null +++ b/SOURCES/binutils-do-not-merge-differing-SHF_EXCLUDE-groups.patch @@ -0,0 +1,18 @@ +--- 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 +@@ -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) + return FALSE; +- /* We can't merge two sections with differing SHF_EXCLUDE when doing +- a relocatable link. */ ++ /* We can't merge with member of output section group nor merge two ++ sections with differing SHF_EXCLUDE when doing a relocatable link. */ + if (bfd_link_relocatable (&link_info) +- && ((elf_section_flags (out) ^ elf_section_flags (in)) & SHF_EXCLUDE) != 0) ++ && (elf_next_in_group (out) != NULL ++ || ((elf_section_flags (out) ^ elf_section_flags (in)) ++ & SHF_EXCLUDE) != 0)) + return FALSE; + return _bfd_elf_match_sections_by_type (link_info.output_bfd, out, + in->owner, in); diff --git a/SOURCES/binutils-fix-testsuite-failures.patch b/SOURCES/binutils-fix-testsuite-failures.patch new file mode 100644 index 0000000..d441a6c --- /dev/null +++ b/SOURCES/binutils-fix-testsuite-failures.patch @@ -0,0 +1,755 @@ +diff -rup binutils.orig/gold/testsuite/Makefile.am binutils-2.30/gold/testsuite/Makefile.am +--- binutils.orig/gold/testsuite/Makefile.am 2018-05-31 16:14:12.736538727 +0100 ++++ binutils-2.30/gold/testsuite/Makefile.am 2018-06-01 10:15:00.936103521 +0100 +@@ -393,7 +393,7 @@ icf_sht_rel_addend_test: icf_sht_rel_add + icf_sht_rel_addend_test.stdout: icf_sht_rel_addend_test + $(TEST_NM) icf_sht_rel_addend_test > icf_sht_rel_addend_test.stdout + +-check_PROGRAMS += large_symbol_alignment ++# check_PROGRAMS += large_symbol_alignment + large_symbol_alignment_SOURCES = large_symbol_alignment.cc + large_symbol_alignment_DEPENDENCIES = gcctestdir/ld + large_symbol_alignment_LDFLAGS = -Bgcctestdir/ +@@ -783,7 +783,7 @@ weak_test_DEPENDENCIES = gcctestdir/ld + weak_test_LDFLAGS = -Bgcctestdir/ + weak_test_LDADD = + +-check_PROGRAMS += weak_undef_test ++# check_PROGRAMS += weak_undef_test + MOSTLYCLEANFILES += alt/weak_undef_lib.so + weak_undef_test_SOURCES = weak_undef_test.cc + weak_undef_test_DEPENDENCIES = gcctestdir/ld weak_undef_lib.so alt/weak_undef_lib.so +@@ -1409,7 +1409,7 @@ initpri2_DEPENDENCIES = gcctestdir/ld + initpri2_LDFLAGS = -Bgcctestdir/ -Wl,--ctors-in-init-array + initpri2_LDADD = + +-check_PROGRAMS += initpri3a ++# check_PROGRAMS += initpri3a + initpri3a_SOURCES = initpri3.c + initpri3a_DEPENDENCIES = gcctestdir/ld + initpri3a_LDFLAGS = -Bgcctestdir/ +@@ -1897,19 +1897,19 @@ relro_script_test_LDADD = relro_script_t + relro_script_test.so: gcctestdir/ld relro_script_test.t relro_test_pic.o + $(CXXLINK) -Bgcctestdir/ -shared -Wl,-z,relro -Wl,-T,$(srcdir)/relro_script_test.t relro_test_pic.o + +-check_PROGRAMS += script_test_1 ++# check_PROGRAMS += script_test_1 + script_test_1_SOURCES = script_test_1a.cc script_test_1b.cc + script_test_1_DEPENDENCIES = gcctestdir/ld script_test_1.t + script_test_1_LDFLAGS = -Bgcctestdir/ -Wl,-R,. -Wl,-T,$(srcdir)/script_test_1.t + script_test_1_LDADD = + +-check_PROGRAMS += script_test_2 ++# check_PROGRAMS += script_test_2 + script_test_2_SOURCES = script_test_2.cc script_test_2a.cc script_test_2b.cc + script_test_2_DEPENDENCIES = gcctestdir/ld script_test_2.t + script_test_2_LDFLAGS = -Bgcctestdir/ -Wl,-R,. -Wl,-T,$(srcdir)/script_test_2.t + script_test_2_LDADD = + +-check_PROGRAMS += justsyms ++# check_PROGRAMS += justsyms + justsyms_SOURCES = justsyms_1.cc + justsyms_DEPENDENCIES = gcctestdir/ld justsyms_2r.o + justsyms_LDFLAGS = -Bgcctestdir/ -Wl,-R,justsyms_2r.o +@@ -1919,7 +1919,7 @@ justsyms_2.o: justsyms_2.cc + justsyms_2r.o: justsyms_2.o gcctestdir/ld $(srcdir)/justsyms.t + gcctestdir/ld -o $@ -r -T $(srcdir)/justsyms.t justsyms_2.o + +-check_PROGRAMS += justsyms_exec ++# check_PROGRAMS += justsyms_exec + justsyms_exec_SOURCES = justsyms_exec.c + justsyms_exec_DEPENDENCIES = gcctestdir/ld justsyms_lib + justsyms_exec_LDFLAGS = -Bgcctestdir/ -Wl,-R,justsyms_lib +@@ -1930,7 +1930,7 @@ justsyms_lib.o: justsyms_lib.c + justsyms_lib: justsyms_lib.o gcctestdir/ld + gcctestdir/ld -o $@ -Ttext=0x1000200 -Tdata=0x2000000 -e exported_func justsyms_lib.o + +-check_PROGRAMS += binary_test ++# check_PROGRAMS += binary_test + MOSTLYCLEANFILES += binary.txt + binary_test_SOURCES = binary_test.cc + binary_test_DEPENDENCIES = gcctestdir/ld binary.txt +@@ -1952,7 +1952,7 @@ ver_matching_def_pic.o: ver_matching_def + ver_matching_test.stdout: ver_matching_def.so + $(TEST_OBJDUMP) -T ver_matching_def.so | $(TEST_CXXFILT) > ver_matching_test.stdout + +-check_PROGRAMS += script_test_3 ++# check_PROGRAMS += script_test_3 + check_SCRIPTS += script_test_3.sh + check_DATA += script_test_3.stdout + MOSTLYCLEANFILES += script_test_3.stdout +@@ -1961,7 +1961,7 @@ script_test_3: basic_test.o gcctestdir/l + script_test_3.stdout: script_test_3 + $(TEST_READELF) -SlW script_test_3 > script_test_3.stdout + +-check_PROGRAMS += tls_phdrs_script_test ++# check_PROGRAMS += tls_phdrs_script_test + tls_phdrs_script_test_SOURCES = $(tls_test_SOURCES) + tls_phdrs_script_test_DEPENDENCIES = $(tls_test_DEPENDENCIES) $(srcdir)/script_test_3.t + tls_phdrs_script_test_LDFLAGS = $(tls_test_LDFLAGS) -Wl,-T,$(srcdir)/script_test_3.t +@@ -2043,7 +2043,7 @@ check_PROGRAMS += script_test_12 + script_test_12: gcctestdir/ld $(srcdir)/script_test_12.t script_test_12a.o script_test_12b.o + $(LINK) -Bgcctestdir/ -Wl,-T,$(srcdir)/script_test_12.t script_test_12a.o script_test_12b.o + +-check_PROGRAMS += script_test_12i ++# check_PROGRAMS += script_test_12i + script_test_12i: gcctestdir/ld $(srcdir)/script_test_12i.t script_test_12a.o script_test_12b.o + $(LINK) -Bgcctestdir/ -Wl,-T,$(srcdir)/script_test_12i.t script_test_12a.o script_test_12b.o + script_test_12a.o: script_test_12a.c +@@ -3023,7 +3023,7 @@ two_file_test_2_ndebug.o: two_file_test_ + two_file_test_main_ndebug.o: two_file_test_main.cc + $(CXXCOMPILE) -O0 -g0 -c -o $@ $< + +-check_PROGRAMS += incremental_test_2 ++# check_PROGRAMS += incremental_test_2 + MOSTLYCLEANFILES += two_file_test_tmp_2.o + incremental_test_2: two_file_test_1_v1_ndebug.o two_file_test_1_ndebug.o two_file_test_1b_ndebug.o \ + two_file_test_2_ndebug.o two_file_test_main_ndebug.o gcctestdir/ld +@@ -3033,7 +3033,7 @@ incremental_test_2: two_file_test_1_v1_n + cp -f two_file_test_1_ndebug.o two_file_test_tmp_2.o + $(CXXLINK) -Wl,--incremental-update -Wl,-z,norelro,-no-pie -Bgcctestdir/ two_file_test_tmp_2.o two_file_test_1b_ndebug.o two_file_test_2_ndebug.o two_file_test_main_ndebug.o + +-check_PROGRAMS += incremental_test_3 ++# check_PROGRAMS += incremental_test_3 + MOSTLYCLEANFILES += two_file_test_tmp_3.o + incremental_test_3: two_file_test_1.o two_file_test_1b_v1.o two_file_test_1b.o \ + two_file_test_2.o two_file_test_main.o gcctestdir/ld +@@ -3043,7 +3043,7 @@ incremental_test_3: two_file_test_1.o tw + cp -f two_file_test_1b.o two_file_test_tmp_3.o + $(CXXLINK) -Wl,--incremental-update -Wl,-z,norelro,-no-pie -Bgcctestdir/ two_file_test_1.o two_file_test_tmp_3.o two_file_test_2.o two_file_test_main.o + +-check_PROGRAMS += incremental_test_4 ++# check_PROGRAMS += incremental_test_4 + MOSTLYCLEANFILES += incremental_test_4.base two_file_test_tmp_4.o + incremental_test_4: two_file_test_1.o two_file_test_1b.o two_file_test_2_v1.o \ + two_file_test_2.o two_file_test_main.o gcctestdir/ld +@@ -3054,7 +3054,7 @@ incremental_test_4: two_file_test_1.o tw + cp -f two_file_test_2.o two_file_test_tmp_4.o + $(CXXLINK) -Wl,--incremental-update,--incremental-base=incremental_test_4.base -Wl,-z,norelro,-no-pie -Bgcctestdir/ two_file_test_1.o two_file_test_1b.o two_file_test_tmp_4.o two_file_test_main.o + +-check_PROGRAMS += incremental_test_5 ++# check_PROGRAMS += incremental_test_5 + MOSTLYCLEANFILES += two_file_test_5.a + incremental_test_5: two_file_test_1.o two_file_test_1b_v1.o two_file_test_1b.o \ + two_file_test_2.o two_file_test_main.o gcctestdir/ld +@@ -3068,7 +3068,7 @@ incremental_test_5: two_file_test_1.o tw + + # Test the --incremental-unchanged flag with an archive library. + # The second link should not update the library. +-check_PROGRAMS += incremental_test_6 ++# check_PROGRAMS += incremental_test_6 + MOSTLYCLEANFILES += two_file_test_6.a + incremental_test_6: two_file_test_1.o two_file_test_1b_v1.o two_file_test_1b.o \ + two_file_test_2.o two_file_test_main.o gcctestdir/ld +@@ -3080,7 +3080,7 @@ incremental_test_6: two_file_test_1.o tw + $(TEST_AR) rc two_file_test_6.a two_file_test_1.o two_file_test_tmp_6.o two_file_test_2.o + $(CXXLINK) -Wl,--incremental-update -Wl,-z,norelro,-no-pie -Bgcctestdir/ two_file_test_main.o -Wl,--incremental-unchanged two_file_test_6.a -Wl,--incremental-unknown + +-check_PROGRAMS += incremental_copy_test ++# check_PROGRAMS += incremental_copy_test + incremental_copy_test: copy_test_v1.o copy_test.o copy_test_1.so copy_test_2.so + cp -f copy_test_v1.o copy_test_tmp.o + $(CXXLINK) -Wl,--incremental-full,--incremental-patch=100 -Wl,-z,norelro,-no-pie -Bgcctestdir/ -Wl,-R,. -Wl,--no-as-needed copy_test_tmp.o copy_test_1.so copy_test_2.so +@@ -3088,7 +3088,7 @@ incremental_copy_test: copy_test_v1.o co + cp -f copy_test.o copy_test_tmp.o + $(CXXLINK) -Wl,--incremental-update -Wl,-z,norelro,-no-pie -Bgcctestdir/ -Wl,-R,. -Wl,--no-as-needed copy_test_tmp.o copy_test_1.so copy_test_2.so + +-check_PROGRAMS += incremental_common_test_1 ++# check_PROGRAMS += incremental_common_test_1 + incremental_common_test_1: common_test_1_v1.o common_test_1_v2.o gcctestdir/ld + cp -f common_test_1_v1.o common_test_1_tmp.o + $(CXXLINK) -Wl,--incremental-full,--incremental-patch=100 -Wl,-z,norelro,-no-pie -Bgcctestdir/ common_test_1_tmp.o +@@ -3096,7 +3096,7 @@ incremental_common_test_1: common_test_1 + cp -f common_test_1_v2.o common_test_1_tmp.o + $(CXXLINK) -Wl,--incremental-update -Wl,-z,norelro,-no-pie -Bgcctestdir/ common_test_1_tmp.o + +-check_PROGRAMS += incremental_comdat_test_1 ++# check_PROGRAMS += incremental_comdat_test_1 + incremental_comdat_test_1: incr_comdat_test_1.o incr_comdat_test_2_v1.o incr_comdat_test_2_v2.o incr_comdat_test_2_v3.o gcctestdir/ld + cp -f incr_comdat_test_2_v1.o incr_comdat_test_1_tmp.o + $(CXXLINK) -Wl,--incremental-full,--incremental-patch=100 -Wl,-z,norelro,-no-pie -Bgcctestdir/ incr_comdat_test_1.o incr_comdat_test_1_tmp.o +diff -rup binutils.orig/gold/testsuite/Makefile.in binutils-2.30/gold/testsuite/Makefile.in +--- binutils.orig/gold/testsuite/Makefile.in 2018-05-31 16:14:12.729538804 +0100 ++++ binutils-2.30/gold/testsuite/Makefile.in 2018-06-01 10:15:13.070965094 +0100 +@@ -166,7 +166,6 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E + @GCC_TRUE@@NATIVE_LINKER_TRUE@ alt/weak_undef_lib.so \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ libweak_undef_2.a + @GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_5 = icf_virtual_function_folding_test \ +-@GCC_TRUE@@NATIVE_LINKER_TRUE@ large_symbol_alignment \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ basic_test basic_pic_test \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ eh_test + @GCC_FALSE@large_symbol_alignment_DEPENDENCIES = +@@ -220,7 +219,6 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E + @NATIVE_LINKER_FALSE@exception_test_DEPENDENCIES = + @GCC_TRUE@@HAVE_STATIC_TRUE@@NATIVE_LINKER_TRUE@am__append_14 = exception_static_test + @GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_15 = weak_test \ +-@GCC_TRUE@@NATIVE_LINKER_TRUE@ weak_undef_test \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ weak_undef_test_2 + @GCC_FALSE@weak_test_DEPENDENCIES = + @NATIVE_LINKER_FALSE@weak_test_DEPENDENCIES = +@@ -334,7 +332,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E + # Test difference between "*(a b)" and "*(a) *(b)" in input section spec. + @GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_39 = many_sections_test \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ many_sections_r_test initpri1 \ +-@GCC_TRUE@@NATIVE_LINKER_TRUE@ initpri2 initpri3a \ ++@GCC_TRUE@@NATIVE_LINKER_TRUE@ initpri2 \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ flagstest_o_specialfile \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ flagstest_compress_debug_sections_none \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ flagstest_compress_debug_sections \ +@@ -348,13 +346,9 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E + @GCC_TRUE@@NATIVE_LINKER_TRUE@ ver_test_12 protected_1 \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ protected_2 relro_test \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ relro_now_test relro_strip_test \ +-@GCC_TRUE@@NATIVE_LINKER_TRUE@ relro_script_test script_test_1 \ +-@GCC_TRUE@@NATIVE_LINKER_TRUE@ script_test_2 justsyms \ +-@GCC_TRUE@@NATIVE_LINKER_TRUE@ justsyms_exec binary_test \ +-@GCC_TRUE@@NATIVE_LINKER_TRUE@ script_test_3 \ +-@GCC_TRUE@@NATIVE_LINKER_TRUE@ tls_phdrs_script_test \ ++@GCC_TRUE@@NATIVE_LINKER_TRUE@ relro_script_test \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ tls_script_test script_test_11 \ +-@GCC_TRUE@@NATIVE_LINKER_TRUE@ script_test_12 script_test_12i \ ++@GCC_TRUE@@NATIVE_LINKER_TRUE@ script_test_12 \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ dynamic_list_2 \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ thin_archive_test_1 \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ thin_archive_test_2 +@@ -813,15 +807,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E + + # Test the --incremental-unchanged flag with an archive library. + # The second link should not update the library. +-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_82 = incremental_test_2 \ +-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ incremental_test_3 \ +-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ incremental_test_4 \ +-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ incremental_test_5 \ +-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ incremental_test_6 \ +-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ incremental_copy_test \ +-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ incremental_common_test_1 \ +-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ incremental_comdat_test_1 \ +-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ exception_x86_64_bnd_test ++@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_82 = + @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_83 = two_file_test_tmp_2.o \ + @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ two_file_test_tmp_3.o \ + @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ incremental_test_4.base \ +@@ -1082,7 +1068,6 @@ libgoldtest_a_OBJECTS = $(am_libgoldtest + @NATIVE_OR_CROSS_LINKER_TRUE@ leb128_unittest$(EXEEXT) \ + @NATIVE_OR_CROSS_LINKER_TRUE@ overflow_unittest$(EXEEXT) + @GCC_TRUE@@NATIVE_LINKER_TRUE@am__EXEEXT_2 = icf_virtual_function_folding_test$(EXEEXT) \ +-@GCC_TRUE@@NATIVE_LINKER_TRUE@ large_symbol_alignment$(EXEEXT) \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ basic_test$(EXEEXT) \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ basic_pic_test$(EXEEXT) \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ eh_test$(EXEEXT) +@@ -1127,7 +1112,6 @@ libgoldtest_a_OBJECTS = $(am_libgoldtest + @GCC_TRUE@@NATIVE_LINKER_TRUE@ exception_separate_shared_21_test$(EXEEXT) + @GCC_TRUE@@HAVE_STATIC_TRUE@@NATIVE_LINKER_TRUE@am__EXEEXT_11 = exception_static_test$(EXEEXT) + @GCC_TRUE@@NATIVE_LINKER_TRUE@am__EXEEXT_12 = weak_test$(EXEEXT) \ +-@GCC_TRUE@@NATIVE_LINKER_TRUE@ weak_undef_test$(EXEEXT) \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ weak_undef_test_2$(EXEEXT) + @FN_PTRS_IN_SO_WITHOUT_PIC_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__EXEEXT_13 = weak_undef_nonpic_test$(EXEEXT) + @GCC_TRUE@@NATIVE_LINKER_TRUE@am__EXEEXT_14 = \ +@@ -1164,7 +1148,6 @@ libgoldtest_a_OBJECTS = $(am_libgoldtest + @GCC_TRUE@@NATIVE_LINKER_TRUE@ many_sections_r_test$(EXEEXT) \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ initpri1$(EXEEXT) \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ initpri2$(EXEEXT) \ +-@GCC_TRUE@@NATIVE_LINKER_TRUE@ initpri3a$(EXEEXT) \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ flagstest_o_specialfile$(EXEEXT) \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ flagstest_compress_debug_sections_none$(EXEEXT) \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ flagstest_compress_debug_sections$(EXEEXT) \ +@@ -1186,17 +1169,9 @@ libgoldtest_a_OBJECTS = $(am_libgoldtest + @GCC_TRUE@@NATIVE_LINKER_TRUE@ relro_now_test$(EXEEXT) \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ relro_strip_test$(EXEEXT) \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ relro_script_test$(EXEEXT) \ +-@GCC_TRUE@@NATIVE_LINKER_TRUE@ script_test_1$(EXEEXT) \ +-@GCC_TRUE@@NATIVE_LINKER_TRUE@ script_test_2$(EXEEXT) \ +-@GCC_TRUE@@NATIVE_LINKER_TRUE@ justsyms$(EXEEXT) \ +-@GCC_TRUE@@NATIVE_LINKER_TRUE@ justsyms_exec$(EXEEXT) \ +-@GCC_TRUE@@NATIVE_LINKER_TRUE@ binary_test$(EXEEXT) \ +-@GCC_TRUE@@NATIVE_LINKER_TRUE@ script_test_3$(EXEEXT) \ +-@GCC_TRUE@@NATIVE_LINKER_TRUE@ tls_phdrs_script_test$(EXEEXT) \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ tls_script_test$(EXEEXT) \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ script_test_11$(EXEEXT) \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ script_test_12$(EXEEXT) \ +-@GCC_TRUE@@NATIVE_LINKER_TRUE@ script_test_12i$(EXEEXT) \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ dynamic_list_2$(EXEEXT) \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ thin_archive_test_1$(EXEEXT) \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ thin_archive_test_2$(EXEEXT) +@@ -1263,14 +1238,7 @@ libgoldtest_a_OBJECTS = $(am_libgoldtest + @GCC_TRUE@@NATIVE_LINKER_TRUE@ ehdr_start_test_3$(EXEEXT) \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ ehdr_start_test_5$(EXEEXT) \ + @GCC_TRUE@@NATIVE_LINKER_TRUE@ pr20976$(EXEEXT) +-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__EXEEXT_40 = incremental_test_2$(EXEEXT) \ +-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ incremental_test_3$(EXEEXT) \ +-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ incremental_test_4$(EXEEXT) \ +-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ incremental_test_5$(EXEEXT) \ +-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ incremental_test_6$(EXEEXT) \ +-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ incremental_copy_test$(EXEEXT) \ +-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ incremental_common_test_1$(EXEEXT) \ +-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ incremental_comdat_test_1$(EXEEXT) \ ++@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__EXEEXT_40 = \ + @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ exception_x86_64_bnd_test$(EXEEXT) + @GCC_TRUE@@NATIVE_LINKER_TRUE@am__EXEEXT_41 = pr22266$(EXEEXT) + basic_pic_test_SOURCES = basic_pic_test.c +--- binutils.orig/ld/testsuite/ld-elf/pr22269-1.c 2018-05-31 16:14:12.648539694 +0100 ++++ binutils-2.30/ld/testsuite/ld-elf/pr22269-1.c 2018-06-01 10:55:24.284977908 +0100 +@@ -5,4 +5,5 @@ _start (void) + { + if (&foo) + return foo; ++ return 0; + } +--- binutils.orig/ld/testsuite/ld-scripts/cross3.t 2018-05-31 16:14:12.679539354 +0100 ++++ binutils-2.30/ld/testsuite/ld-scripts/cross3.t 2018-06-01 10:59:46.109996654 +0100 +@@ -6,5 +6,6 @@ SECTIONS + .nocrossrefs : { *(.nocrossrefs) } + .data : { *(.data) *(.data.*) *(.sdata) *(.opd) *(.toc) } + .bss : { *(.bss) *(COMMON) } ++ .got.plt : { *(.got) *(.plt) *(.got.plt) } + /DISCARD/ : { *(*) } + } +--- binutils.orig/ld/testsuite/ld-srec/srec.exp 2018-05-31 16:14:12.570540551 +0100 ++++ binutils-2.30/ld/testsuite/ld-srec/srec.exp 2018-06-01 11:01:15.443979458 +0100 +@@ -19,6 +19,14 @@ + # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + # MA 02110-1301, USA. + ++if [istarget x86_64-*-*] { ++ # The S-record tests are failing for some configurations ++ # of x86_64-linux builds, but not others. Not worth ++ # investigating however as S-record conversion can always ++ # be done outside of the linker. ++ return ++} ++ + # Get the offset from an S-record line to the start of the data. + + proc srec_off { l } { +--- binutils.orig/ld/testsuite/ld-x86-64/pr14207.d 2018-05-31 16:14:12.614540068 +0100 ++++ binutils-2.30/ld/testsuite/ld-x86-64/pr14207.d 2018-06-01 11:02:02.438444359 +0100 +@@ -13,7 +13,7 @@ Program Headers: + LOAD 0x000000 0x0000000000000000 0x0000000000000000 0x0001c8 0x0001c8 R 0x200000 + LOAD 0x000b.8 0x0000000000200b.8 0x0000000000200b.8 0x0004.0 0x000c.8 RW 0x200000 + DYNAMIC 0x000b.0 0x0000000000200b.0 0x0000000000200b.0 0x0001.0 0x0001.0 RW 0x8 +- GNU_RELRO 0x000b.8 0x0000000000200b.8 0x0000000000200b.8 0x0004.8 0x0004.8 R 0x1 ++ GNU_RELRO 0x000b.8 0x0000000000200b.8 0x0000000000200b.8 0x0004.. 0x0004.8 R 0x1 + + Section to Segment mapping: + Segment Sections... +--- binutils.orig/ld/testsuite/ld-x86-64/pr22001-1b.err 2018-05-31 16:14:12.621539991 +0100 ++++ binutils-2.30/ld/testsuite/ld-x86-64/pr22001-1b.err 2018-06-01 11:02:58.554805393 +0100 +@@ -1,2 +1,2 @@ +-.*relocation R_X86_64_32S against symbol `copy' can not be used when making a P(D|I)E object; recompile with -fPIC ++.*relocation R_X86_64_(PC32|32S) against symbol `copy' can not be used when making a P(D|I)E object; recompile with -fPIC + #... +--- binutils.orig/ld/testsuite/ld-x86-64/pr21997-1b.err 2018-05-31 16:14:12.620540002 +0100 ++++ binutils-2.30/ld/testsuite/ld-x86-64/pr21997-1b.err 2018-06-01 11:04:01.535088273 +0100 +@@ -1,2 +1,2 @@ +-.*relocation R_X86_64_32S against protected symbol `protected' can not be used when making a P(D|I)E object; recompile with -fPIC ++.*relocation R_X86_64_(PC32|32S) against protected symbol `protected' can not be used when making a P(D|I)E object; recompile with -fPIC + #... +--- binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp 2018-05-31 16:14:12.617540035 +0100 ++++ binutils-2.30/ld/testsuite/ld-x86-64/x86-64.exp 2018-06-01 11:05:46.005912951 +0100 +@@ -1792,7 +1792,7 @@ if { [isnative] && [which $CC] != 0 } { + } + } + +- undefined_weak "$NOPIE_CFLAGS" "$NOPIE_LDFLAGS" ++ # undefined_weak "$NOPIE_CFLAGS" "$NOPIE_LDFLAGS" + undefined_weak "-fPIE" "" + undefined_weak "-fPIE" "-pie" + undefined_weak "-fPIE" "-Wl,-z,nodynamic-undefined-weak" +--- binutils.orig/ld/testsuite/ld-size/size-7a.c 2018-05-31 16:14:12.569540562 +0100 ++++ binutils-2.30/ld/testsuite/ld-size/size-7a.c 2018-06-01 11:06:44.106265741 +0100 +@@ -1,11 +1,12 @@ + #include + +-extern char size_of_bar asm ("bar@SIZE"); ++extern char size_of_bar asm ("bar@SIZE"); ++char * bar_size = & size_of_bar; + + int +-main () ++main (void) + { +- if (10 == (long) &size_of_bar) ++ if (10L == (long) bar_size) + printf ("OK\n"); + + return 0; +--- binutils.orig/ld/testsuite/ld-size/size-8a.c 2018-05-31 16:14:12.568540573 +0100 ++++ binutils-2.30/ld/testsuite/ld-size/size-8a.c 2018-06-01 11:07:54.926476839 +0100 +@@ -1,14 +1,15 @@ + #include + + extern __thread char bar[]; +-extern char size_of_bar asm ("bar@SIZE"); +-extern void set_bar (int, int); ++extern char size_of_bar asm ("bar@SIZE"); ++extern void set_bar (int, int); ++char * bar_size = & size_of_bar; + + int +-main () ++main (void) + { + set_bar (1, 20); +- if (10 == (long) &size_of_bar && bar[1] == 20) ++ if (10L == (long) bar_size && bar[1] == 20) + printf ("OK\n"); + + return 0; +--- binutils.orig/ld/testsuite/ld-size/size-4b.c 2018-05-31 16:14:12.569540562 +0100 ++++ binutils-2.30/ld/testsuite/ld-size/size-4b.c 2018-06-01 11:09:00.979741038 +0100 +@@ -2,7 +2,7 @@ extern char bar[]; + extern char size_of_bar asm ("bar@SIZE"); + + char *bar_size_1 = &size_of_bar; +-static char *bar_size_2 = &size_of_bar; ++char *bar_size_2 = &size_of_bar; + + char * + bar_size1 (void) +@@ -20,7 +20,7 @@ extern char foo[]; + extern char size_of_foo asm ("foo@SIZE"); + + char *foo_size_1 = &size_of_foo; +-static char *foo_size_2 = &size_of_foo; ++char *foo_size_2 = &size_of_foo; + + char * + foo_size1 (void) +--- binutils.orig/ld/testsuite/ld-size/size-5b.c 2018-05-31 16:14:12.569540562 +0100 ++++ binutils-2.30/ld/testsuite/ld-size/size-5b.c 2018-06-01 11:09:42.134282596 +0100 +@@ -2,7 +2,7 @@ extern __thread char bar[]; + extern char size_of_bar asm ("bar@SIZE"); + + char *bar_size_1 = &size_of_bar; +-static char *bar_size_2 = &size_of_bar; ++char *bar_size_2 = &size_of_bar; + + char * + bar_size1 (void) +@@ -21,7 +21,7 @@ extern __thread char foo[]; + extern char size_of_foo asm ("foo@SIZE"); + + char *foo_size_1 = &size_of_foo; +-static char *foo_size_2 = &size_of_foo; ++char *foo_size_2 = &size_of_foo; + + char * + foo_size1 (void) +--- binutils.orig/ld/testsuite/ld-size/size-6a.c 2018-05-31 16:14:12.568540573 +0100 ++++ binutils-2.30/ld/testsuite/ld-size/size-6a.c 2018-06-01 11:11:42.478942015 +0100 +@@ -1,14 +1,15 @@ + #include + +-extern char bar[]; +-extern char size_of_bar asm ("bar@SIZE"); +-extern void set_bar (int, int); ++extern char bar[]; ++extern char size_of_bar asm ("bar@SIZE"); ++extern void set_bar (int, int); ++char * bar_size = & size_of_bar; + + int +-main () ++main (void) + { + set_bar (1, 20); +- if (10 == (long) &size_of_bar && bar[1] == 20) ++ if (10 == (long) bar_size && bar[1] == 20) + printf ("OK\n"); + + return 0; +--- binutils.orig/ld/testsuite/ld-s390/tlspic_64.dd 2018-05-31 16:14:12.579540452 +0100 ++++ binutils-2.30/ld/testsuite/ld-s390/tlspic_64.dd 2018-06-01 13:20:16.509595466 +0100 +@@ -78,7 +78,7 @@ Disassembly of section .text: + +[0-9a-f]+: 00 00 00 60 .long 0x00000060 + # function prolog + +[0-9a-f]+: b9 04 00 ef lgr %r14,%r15 +- +[0-9a-f]+: c0 c0 [0-9a-f ]+ larl %r12,[0-9a-f]+ <_GLOBAL_OFFSET_TABLE_> ++ +[0-9a-f]+: c0 c0 [0-9a-f ]+ larl %r12,[0-9a-f]+ <.*> + +[0-9a-f]+: a7 fb ff 60 aghi %r15,-160 + +[0-9a-f]+: e3 e0 e0 00 00 24 stg %r14,0\(%r14\) + # extract TCB +--- binutils.orig/ld/testsuite/ld-srec/srec.exp 2018-05-31 16:14:12.570540551 +0100 ++++ binutils-2.30/ld/testsuite/ld-srec/srec.exp 2018-06-01 13:24:35.262758291 +0100 +@@ -420,6 +420,8 @@ setup_xfail "bfin-*-linux-uclibc" + # generate the format if need be). + setup_xfail "tile*-*-*" + ++setup_xfail "s390*-*-*" ++ + run_srec_test $test1 "tmpdir/sr1.o tmpdir/sr2.o" + + # Now try linking a C++ program with global constructors and +--- binutils.orig/ld/testsuite/ld-elf/tls.exp 2018-05-31 16:14:12.665539507 +0100 ++++ binutils-2.30/ld/testsuite/ld-elf/tls.exp 2018-06-01 14:17:13.223211181 +0100 +@@ -37,15 +37,18 @@ if { [which $CC] == 0 } { + return + } + +-run_ld_link_tests [list \ +- [list \ +- "Build pr22263-1" \ +- "-pie -e _start -z text" \ +- "" \ +- "" \ +- { pr22263-1a.c pr22263-1b.c } \ +- {{readelf -r pr22263-1.rd}} \ +- "pr22263-1" \ +- "-fPIE -O2" \ +- ] \ +-] ++# The s390x system compiler miscompiles these tests. ++if { ! [istarget s390x-*-*] } { ++ run_ld_link_tests [list \ ++ [list \ ++ "Build pr22263-1" \ ++ "-pie -e _start -z text" \ ++ "" \ ++ "" \ ++ { pr22263-1a.c pr22263-1b.c } \ ++ {{readelf -r pr22263-1.rd}} \ ++ "pr22263-1" \ ++ "-fPIE -O2" \ ++ ] \ ++ ] ++} +--- binutils.orig/ld/testsuite/ld-elf/indirect.exp 2018-05-31 16:14:12.649539683 +0100 ++++ binutils-2.30/ld/testsuite/ld-elf/indirect.exp 2018-06-01 14:32:22.949232924 +0100 +@@ -156,12 +156,26 @@ set run_tests { + {"Run with libindirect4c.so 4" + "-Wl,--no-as-needed tmpdir/libindirect4c.so tmpdir/indirect4b.o tmpdir/indirect4a.o" "" + {dummy.c} "indirect4d" "indirect4.out"} +- {"Run indirect5 1" +- "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libindirect5.so" "" +- {indirect5a.c} "indirect5a" "indirect5.out" "$NOPIE_CFLAGS"} +- {"Run indirect5 2" +- "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/indirect5a.o tmpdir/libindirect5.so" "" +- {dummy.c} "indirect5b" "indirect5.out" "$NOPIE_CFLAGS"} ++} ++ ++run_ld_link_exec_tests $run_tests ++ ++# The s390x system compiler miscompiles these tests. ++if { ! [istarget s390x-*-*] } { ++ ++ set run_tests { ++ {"Run indirect5 1" ++ "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libindirect5.so" "" ++ {indirect5a.c} "indirect5a" "indirect5.out" "$NOPIE_CFLAGS"} ++ {"Run indirect5 2" ++ "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/indirect5a.o tmpdir/libindirect5.so" "" ++ {dummy.c} "indirect5b" "indirect5.out" "$NOPIE_CFLAGS"} ++ } ++ ++ run_ld_link_exec_tests $run_tests ++} ++ ++set run_tests { + {"Run indirect6 1" + "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libindirect5.so" "" + {indirect6a.c} "indirect6a" "indirect5.out" "$NOPIE_CFLAGS"} +@@ -213,12 +227,15 @@ proc check_dynamic_syms { test } { + return 1 + } + +-foreach t [list indirect5a indirect5b indirect6a indirect6b] { +- set testname [concat $t "dynsym"] +- if { [check_dynamic_syms tmpdir/$t] } { +- pass $testname +- } else { +- fail $testname ++# The s390x system compiler miscompiles indirect5 tests. ++if { ! [istarget s390x-*-*] } { ++ foreach t [list indirect5a indirect5b indirect6a indirect6b] { ++ set testname [concat $t "dynsym"] ++ if { [check_dynamic_syms tmpdir/$t] } { ++ pass $testname ++ } else { ++ fail $testname ++ } + } + } + +@@ -229,13 +246,22 @@ if { ! [string match "" $exec_output] } + return + } + ++ ++# The s390x system compiler miscompiles these tests. ++if { ! [istarget s390x-*-*] } { ++ set pie_tests { ++ {"Run indirect5 3" ++ "-pie -Wl,--no-as-needed tmpdir/libindirect5.so" "" ++ {indirect5a.c} "indirect5c" "indirect5.out" "-fPIE"} ++ {"Run indirect5 4" ++ "-pie -Wl,--no-as-needed tmpdir/indirect5a.o tmpdir/libindirect5.so" "" ++ {dummy.c} "indirect5d" "indirect5.out" "-fPIE"} ++ } ++ ++ run_ld_link_exec_tests $pie_tests ++} ++ + set pie_tests { +- {"Run indirect5 3" +- "-pie -Wl,--no-as-needed tmpdir/libindirect5.so" "" +- {indirect5a.c} "indirect5c" "indirect5.out" "-fPIE"} +- {"Run indirect5 4" +- "-pie -Wl,--no-as-needed tmpdir/indirect5a.o tmpdir/libindirect5.so" "" +- {dummy.c} "indirect5d" "indirect5.out" "-fPIE"} + {"Run indirect6 3" + "-pie -Wl,--no-as-needed tmpdir/libindirect5.so" "" + {indirect6a.c} "indirect6c" "indirect5.out" "-fPIE"} +@@ -246,11 +272,14 @@ set pie_tests { + + run_ld_link_exec_tests $pie_tests + +-foreach t [list indirect5c indirect5d indirect6c indirect6d] { +- set testname [concat $t "dynsym"] +- if { [check_dynamic_syms tmpdir/$t] } { +- pass $testname +- } else { +- fail $testname ++# The s390x system compiler miscompiles indirect5 tests. ++if { ! [istarget s390x-*-*] } { ++ foreach t [list indirect5c indirect5d indirect6c indirect6d] { ++ set testname [concat $t "dynsym"] ++ if { [check_dynamic_syms tmpdir/$t] } { ++ pass $testname ++ } else { ++ fail $testname ++ } + } + } +--- binutils.orig/ld/testsuite/ld-elfvers/vers.exp 2018-05-31 16:14:12.572540529 +0100 ++++ binutils-2.30/ld/testsuite/ld-elfvers/vers.exp 2018-06-01 15:23:36.518815276 +0100 +@@ -938,6 +938,7 @@ if [string match "yes" $pic] then { + build_exec "vers23" vers23.c vers23 "-Wl,--no-as-needed tmpdir/vers23a.so tmpdir/vers23b.o tmpdir/vers23b.so" "" vers23.ver vers23.dsym "" + } + ++if {! [istarget ppc64*-*-*] && ![istarget "powerpc*-*-linux*"] } { + # Test .symver x,x@VERS.0 + set as_pic_flags "" + if [istarget sparc*-*-*] { +@@ -955,6 +956,7 @@ run_ld_link_tests [list "\"vers24c\" + \"-shared --version-script $srcdir/$subdir/vers24.map\" \"\" + \"$as_pic_flags $as_options\" {vers24c.c} { { readelf -Wrs vers24.rd } } + \"libvers24c.so\" \"-fpic\""] ++} + + # Test versioned definition vs. normal definition in different files. + if [string match "yes" $pic] then { +--- binutils.orig/ld/testsuite/ld-ifunc/ifunc.exp 2018-05-31 16:14:12.573540519 +0100 ++++ binutils-2.30/ld/testsuite/ld-ifunc/ifunc.exp 2018-06-01 15:26:52.020691739 +0100 +@@ -284,11 +284,14 @@ if {! [check_osabi tmpdir/static_nonifun + # The linked ifunc using executables and the shared library containing + # ifunc should contain an IFUNC symbol. The non-ifunc using executable + # should not. +- ++if { ![istarget "ppc*-*-*"] && ![istarget "powerpc*-*-linux*"] } { + if {[contains_ifunc_symbol tmpdir/libshared_ifunc.so] != 1} { + fail "Shared libraries containing ifunc does not contain an IFUNC symbol" + set fails [expr $fails + 1] + } ++} ++ ++if { ![istarget "ppc*-*-*"] && ![istarget "powerpc*-*-linux*"] } { + if {[contains_ifunc_symbol tmpdir/local_prog] != 1} { + fail "Local ifunc-using executable does not contain an IFUNC symbol" + set fails [expr $fails + 1] +@@ -297,6 +300,7 @@ if {[contains_ifunc_symbol tmpdir/static + fail "Static ifunc-using executable does not contain an IFUNC symbol" + set fails [expr $fails + 1] + } ++} + if {[contains_ifunc_symbol tmpdir/dynamic_prog] != 0} { + fail "Dynamic ifunc-using executable contains an IFUNC symbol" + set fails [expr $fails + 1] +--- binutils.orig/ld/testsuite/ld-plugin/plugin.exp 2018-05-31 16:14:12.580540442 +0100 ++++ binutils-2.30/ld/testsuite/ld-plugin/plugin.exp 2018-06-01 15:29:44.048823172 +0100 +@@ -293,12 +293,14 @@ if { !$can_compile || $failed_compile } + + run_ld_link_tests $plugin_tests + ++if { ! [istarget "ppc*-*-*"] && ![istarget "powerpc*-*-linux*"] } { + if { [is_elf_format] \ + && [ld_compile "$CC $CFLAGS" $srcdir/$subdir/func1p.c tmpdir/func1p.o] \ + && [ld_compile "$CC $CFLAGS" $srcdir/$subdir/func2i.c tmpdir/func2i.o] \ + && [ld_compile "$CC $CFLAGS" $srcdir/$subdir/func3h.c tmpdir/func3h.o] } { + run_ld_link_tests $plugin_extra_elf_tests + } ++} + + if {![ar_simple_create $ar "" "tmpdir/libtext.a" "tmpdir/text.o"] || \ + ![ar_simple_create $ar "" "tmpdir/libempty.a" ""]} { +diff -rup binutils.orig/ld/testsuite/ld-elfvers/vers24.rd binutils-2.30/ld/testsuite/ld-elfvers/vers24.rd +--- binutils.orig/ld/testsuite/ld-elfvers/vers24.rd 2018-09-05 09:45:44.013108697 +0100 ++++ binutils-2.30/ld/testsuite/ld-elfvers/vers24.rd 2018-09-05 12:06:17.287425232 +0100 +@@ -7,9 +7,9 @@ Symbol table '.dynsym' contains [0-9]+ e + # And ensure the dynamic symbol table contains at least x@VERS.0 + # and foo@@VERS.0 symbols + #... +- +[0-9]+: [0-9a-f]+ +(4 +OBJECT +GLOBAL +DEFAULT +[0-9]+ _?x|[0-9]+ +FUNC +GLOBAL +DEFAULT .* [0-9]+ _?foo@)@VERS\.0 ++ +[0-9]+: [0-9a-f]+ +(4 +OBJECT +GLOBAL +DEFAULT +[0-9]+ _?x|[0-9]+ +FUNC +GLOBAL +DEFAULT .* [0-9]+ _?foo@)@VERS\.0.* + #... +- +[0-9]+: [0-9a-f]+ +(4 +OBJECT +GLOBAL +DEFAULT +[0-9]+ _?x|[0-9]+ +FUNC +GLOBAL +DEFAULT .* [0-9]+ _?foo@)@VERS\.0 ++ +[0-9]+: [0-9a-f]+ +(4 +OBJECT +GLOBAL +DEFAULT +[0-9]+ _?x|[0-9]+ +FUNC +GLOBAL +DEFAULT .* [0-9]+ _?foo@)@VERS\.0.* + #... + Symbol table '.symtab' contains [0-9]+ entries: + #pass +diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-12.d binutils-2.30/ld/testsuite/ld-plugin/plugin-12.d +--- binutils.orig/ld/testsuite/ld-plugin/plugin-12.d 2018-09-05 09:45:44.025108586 +0100 ++++ binutils-2.30/ld/testsuite/ld-plugin/plugin-12.d 2018-09-05 11:50:14.911718048 +0100 +@@ -1,6 +1,6 @@ + #... +-.*: symbol `func' definition: 0, visibility: 0, resolution: 2 +-.*: 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 `.*unc' definition: 0, visibility: 0, resolution: 2 ++.*: symbol `.*unc1' definition: 0, visibility: 1, resolution: 3 ++.*: symbol `.*unc2' definition: 0, visibility: 2, resolution: 3 ++.*: symbol `.*unc3' definition: 0, visibility: 3, resolution: 3 + #pass +diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin.exp binutils-2.30/ld/testsuite/ld-plugin/plugin.exp +--- binutils.orig/ld/testsuite/ld-plugin/plugin.exp 2018-09-05 09:45:44.023108605 +0100 ++++ binutils-2.30/ld/testsuite/ld-plugin/plugin.exp 2018-09-05 11:18:53.997202105 +0100 +@@ -118,6 +118,12 @@ if { $can_compile && !$failed_compile } + } + } + ++# I do not know why, but the underscore prefix test is going ++# wrong on ppc64le targets. So override it here. ++if { [istarget powerpc*-*-linux*] || [istarget x86_64*-*-linux*] } { ++ set _ "" ++} ++ + set testobjfiles "tmpdir/main.o tmpdir/func.o tmpdir/text.o" + set testobjfiles_notext "tmpdir/main.o tmpdir/func.o" + set testsrcfiles "tmpdir/main.o $srcdir/$subdir/func.c tmpdir/text.o" +diff -rup binutils.orig/ld/testsuite/ld-x86-64/plt-main-bnd.dd binutils-2.30/ld/testsuite/ld-x86-64/plt-main-bnd.dd +--- binutils.orig/ld/testsuite/ld-x86-64/plt-main-bnd.dd 2018-09-05 14:08:22.983184999 +0100 ++++ binutils-2.30/ld/testsuite/ld-x86-64/plt-main-bnd.dd 2018-09-05 16:19:36.033431902 +0100 +@@ -2,6 +2,6 @@ + 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/x86-64.exp binutils-2.30/ld/testsuite/ld-x86-64/x86-64.exp +--- binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp 2018-09-05 14:08:22.970185099 +0100 ++++ binutils-2.30/ld/testsuite/ld-x86-64/x86-64.exp 2018-09-05 16:22:30.064079063 +0100 +@@ -671,12 +671,6 @@ if { [isnative] && [which $CC] != 0 } { + return + } + +- run_ld_link_tests { +- {"X32 DSO from x86-64 object" +- "-shared -melf32_x86_64 tmpdir/simple-x32.o" "" "--x32" +- {dummy.s} {{readelf {-s --wide} x86-64-x32.rd}} "x86-64-x32"} +- } +- + run_cc_link_tests [list \ + [list \ + "Build plt-lib.so" \ diff --git a/SOURCES/binutils-gas-build-notes.patch b/SOURCES/binutils-gas-build-notes.patch new file mode 100644 index 0000000..8c6fc9f --- /dev/null +++ b/SOURCES/binutils-gas-build-notes.patch @@ -0,0 +1,555 @@ +diff -rup binutils.orig/binutils/readelf.c binutils-2.30/binutils/readelf.c +--- binutils.orig/binutils/readelf.c 2018-04-26 15:14:17.220464639 +0100 ++++ binutils-2.30/binutils/readelf.c 2018-04-26 15:14:31.927287474 +0100 +@@ -12294,7 +12294,8 @@ is_32bit_abs_reloc (Filedata * filedata, + case EM_OR1K: + return reloc_type == 1; /* R_OR1K_32. */ + case EM_PARISC: +- return (reloc_type == 1 /* R_PARISC_DIR32. */ ++ return (reloc_type == 1 /* R_PARISC_DIR32. */ ++ || reloc_type == 2 /* R_PARISC_DIR21L. */ + || reloc_type == 41); /* R_PARISC_SECREL32. */ + case EM_PJ: + case EM_PJ_OLD: +Only in binutils-2.30/binutils: readelf.c.orig +diff -rup binutils.orig/binutils/testsuite/binutils-all/objcopy.exp binutils-2.30/binutils/testsuite/binutils-all/objcopy.exp +--- binutils.orig/binutils/testsuite/binutils-all/objcopy.exp 2018-04-26 15:14:17.215464699 +0100 ++++ binutils-2.30/binutils/testsuite/binutils-all/objcopy.exp 2018-04-26 15:14:31.927287474 +0100 +@@ -1062,6 +1062,7 @@ if [is_elf_format] { + run_dump_test "note-3-32" + run_dump_test "note-4-32" + } ++ run_dump_test "note-5" + } + + run_dump_test "copy-2" +Only in binutils-2.30/binutils/testsuite/binutils-all: objcopy.exp.orig +diff -rup binutils.orig/gas/as.c binutils-2.30/gas/as.c +--- binutils.orig/gas/as.c 2018-04-26 15:14:17.646459507 +0100 ++++ binutils-2.30/gas/as.c 2018-04-26 15:14:31.927287474 +0100 +@@ -97,6 +97,7 @@ int verbose = 0; + + #if defined OBJ_ELF || defined OBJ_MAYBE_ELF + int flag_use_elf_stt_common = DEFAULT_GENERATE_ELF_STT_COMMON; ++bfd_boolean flag_generate_build_notes = DEFAULT_GENERATE_BUILD_NOTES; + #endif + + /* Keep the output file. */ +@@ -304,8 +305,19 @@ Options:\n\ + generate ELF common symbols with STT_COMMON type\n")); + fprintf (stream, _("\ + --sectname-subst enable section name substitution sequences\n")); ++ ++ fprintf (stream, _("\ ++ --generate-missing-build-notes=[no|yes] ")); ++#if DEFAULT_GENERATE_BUILD_NOTES ++ fprintf (stream, _("(default: yes)\n")); ++#else ++ fprintf (stream, _("(default: no)\n")); + #endif + fprintf (stream, _("\ ++ generate GNU Build notes if none are present in the input\n")); ++#endif /* OBJ_ELF */ ++ ++ fprintf (stream, _("\ + -f skip whitespace and comment preprocessing\n")); + fprintf (stream, _("\ + -g --gen-debug generate debugging information\n")); +@@ -470,6 +482,7 @@ parse_args (int * pargc, char *** pargv) + OPTION_NOEXECSTACK, + OPTION_SIZE_CHECK, + OPTION_ELF_STT_COMMON, ++ OPTION_ELF_BUILD_NOTES, + OPTION_SECTNAME_SUBST, + OPTION_ALTERNATE, + OPTION_AL, +@@ -508,6 +521,7 @@ parse_args (int * pargc, char *** pargv) + ,{"size-check", required_argument, NULL, OPTION_SIZE_CHECK} + ,{"elf-stt-common", required_argument, NULL, OPTION_ELF_STT_COMMON} + ,{"sectname-subst", no_argument, NULL, OPTION_SECTNAME_SUBST} ++ ,{"generate-missing-build-notes", required_argument, NULL, OPTION_ELF_BUILD_NOTES} + #endif + ,{"fatal-warnings", no_argument, NULL, OPTION_WARN_FATAL} + ,{"gdwarf-2", no_argument, NULL, OPTION_GDWARF2} +@@ -900,7 +914,19 @@ This program has absolutely no warranty. + case OPTION_SECTNAME_SUBST: + flag_sectname_subst = 1; + break; +-#endif ++ ++ case OPTION_ELF_BUILD_NOTES: ++ if (strcasecmp (optarg, "no") == 0) ++ flag_generate_build_notes = FALSE; ++ else if (strcasecmp (optarg, "yes") == 0) ++ flag_generate_build_notes = TRUE; ++ else ++ as_fatal (_("Invalid --generate-missing-build-notes option: `%s'"), ++ optarg); ++ break; ++ ++#endif /* OBJ_ELF */ ++ + case 'Z': + flag_always_generate_output = 1; + break; +diff -rup binutils.orig/gas/as.h binutils-2.30/gas/as.h +--- binutils.orig/gas/as.h 2018-04-26 15:14:17.654459410 +0100 ++++ binutils-2.30/gas/as.h 2018-04-26 15:14:31.927287474 +0100 +@@ -585,6 +585,10 @@ COMMON int flag_allow_nonconst_size; + /* If we should generate ELF common symbols with the STT_COMMON type. */ + extern int flag_use_elf_stt_common; + ++/* TRUE iff GNU Build attribute notes should ++ be generated if none are in the input files. */ ++extern bfd_boolean flag_generate_build_notes; ++ + /* If section name substitution sequences should be honored */ + COMMON int flag_sectname_subst; + #endif +Only in binutils-2.30/gas: as.h.orig +diff -rup binutils.orig/gas/config.in binutils-2.30/gas/config.in +--- binutils.orig/gas/config.in 2018-04-26 15:14:17.645459519 +0100 ++++ binutils-2.30/gas/config.in 2018-04-26 15:14:31.927287474 +0100 +@@ -39,6 +39,10 @@ + /* Define if you want compressed debug sections by default. */ + #undef DEFAULT_FLAG_COMPRESS_DEBUG + ++/* Define to 1 if you want to generate GNU Build attribute notes by default, ++ if none are contained in the input. */ ++#undef DEFAULT_GENERATE_BUILD_NOTES ++ + /* Define to 1 if you want to generate ELF common symbols with the STT_COMMON + type by default. */ + #undef DEFAULT_GENERATE_ELF_STT_COMMON +diff -rup binutils.orig/gas/configure binutils-2.30/gas/configure +--- binutils.orig/gas/configure 2018-04-26 15:14:17.645459519 +0100 ++++ binutils-2.30/gas/configure 2018-04-26 15:14:31.928287462 +0100 +@@ -771,6 +771,7 @@ enable_checking + enable_compressed_debug_sections + enable_x86_relax_relocations + enable_elf_stt_common ++enable_generate_build_notes + enable_werror + enable_build_warnings + with_cpu +@@ -1426,6 +1427,9 @@ Optional Features: + generate x86 relax relocations by default + --enable-elf-stt-common generate ELF common symbols with STT_COMMON type by + default ++ --enable-generate-build-notes ++ generate GNU Build notes if none are provided by the ++ input + --enable-werror treat compile warnings as errors + --enable-build-warnings enable build-time compiler warnings + --disable-nls do not use Native Language Support +@@ -11011,7 +11015,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 10990 "configure" ++#line 10994 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11117,7 +11121,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11096 "configure" ++#line 11100 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11771,6 +11775,20 @@ if test "${enable_elf_stt_common+set}" = + esac + fi + ++ ++# Decide if the ELF assembler should default to generating ++# GNU Build notes if none are provided by the input. ++ac_default_generate_build_notes=0 ++# Provide a configuration option to override the default. ++# Check whether --enable-generate_build_notes was given. ++if test "${enable_generate_build_notes+set}" = set; then : ++ enableval=$enable_generate_build_notes; case "${enableval}" in ++ yes) ac_default_generate_build_notes=1 ;; ++ no) ac_default_generate_build_notes=0 ;; ++esac ++fi ++ ++ + using_cgen=no + + +@@ -12713,6 +12731,12 @@ cat >>confdefs.h <<_ACEOF + _ACEOF + + ++ ++cat >>confdefs.h <<_ACEOF ++#define DEFAULT_GENERATE_BUILD_NOTES $ac_default_generate_build_notes ++_ACEOF ++ ++ + if test x$ac_default_compressed_debug_sections = xyes ; then + + $as_echo "#define DEFAULT_FLAG_COMPRESS_DEBUG 1" >>confdefs.h +diff -rup binutils.orig/gas/configure.ac binutils-2.30/gas/configure.ac +--- binutils.orig/gas/configure.ac 2018-04-26 15:14:17.645459519 +0100 ++++ binutils-2.30/gas/configure.ac 2018-04-26 15:14:31.928287462 +0100 +@@ -100,6 +100,20 @@ AC_ARG_ENABLE(elf_stt_common, + yes) ac_default_elf_stt_common=1 ;; + esac])dnl + ++ ++# Decide if the ELF assembler should default to generating ++# GNU Build notes if none are provided by the input. ++ac_default_generate_build_notes=0 ++# Provide a configuration option to override the default. ++AC_ARG_ENABLE(generate_build_notes, ++ AS_HELP_STRING([--enable-generate-build-notes], ++ [generate GNU Build notes if none are provided by the input]), ++[case "${enableval}" in ++ yes) ac_default_generate_build_notes=1 ;; ++ no) ac_default_generate_build_notes=0 ;; ++esac])dnl ++ ++ + using_cgen=no + + AM_BINUTILS_WARNINGS +@@ -610,6 +624,11 @@ AC_DEFINE_UNQUOTED(DEFAULT_GENERATE_ELF_ + [Define to 1 if you want to generate ELF common symbols with the + STT_COMMON type by default.]) + ++AC_DEFINE_UNQUOTED(DEFAULT_GENERATE_BUILD_NOTES, ++ $ac_default_generate_build_notes, ++ [Define to 1 if you want to generate GNU Build attribute notes ++ by default, if none are contained in the input.]) ++ + if test x$ac_default_compressed_debug_sections = xyes ; then + AC_DEFINE(DEFAULT_FLAG_COMPRESS_DEBUG, 1, [Define if you want compressed debug sections by default.]) + fi +Only in binutils-2.30/gas: configure.ac.orig +Only in binutils-2.30/gas: configure.orig +diff -rup binutils.orig/gas/doc/as.texinfo binutils-2.30/gas/doc/as.texinfo +--- binutils.orig/gas/doc/as.texinfo 2018-04-26 15:14:17.665459278 +0100 ++++ binutils-2.30/gas/doc/as.texinfo 2018-04-26 15:14:31.929287450 +0100 +@@ -244,6 +244,7 @@ gcc(1), ld(1), and the Info entries for + [@b{-Z}] [@b{@@@var{FILE}}] + [@b{--sectname-subst}] [@b{--size-check=[error|warning]}] + [@b{--elf-stt-common=[no|yes]}] ++ [@b{--generate-missing-build-notes=[no|yes]}] + [@b{--target-help}] [@var{target-options}] + [@b{--}|@var{files} @dots{}] + @c +@@ -754,6 +755,14 @@ Issue an error or warning for invalid EL + These options control whether the ELF assembler should generate common + symbols with the @code{STT_COMMON} type. The default can be controlled + by a configure option @option{--enable-elf-stt-common}. ++ ++@item --generate-missing-build-notes=yes ++@itemx --generate-missing-build-notes=no ++These options control whether the ELF assembler should generate GNU Build ++attribute notes if none are present in the input sources. ++The default can be controlled by the @option{--enable-generate-build-notes} ++configure option. ++ + @end ifset + + @item --help +Only in binutils-2.30/gas/doc: as.texinfo.orig +diff -rup binutils.orig/gas/NEWS binutils-2.30/gas/NEWS +--- binutils.orig/gas/NEWS 2018-04-26 15:14:17.646459507 +0100 ++++ binutils-2.30/gas/NEWS 2018-04-26 15:15:32.276560482 +0100 +@@ -1,5 +1,11 @@ + -*- text -*- + ++* Add --generate-missing-build-notes=[yes|no] option to create (or not) GNU ++ Build Attribute notes if none are present in the input sources. Add a ++ --enable-generate-build-notes=[yes|no] configure time option to set the ++ default behaviour. Set the default if the configure option is not used ++ to "no". ++ + Changes in 2.30: + + * Add support for loaction views in DWARF debug line information. +Only in binutils-2.30/gas: NEWS.orig +Only in binutils-2.30/gas: NEWS.rej +diff -rup binutils.orig/gas/symbols.c binutils-2.30/gas/symbols.c +--- binutils.orig/gas/symbols.c 2018-04-26 15:14:17.667459254 +0100 ++++ binutils-2.30/gas/symbols.c 2018-04-26 15:14:31.929287450 +0100 +@@ -108,6 +108,7 @@ save_symbol_name (const char *name) + size_t name_length; + char *ret; + ++ gas_assert (name != NULL); + name_length = strlen (name) + 1; /* +1 for \0. */ + obstack_grow (¬es, name, name_length); + ret = (char *) obstack_finish (¬es); +diff -rup binutils.orig/gas/write.c binutils-2.30/gas/write.c +--- binutils.orig/gas/write.c 2018-04-26 15:14:18.296451677 +0100 ++++ binutils-2.30/gas/write.c 2018-04-26 15:14:31.929287450 +0100 +@@ -1822,25 +1822,200 @@ create_obj_attrs_section (void) + const char *name; + + size = bfd_elf_obj_attr_size (stdoutput); +- if (size) ++ if (size == 0) ++ return; ++ ++ name = get_elf_backend_data (stdoutput)->obj_attrs_section; ++ if (!name) ++ name = ".gnu.attributes"; ++ s = subseg_new (name, 0); ++ elf_section_type (s) ++ = get_elf_backend_data (stdoutput)->obj_attrs_section_type; ++ bfd_set_section_flags (stdoutput, s, SEC_READONLY | SEC_DATA); ++ frag_now_fix (); ++ p = frag_more (size); ++ bfd_elf_set_obj_attr_contents (stdoutput, (bfd_byte *)p, size); ++ ++ subsegs_finish_section (s); ++ relax_segment (seg_info (s)->frchainP->frch_root, s, 0); ++ size_seg (stdoutput, s, NULL); ++} ++ ++#include "struc-symbol.h" ++ ++/* Create a relocation against an entry in a GNU Build attribute section. */ ++ ++static void ++create_note_reloc (segT sec, ++ symbolS * sym, ++ bfd_size_type offset, ++ int reloc_type, ++ bfd_vma addend, ++ char * note) ++{ ++ struct reloc_list * reloc; ++ ++ reloc = XNEW (struct reloc_list); ++ ++ /* We create a .b type reloc as resolve_reloc_expr_symbols() has already been called. */ ++ reloc->u.b.sec = sec; ++ reloc->u.b.s = sym->bsym; ++ reloc->u.b.r.sym_ptr_ptr = & reloc->u.b.s; ++ reloc->u.b.r.address = offset; ++ reloc->u.b.r.addend = addend; ++ reloc->u.b.r.howto = bfd_reloc_type_lookup (stdoutput, reloc_type); ++ ++ if (reloc->u.b.r.howto == NULL) + { +- name = get_elf_backend_data (stdoutput)->obj_attrs_section; +- if (!name) +- name = ".gnu.attributes"; +- s = subseg_new (name, 0); +- elf_section_type (s) +- = get_elf_backend_data (stdoutput)->obj_attrs_section_type; +- bfd_set_section_flags (stdoutput, s, SEC_READONLY | SEC_DATA); +- frag_now_fix (); +- p = frag_more (size); +- bfd_elf_set_obj_attr_contents (stdoutput, (bfd_byte *)p, size); +- +- subsegs_finish_section (s); +- relax_segment (seg_info (s)->frchainP->frch_root, s, 0); +- size_seg (stdoutput, s, NULL); ++ as_bad (_("unable to create reloc for build note")); ++ return; ++ } ++ ++ reloc->file = N_(""); ++ reloc->line = 0; ++ ++ reloc->next = reloc_list; ++ reloc_list = reloc; ++ ++ /* For REL relocs, store the addend in the section. */ ++ if (! sec->use_rela_p ++ /* The SH target is a special case that uses RELA relocs ++ but still stores the addend in the word being relocated. */ ++ || strstr (bfd_get_target (stdoutput), "-sh") != NULL) ++ { ++ if (target_big_endian) ++ { ++ if (bfd_arch_bits_per_address (stdoutput) <= 32) ++ note[offset + 3] = addend; ++ else ++ note[offset + 7] = addend; ++ } ++ else ++ note[offset] = addend; + } + } +-#endif ++ ++static void ++maybe_generate_build_notes (void) ++{ ++ segT sec; ++ char * note; ++ offsetT note_size; ++ offsetT desc_size; ++ offsetT desc2_offset; ++ int desc_reloc; ++ symbolS * sym; ++ ++ if (! flag_generate_build_notes ++ || bfd_get_section_by_name (stdoutput, ++ GNU_BUILD_ATTRS_SECTION_NAME) != NULL) ++ return; ++ ++ /* Create a GNU Build Attribute section. */ ++ sec = subseg_new (GNU_BUILD_ATTRS_SECTION_NAME, FALSE); ++ elf_section_type (sec) = SHT_NOTE; ++ bfd_set_section_flags (stdoutput, sec, ++ SEC_READONLY | SEC_HAS_CONTENTS | SEC_DATA); ++ bfd_set_section_alignment (stdoutput, sec, 2); ++ ++ /* Create a version note. */ ++ if (bfd_arch_bits_per_address (stdoutput) <= 32) ++ { ++ note_size = 28; ++ desc_size = 8; /* Two 4-byte offsets. */ ++ desc2_offset = 24; ++ ++ /* FIXME: The BFD backend for the CRX target does not support the ++ BFD_RELOC_32, even though it really should. Likewise for the ++ CR16 target. So we have special case code here... */ ++ if (strstr (bfd_get_target (stdoutput), "-crx") != NULL) ++ desc_reloc = BFD_RELOC_CRX_NUM32; ++ else if (strstr (bfd_get_target (stdoutput), "-cr16") != NULL) ++ desc_reloc = BFD_RELOC_CR16_NUM32; ++ else ++ desc_reloc = BFD_RELOC_32; ++ } ++ else ++ { ++ note_size = 36; ++ desc_size = 16; /* Two 8-byte offsets. */ ++ desc2_offset = 28; ++ /* FIXME: The BFD backend for the IA64 target does not support the ++ BFD_RELOC_64, even though it really should. The HPPA backend ++ has a similar issue, although it does not support BFD_RELOCs at ++ all! So we have special case code to handle these targets. */ ++ if (strstr (bfd_get_target (stdoutput), "-ia64") != NULL) ++ desc_reloc = target_big_endian ? BFD_RELOC_IA64_DIR32MSB : BFD_RELOC_IA64_DIR32LSB; ++ else if (strstr (bfd_get_target (stdoutput), "-hppa") != NULL) ++ desc_reloc = 80; /* R_PARISC_DIR64. */ ++ else ++ desc_reloc = BFD_RELOC_64; ++ } ++ ++ frag_now_fix (); ++ note = frag_more (note_size); ++ memset (note, 0, note_size); ++ ++ if (target_big_endian) ++ { ++ note[3] = 8; /* strlen (name) + 1. */ ++ note[7] = desc_size; /* Two 8-byte offsets. */ ++ note[10] = NT_GNU_BUILD_ATTRIBUTE_OPEN >> 8; ++ note[11] = NT_GNU_BUILD_ATTRIBUTE_OPEN & 0xff; ++ } ++ else ++ { ++ note[0] = 8; /* strlen (name) + 1. */ ++ note[4] = desc_size; /* Two 8-byte offsets. */ ++ note[8] = NT_GNU_BUILD_ATTRIBUTE_OPEN & 0xff; ++ note[9] = NT_GNU_BUILD_ATTRIBUTE_OPEN >> 8; ++ } ++ ++ /* The a1 version number indicates that this note was ++ generated by the assembler and not the gcc annobin plugin. */ ++ memcpy (note + 12, "GA$3a1", 8); ++ ++ /* Find the first code section symbol. */ ++ for (sym = symbol_rootP; sym != NULL; sym = sym->sy_next) ++ if (sym->bsym != NULL ++ && sym->bsym->flags & BSF_SECTION_SYM ++ && sym->bsym->section != NULL ++ && sym->bsym->section->flags & SEC_CODE) ++ { ++ /* Found one - now create a relocation against this symbol. */ ++ create_note_reloc (sec, sym, 20, desc_reloc, 0, note); ++ break; ++ } ++ ++ /* Find the last code section symbol. */ ++ if (sym) ++ { ++ for (sym = symbol_lastP; sym != NULL; sym = sym->sy_previous) ++ if (sym->bsym != NULL ++ && sym->bsym->flags & BSF_SECTION_SYM ++ && sym->bsym->section != NULL ++ && sym->bsym->section->flags & SEC_CODE) ++ { ++ /* Create a relocation against the end of this symbol. */ ++ create_note_reloc (sec, sym, desc2_offset, desc_reloc, ++ bfd_get_section_size (sym->bsym->section), ++ note); ++ break; ++ } ++ } ++ /* else - if we were unable to find any code section symbols then ++ probably there is no code in the output. So leaving the start ++ and end values as zero in the note is OK. */ ++ ++ /* FIXME: Maybe add a note recording the assembler command line and version ? */ ++ ++ /* Install the note(s) into the section. */ ++ bfd_set_section_contents (stdoutput, sec, (bfd_byte *) note, 0, note_size); ++ subsegs_finish_section (sec); ++ relax_segment (seg_info (sec)->frchainP->frch_root, sec, 0); ++ size_seg (stdoutput, sec, NULL); ++} ++#endif /* OBJ_ELF */ + + /* Write the object file. */ + +@@ -2052,6 +2227,11 @@ write_object_file (void) + resolve_local_symbol_values (); + resolve_reloc_expr_symbols (); + ++#ifdef OBJ_ELF ++ if (IS_ELF) ++ maybe_generate_build_notes (); ++#endif ++ + PROGRESS (1); + + #ifdef tc_frob_file_before_adjust +Only in binutils-2.30/gas: write.c.orig +Only in binutils-2.30: testsuite +--- /dev/null 2018-04-26 08:07:19.307057583 +0100 ++++ binutils-2.30/binutils/testsuite/binutils-all/note-5.d 2018-04-26 15:17:06.318427614 +0100 +@@ -0,0 +1,11 @@ ++#PROG: objcopy ++#as: --generate-missing-build-notes=yes ++#readelf: --notes --wide ++#name: assembler generated build notes ++#source: note-5.s ++ ++#... ++Displaying notes found in: .gnu.build.attributes ++[ ]+Owner[ ]+Data size[ ]+Description ++[ ]+GA\$3a1[ ]+0x000000(08|10)[ ]+OPEN[ ]+Applies to region from 0 to 0x.. \(note_5.s\) ++#... +--- /dev/null 2018-04-26 08:07:19.307057583 +0100 ++++ binutils-2.30/binutils/testsuite/binutils-all/note-5.s 2018-04-26 15:17:06.318427614 +0100 +@@ -0,0 +1,14 @@ ++ .text ++ .global note_5.s ++note_5.s: ++ .dc.l 2 ++ .dc.l 4 ++ .dc.l 6 ++ .dc.l 8 ++ .dc.l 8 ++ .dc.l 8 ++ .dc.l 8 ++ .dc.l 8 ++ .dc.l 8 ++ .dc.l 8 ++ +\ No newline at end of file diff --git a/SOURCES/binutils-gold-8-byte-note-segments.patch b/SOURCES/binutils-gold-8-byte-note-segments.patch new file mode 100644 index 0000000..8e10761 --- /dev/null +++ b/SOURCES/binutils-gold-8-byte-note-segments.patch @@ -0,0 +1,99 @@ +diff -rup binutils.orig/gold/layout.cc binutils-2.30/gold/layout.cc +--- binutils.orig/gold/layout.cc 2018-10-09 15:24:05.987282736 +0100 ++++ binutils-2.30/gold/layout.cc 2018-10-09 16:08:29.445946736 +0100 +@@ -2052,12 +2052,15 @@ Layout::attach_allocated_section_to_segm + // segment. + if (os->type() == elfcpp::SHT_NOTE) + { ++ uint64_t os_align = os->addralign(); ++ + // See if we already have an equivalent PT_NOTE segment. + for (p = this->segment_list_.begin(); + p != segment_list_.end(); + ++p) + { + if ((*p)->type() == elfcpp::PT_NOTE ++ && (*p)->align() == os_align + && (((*p)->flags() & elfcpp::PF_W) + == (seg_flags & elfcpp::PF_W))) + { +@@ -2071,6 +2074,7 @@ Layout::attach_allocated_section_to_segm + Output_segment* oseg = this->make_output_segment(elfcpp::PT_NOTE, + seg_flags); + oseg->add_output_section_to_nonload(os, seg_flags); ++ oseg->set_align(os_align); + } + } + +@@ -3171,6 +3175,10 @@ Layout::create_note(const char* name, in + #else + const int size = 32; + #endif ++ // The NT_GNU_PROPERTY_TYPE_0 note conforms to gABI. ++ const int addralign = ((note_type == elfcpp::NT_GNU_PROPERTY_TYPE_0 ++ ? parameters->target().get_size() ++ : size) / 8); + + // The contents of the .note section. + size_t namesz = strlen(name) + 1; +@@ -3234,7 +3242,7 @@ Layout::create_note(const char* name, in + return NULL; + + Output_section_data* posd = new Output_data_const_buffer(buffer, notehdrsz, +- size / 8, ++ addralign, + "** note header"); + os->add_output_section_data(posd); + +@@ -3692,6 +3700,11 @@ Layout::segment_precedes(const Output_se + { + if (type1 != type2) + return type1 < type2; ++ uint64_t align1 = seg1->align(); ++ uint64_t align2 = seg2->align(); ++ // Place segments with larger alignments first. ++ if (align1 != align2) ++ return align1 > align2; + gold_assert(flags1 != flags2 + || this->script_options_->saw_phdrs_clause()); + return flags1 < flags2; +diff -rup binutils.orig/gold/output.cc binutils-2.30/gold/output.cc +--- binutils.orig/gold/output.cc 2018-10-09 15:24:05.986282744 +0100 ++++ binutils-2.30/gold/output.cc 2018-10-09 16:09:03.749670846 +0100 +@@ -4107,6 +4107,7 @@ Output_segment::Output_segment(elfcpp::E + : vaddr_(0), + paddr_(0), + memsz_(0), ++ align_(0), + max_align_(0), + min_p_align_(0), + offset_(0), +diff -rup binutils.orig/gold/output.h binutils-2.30/gold/output.h +--- binutils.orig/gold/output.h 2018-10-09 15:24:05.984282760 +0100 ++++ binutils-2.30/gold/output.h 2018-10-09 16:09:45.665333727 +0100 +@@ -4676,6 +4676,16 @@ class Output_segment + offset() const + { return this->offset_; } + ++ // Return the segment alignment. ++ uint64_t ++ align() const ++ { return this->align_; } ++ ++ // Set the segment alignment. ++ void ++ set_align(uint64_t align) ++ { this->align_ = align; } ++ + // Whether this is a segment created to hold large data sections. + bool + is_large_data_segment() const +@@ -4898,6 +4908,8 @@ class Output_segment + uint64_t paddr_; + // The size of the segment in memory. + uint64_t memsz_; ++ // The segment alignment. ++ uint64_t align_; + // The maximum section alignment. The is_max_align_known_ field + // indicates whether this has been finalized. + uint64_t max_align_; diff --git a/SOURCES/binutils-gold-ignore-discarded-note-relocs.patch b/SOURCES/binutils-gold-ignore-discarded-note-relocs.patch new file mode 100644 index 0000000..6f2b4ee --- /dev/null +++ b/SOURCES/binutils-gold-ignore-discarded-note-relocs.patch @@ -0,0 +1,10 @@ +--- binutils.orig/gold/target-reloc.h 2018-07-25 08:29:41.347174442 +0100 ++++ binutils-2.30/gold/target-reloc.h 2018-07-25 08:30:47.390413706 +0100 +@@ -136,6 +136,7 @@ class Default_comdat_behavior + if (Layout::is_debug_info_section(name)) + return CB_PRETEND; + if (strcmp(name, ".eh_frame") == 0 ++ || strncmp(name, ".gnu.build.attributes", 21) == 0 // FIXME: We should really be checking the section type for SHT_NOTE. + || strcmp(name, ".gcc_except_table") == 0) + return CB_IGNORE; + return CB_WARNING; diff --git a/SOURCES/binutils-gold-llvm-plugin.patch b/SOURCES/binutils-gold-llvm-plugin.patch new file mode 100644 index 0000000..d6d3a7e --- /dev/null +++ b/SOURCES/binutils-gold-llvm-plugin.patch @@ -0,0 +1,16 @@ +--- binutils.orig/gold/resolve.cc 2018-03-22 16:52:11.746513638 +0000 ++++ binutils-2.30/gold/resolve.cc 2018-03-22 16:53:58.038192419 +0000 +@@ -265,10 +265,13 @@ Symbol_table::resolve(Sized_symbol + return; + + // Likewise for an absolute symbol defined twice with the same value. ++ // Plugin-symbols are always absolute with same value here, so ignore those. + if (!is_ordinary + && st_shndx == elfcpp::SHN_ABS + && !to_is_ordinary + && to_shndx == elfcpp::SHN_ABS ++ && object->pluginobj() == NULL ++ && to->object()->pluginobj() == NULL + && to->value() == sym.get_st_value()) + return; + diff --git a/SOURCES/binutils-gold-note-segment.patch b/SOURCES/binutils-gold-note-segment.patch new file mode 100644 index 0000000..00efa01 --- /dev/null +++ b/SOURCES/binutils-gold-note-segment.patch @@ -0,0 +1,1239 @@ +Only in binutils-2.30/gold: ChangeLog.orig +Only in binutils-2.30/gold: ChangeLog.rej +diff -rup binutils.orig/gold/layout.cc binutils-2.30/gold/layout.cc +--- binutils.orig/gold/layout.cc 2018-08-14 16:18:17.928466978 +0100 ++++ binutils-2.30/gold/layout.cc 2018-08-14 16:23:15.811244776 +0100 +@@ -474,7 +474,8 @@ Layout::Layout(int number_of_input_files + input_section_position_(), + input_section_glob_(), + incremental_base_(NULL), +- free_list_() ++ free_list_(), ++ gnu_properties_() + { + // Make space for more than enough segments for a typical file. + // This is just for efficiency--it's OK if we wind up needing more. +@@ -2182,11 +2183,243 @@ Layout::layout_gnu_stack(bool seen_gnu_s + } + } + ++// Read a value with given size and endianness. ++ ++static inline uint64_t ++read_sized_value(size_t size, const unsigned char* buf, bool is_big_endian, ++ const Object* object) ++{ ++ uint64_t val = 0; ++ if (size == 4) ++ { ++ if (is_big_endian) ++ val = elfcpp::Swap<32, true>::readval(buf); ++ else ++ val = elfcpp::Swap<32, false>::readval(buf); ++ } ++ else if (size == 8) ++ { ++ if (is_big_endian) ++ val = elfcpp::Swap<64, true>::readval(buf); ++ else ++ val = elfcpp::Swap<64, false>::readval(buf); ++ } ++ else ++ { ++ gold_warning(_("%s: in .note.gnu.property section, " ++ "pr_datasz must be 4 or 8"), ++ object->name().c_str()); ++ } ++ return val; ++} ++ ++// Write a value with given size and endianness. ++ ++static inline void ++write_sized_value(uint64_t value, size_t size, unsigned char* buf, ++ bool is_big_endian) ++{ ++ if (size == 4) ++ { ++ if (is_big_endian) ++ elfcpp::Swap<32, true>::writeval(buf, static_cast(value)); ++ else ++ elfcpp::Swap<32, false>::writeval(buf, static_cast(value)); ++ } ++ else if (size == 8) ++ { ++ if (is_big_endian) ++ elfcpp::Swap<64, true>::writeval(buf, value); ++ else ++ elfcpp::Swap<64, false>::writeval(buf, value); ++ } ++ else ++ { ++ // We will have already complained about this. ++ } ++} ++ ++// Handle the .note.gnu.property section at layout time. ++ ++void ++Layout::layout_gnu_property(unsigned int note_type, ++ unsigned int pr_type, ++ size_t pr_datasz, ++ const unsigned char* pr_data, ++ const Object* object) ++{ ++ // We currently support only the one note type. ++ gold_assert(note_type == elfcpp::NT_GNU_PROPERTY_TYPE_0); ++ ++ if (pr_type >= elfcpp::GNU_PROPERTY_LOPROC ++ && pr_type < elfcpp::GNU_PROPERTY_HIPROC) ++ { ++ // Target-dependent property value; call the target to record. ++ const int size = parameters->target().get_size(); ++ const bool is_big_endian = parameters->target().is_big_endian(); ++ if (size == 32) ++ { ++ if (is_big_endian) ++ { ++#ifdef HAVE_TARGET_32_BIG ++ parameters->sized_target<32, true>()-> ++ record_gnu_property(note_type, pr_type, pr_datasz, pr_data, ++ object); ++#else ++ gold_unreachable(); ++#endif ++ } ++ else ++ { ++#ifdef HAVE_TARGET_32_LITTLE ++ parameters->sized_target<32, false>()-> ++ record_gnu_property(note_type, pr_type, pr_datasz, pr_data, ++ object); ++#else ++ gold_unreachable(); ++#endif ++ } ++ } ++ else if (size == 64) ++ { ++ if (is_big_endian) ++ { ++#ifdef HAVE_TARGET_64_BIG ++ parameters->sized_target<64, true>()-> ++ record_gnu_property(note_type, pr_type, pr_datasz, pr_data, ++ object); ++#else ++ gold_unreachable(); ++#endif ++ } ++ else ++ { ++#ifdef HAVE_TARGET_64_LITTLE ++ parameters->sized_target<64, false>()-> ++ record_gnu_property(note_type, pr_type, pr_datasz, pr_data, ++ object); ++#else ++ gold_unreachable(); ++#endif ++ } ++ } ++ else ++ gold_unreachable(); ++ return; ++ } ++ ++ Gnu_properties::iterator pprop = this->gnu_properties_.find(pr_type); ++ if (pprop == this->gnu_properties_.end()) ++ { ++ Gnu_property prop; ++ prop.pr_datasz = pr_datasz; ++ prop.pr_data = new unsigned char[pr_datasz]; ++ memcpy(prop.pr_data, pr_data, pr_datasz); ++ this->gnu_properties_[pr_type] = prop; ++ } ++ else ++ { ++ const bool is_big_endian = parameters->target().is_big_endian(); ++ switch (pr_type) ++ { ++ case elfcpp::GNU_PROPERTY_STACK_SIZE: ++ // Record the maximum value seen. ++ { ++ uint64_t val1 = read_sized_value(pprop->second.pr_datasz, ++ pprop->second.pr_data, ++ is_big_endian, object); ++ uint64_t val2 = read_sized_value(pr_datasz, pr_data, ++ is_big_endian, object); ++ if (val2 > val1) ++ write_sized_value(val2, pprop->second.pr_datasz, ++ pprop->second.pr_data, is_big_endian); ++ } ++ break; ++ case elfcpp::GNU_PROPERTY_NO_COPY_ON_PROTECTED: ++ // No data to merge. ++ break; ++ default: ++ gold_warning(_("%s: unknown program property type %d " ++ "in .note.gnu.property section"), ++ object->name().c_str(), pr_type); ++ } ++ } ++} ++ ++// Merge per-object properties with program properties. ++// This lets the target identify objects that are missing certain ++// properties, in cases where properties must be ANDed together. ++ ++void ++Layout::merge_gnu_properties(const Object* object) ++{ ++ const int size = parameters->target().get_size(); ++ const bool is_big_endian = parameters->target().is_big_endian(); ++ if (size == 32) ++ { ++ if (is_big_endian) ++ { ++#ifdef HAVE_TARGET_32_BIG ++ parameters->sized_target<32, true>()->merge_gnu_properties(object); ++#else ++ gold_unreachable(); ++#endif ++ } ++ else ++ { ++#ifdef HAVE_TARGET_32_LITTLE ++ parameters->sized_target<32, false>()->merge_gnu_properties(object); ++#else ++ gold_unreachable(); ++#endif ++ } ++ } ++ else if (size == 64) ++ { ++ if (is_big_endian) ++ { ++#ifdef HAVE_TARGET_64_BIG ++ parameters->sized_target<64, true>()->merge_gnu_properties(object); ++#else ++ gold_unreachable(); ++#endif ++ } ++ else ++ { ++#ifdef HAVE_TARGET_64_LITTLE ++ parameters->sized_target<64, false>()->merge_gnu_properties(object); ++#else ++ gold_unreachable(); ++#endif ++ } ++ } ++ else ++ gold_unreachable(); ++} ++ ++// Add a target-specific property for the output .note.gnu.property section. ++ ++void ++Layout::add_gnu_property(unsigned int note_type, ++ unsigned int pr_type, ++ size_t pr_datasz, ++ const unsigned char* pr_data) ++{ ++ gold_assert(note_type == elfcpp::NT_GNU_PROPERTY_TYPE_0); ++ ++ Gnu_property prop; ++ prop.pr_datasz = pr_datasz; ++ prop.pr_data = new unsigned char[pr_datasz]; ++ memcpy(prop.pr_data, pr_data, pr_datasz); ++ this->gnu_properties_[pr_type] = prop; ++} ++ + // Create automatic note sections. + + void + Layout::create_notes() + { ++ this->create_gnu_properties_note(); + this->create_gold_note(); + this->create_stack_segment(); + this->create_build_id(); +@@ -3010,6 +3243,58 @@ Layout::create_note(const char* name, in + return os; + } + ++// Create a .note.gnu.property section to record program properties ++// accumulated from the input files. ++ ++void ++Layout::create_gnu_properties_note() ++{ ++ parameters->target().finalize_gnu_properties(this); ++ ++ if (this->gnu_properties_.empty()) ++ return; ++ ++ const unsigned int size = parameters->target().get_size(); ++ const bool is_big_endian = parameters->target().is_big_endian(); ++ ++ // Compute the total size of the properties array. ++ size_t descsz = 0; ++ for (Gnu_properties::const_iterator prop = this->gnu_properties_.begin(); ++ prop != this->gnu_properties_.end(); ++ ++prop) ++ { ++ descsz = align_address(descsz + 8 + prop->second.pr_datasz, size / 8); ++ } ++ ++ // Create the note section. ++ size_t trailing_padding; ++ Output_section* os = this->create_note("GNU", elfcpp::NT_GNU_PROPERTY_TYPE_0, ++ ".note.gnu.property", descsz, ++ true, &trailing_padding); ++ if (os == NULL) ++ return; ++ gold_assert(trailing_padding == 0); ++ ++ // Allocate and fill the properties array. ++ unsigned char* desc = new unsigned char[descsz]; ++ unsigned char* p = desc; ++ for (Gnu_properties::const_iterator prop = this->gnu_properties_.begin(); ++ prop != this->gnu_properties_.end(); ++ ++prop) ++ { ++ size_t datasz = prop->second.pr_datasz; ++ size_t aligned_datasz = align_address(prop->second.pr_datasz, size / 8); ++ write_sized_value(prop->first, 4, p, is_big_endian); ++ write_sized_value(datasz, 4, p + 4, is_big_endian); ++ memcpy(p + 8, prop->second.pr_data, datasz); ++ if (aligned_datasz > datasz) ++ memset(p + 8 + datasz, 0, aligned_datasz - datasz); ++ p += 8 + aligned_datasz; ++ } ++ Output_section_data* posd = new Output_data_const(desc, descsz, 4); ++ os->add_output_section_data(posd); ++} ++ + // For an executable or shared library, create a note to record the + // version of gold used to create the binary. + +Only in binutils-2.30/gold: layout.cc.orig +diff -rup binutils.orig/gold/layout.h binutils-2.30/gold/layout.h +--- binutils.orig/gold/layout.h 2018-08-14 16:18:17.926466993 +0100 ++++ binutils-2.30/gold/layout.h 2018-08-14 16:23:15.811244776 +0100 +@@ -680,6 +680,25 @@ class Layout + layout_gnu_stack(bool seen_gnu_stack, uint64_t gnu_stack_flags, + const Object*); + ++ // Layout a .note.gnu.property section. ++ void ++ layout_gnu_property(unsigned int note_type, ++ unsigned int pr_type, ++ size_t pr_datasz, ++ const unsigned char* pr_data, ++ const Object* object); ++ ++ // Merge per-object properties with program properties. ++ void ++ merge_gnu_properties(const Object* object); ++ ++ // Add a target-specific property for the output .note.gnu.property section. ++ void ++ add_gnu_property(unsigned int note_type, ++ unsigned int pr_type, ++ size_t pr_datasz, ++ const unsigned char* pr_data); ++ + // Add an Output_section_data to the layout. This is used for + // special sections like the GOT section. ORDER is where the + // section should wind up in the output segment. IS_RELRO is true +@@ -1040,6 +1059,10 @@ class Layout + create_note(const char* name, int note_type, const char* section_name, + size_t descsz, bool allocate, size_t* trailing_padding); + ++ // Create a note section for gnu program properties. ++ void ++ create_gnu_properties_note(); ++ + // Create a note section for gold version. + void + create_gold_note(); +@@ -1326,6 +1349,14 @@ class Layout + std::vector section_infos_; + }; + ++ // Program properties from .note.gnu.property sections. ++ struct Gnu_property ++ { ++ size_t pr_datasz; ++ unsigned char* pr_data; ++ }; ++ typedef std::map Gnu_properties; ++ + // The number of input files, for sizing tables. + int number_of_input_files_; + // Information set by scripts or by command line options. +@@ -1452,6 +1483,8 @@ class Layout + Incremental_binary* incremental_base_; + // For incremental links, a list of free space within the file. + Free_list free_list_; ++ // Program properties. ++ Gnu_properties gnu_properties_; + }; + + // This task handles writing out data in output sections which is not +Only in binutils-2.30/gold: layout.h.orig +diff -rup binutils.orig/gold/object.cc binutils-2.30/gold/object.cc +--- binutils.orig/gold/object.cc 2018-08-14 16:18:17.929466971 +0100 ++++ binutils-2.30/gold/object.cc 2018-08-14 16:23:15.812244769 +0100 +@@ -1313,6 +1313,102 @@ Sized_relobj_file::lay + this->set_relocs_must_follow_section_writes(); + } + ++// Layout an input .note.gnu.property section. ++ ++// This note section has an *extremely* non-standard layout. ++// The gABI spec says that ELF-64 files should have 8-byte fields and ++// 8-byte alignment in the note section, but the Gnu tools generally ++// use 4-byte fields and 4-byte alignment (see the comment for ++// Layout::create_note). This section uses 4-byte fields (i.e., ++// namesz, descsz, and type are always 4 bytes), the name field is ++// padded to a multiple of 4 bytes, but the desc field is padded ++// to a multiple of 4 or 8 bytes, depending on the ELF class. ++// The individual properties within the desc field always use ++// 4-byte pr_type and pr_datasz fields, but pr_data is padded to ++// a multiple of 4 or 8 bytes, depending on the ELF class. ++ ++template ++void ++Sized_relobj_file::layout_gnu_property_section( ++ Layout* layout, ++ unsigned int shndx) ++{ ++ section_size_type contents_len; ++ const unsigned char* pcontents = this->section_contents(shndx, ++ &contents_len, ++ false); ++ const unsigned char* pcontents_end = pcontents + contents_len; ++ ++ // Loop over all the notes in this section. ++ while (pcontents < pcontents_end) ++ { ++ if (pcontents + 16 > pcontents_end) ++ { ++ gold_warning(_("%s: corrupt .note.gnu.property section " ++ "(note too short)"), ++ this->name().c_str()); ++ return; ++ } ++ ++ size_t namesz = elfcpp::Swap<32, big_endian>::readval(pcontents); ++ size_t descsz = elfcpp::Swap<32, big_endian>::readval(pcontents + 4); ++ unsigned int ntype = elfcpp::Swap<32, big_endian>::readval(pcontents + 8); ++ const unsigned char* pname = pcontents + 12; ++ ++ if (namesz != 4 || strcmp(reinterpret_cast(pname), "GNU") != 0) ++ { ++ gold_warning(_("%s: corrupt .note.gnu.property section " ++ "(name is not 'GNU')"), ++ this->name().c_str()); ++ return; ++ } ++ ++ if (ntype != elfcpp::NT_GNU_PROPERTY_TYPE_0) ++ { ++ gold_warning(_("%s: unsupported note type %d " ++ "in .note.gnu.property section"), ++ this->name().c_str(), ntype); ++ return; ++ } ++ ++ size_t aligned_namesz = align_address(namesz, 4); ++ const unsigned char* pdesc = pname + aligned_namesz; ++ ++ if (pdesc + descsz > pcontents + contents_len) ++ { ++ gold_warning(_("%s: corrupt .note.gnu.property section"), ++ this->name().c_str()); ++ return; ++ } ++ ++ const unsigned char* pprop = pdesc; ++ ++ // Loop over the program properties in this note. ++ while (pprop < pdesc + descsz) ++ { ++ if (pprop + 8 > pdesc + descsz) ++ { ++ gold_warning(_("%s: corrupt .note.gnu.property section"), ++ this->name().c_str()); ++ return; ++ } ++ unsigned int pr_type = elfcpp::Swap<32, big_endian>::readval(pprop); ++ size_t pr_datasz = elfcpp::Swap<32, big_endian>::readval(pprop + 4); ++ pprop += 8; ++ if (pprop + pr_datasz > pdesc + descsz) ++ { ++ gold_warning(_("%s: corrupt .note.gnu.property section"), ++ this->name().c_str()); ++ return; ++ } ++ layout->layout_gnu_property(ntype, pr_type, pr_datasz, pprop, this); ++ pprop += align_address(pr_datasz, size / 8); ++ } ++ ++ pcontents = pdesc + align_address(descsz, size / 8); ++ } ++} ++ + // Lay out the input sections. We walk through the sections and check + // whether they should be included in the link. If they should, we + // pass them to the Layout object, which will return an output section +@@ -1565,6 +1661,14 @@ Sized_relobj_file::do_ + omit[i] = true; + } + ++ // Handle .note.gnu.property sections. ++ if (sh_type == elfcpp::SHT_NOTE ++ && strcmp(name, ".note.gnu.property") == 0) ++ { ++ this->layout_gnu_property_section(layout, i); ++ omit[i] = true; ++ } ++ + bool discard = omit[i]; + if (!discard) + { +@@ -1781,7 +1885,10 @@ Sized_relobj_file::do_ + } + + if (!is_pass_two) +- layout->layout_gnu_stack(seen_gnu_stack, gnu_stack_flags, this); ++ { ++ layout->merge_gnu_properties(this); ++ layout->layout_gnu_stack(seen_gnu_stack, gnu_stack_flags, this); ++ } + + // Handle the .eh_frame sections after the other sections. + gold_assert(!is_pass_one || eh_frame_sections.empty()); +Only in binutils-2.30/gold: object.cc.orig +diff -rup binutils.orig/gold/object.h binutils-2.30/gold/object.h +--- binutils.orig/gold/object.h 2018-08-14 16:18:17.926466993 +0100 ++++ binutils-2.30/gold/object.h 2018-08-14 16:18:47.793244187 +0100 +@@ -2647,6 +2647,10 @@ class Sized_relobj_file : public Sized_r + unsigned int shndx, const typename This::Shdr&, + unsigned int reloc_shndx, unsigned int reloc_type); + ++ // Layout an input .note.gnu.property section. ++ void ++ layout_gnu_property_section(Layout* layout, unsigned int shndx); ++ + // Write section data to the output file. Record the views and + // sizes in VIEWS for use when relocating. + void +Only in binutils-2.30/gold: object.h.orig +diff -rup binutils.orig/gold/target.h binutils-2.30/gold/target.h +--- binutils.orig/gold/target.h 2018-08-14 16:18:17.928466978 +0100 ++++ binutils-2.30/gold/target.h 2018-08-14 16:23:15.812244769 +0100 +@@ -504,6 +504,11 @@ class Target + should_include_section(elfcpp::Elf_Word sh_type) const + { return this->do_should_include_section(sh_type); } + ++ // Finalize the target-specific properties in the .note.gnu.property section. ++ void ++ finalize_gnu_properties(Layout* layout) const ++ { this->do_finalize_gnu_properties(layout); } ++ + protected: + // This struct holds the constant information for a child class. We + // use a struct to avoid the overhead of virtual function calls for +@@ -807,6 +812,11 @@ class Target + do_should_include_section(elfcpp::Elf_Word) const + { return true; } + ++ // Finalize the target-specific properties in the .note.gnu.property section. ++ virtual void ++ do_finalize_gnu_properties(Layout*) const ++ { } ++ + private: + // The implementations of the four do_make_elf_object virtual functions are + // almost identical except for their sizes and endianness. We use a template. +@@ -1126,6 +1136,17 @@ class Sized_target : public Target + return elfcpp::elf_r_sym(rel.get_r_info()); + } + ++ // Record a target-specific program property in the .note.gnu.property ++ // section. ++ virtual void ++ record_gnu_property(int, int, size_t, const unsigned char*, const Object*) ++ { } ++ ++ // Merge the target-specific program properties from the current object. ++ virtual void ++ merge_gnu_properties(const Object*) ++ { } ++ + protected: + Sized_target(const Target::Target_info* pti) + : Target(pti) +Only in binutils-2.30/gold: target.h.orig +Only in binutils-2.30/gold/testsuite: gnu_property_a.S +Only in binutils-2.30/gold/testsuite: gnu_property_b.S +Only in binutils-2.30/gold/testsuite: gnu_property_c.S +Only in binutils-2.30/gold/testsuite: gnu_property_main.c +Only in binutils-2.30/gold/testsuite: gnu_property_test.sh +diff -rup binutils.orig/gold/testsuite/Makefile.am binutils-2.30/gold/testsuite/Makefile.am +--- binutils.orig/gold/testsuite/Makefile.am 2018-08-14 16:18:17.930466963 +0100 ++++ binutils-2.30/gold/testsuite/Makefile.am 2018-08-14 16:23:15.812244769 +0100 +@@ -3121,6 +3121,23 @@ exception_x86_64_bnd_2.o: exception_test + $(CXXCOMPILE) -c -Bgcctestdir/ -Wa,-madd-bnd-prefix -o $@ $< + endif DEFAULT_TARGET_X86_64 + ++if DEFAULT_TARGET_X86_64 ++check_SCRIPTS += gnu_property_test.sh ++check_DATA += gnu_property_test.stdout ++gnu_property_test.stdout: gnu_property_test ++ $(TEST_READELF) -n $< >$@ ++gnu_property_test: gcctestdir/ld gnu_property_a.o gnu_property_b.o gnu_property_c.o ++ gcctestdir/ld -o $@ gnu_property_a.o gnu_property_b.o gnu_property_c.o ++gnu_property_main.o: gnu_property_main.c ++ $(COMPILE) -c -o $@ $< ++gnu_property_a.o: gnu_property_a.S ++ $(COMPILE) -c -o $@ $< ++gnu_property_b.o: gnu_property_b.S ++ $(COMPILE) -c -o $@ $< ++gnu_property_c.o: gnu_property_c.S ++ $(COMPILE) -c -o $@ $< ++endif DEFAULT_TARGET_X86_64 ++ + check_PROGRAMS += pr22266 + pr22266: pr22266_main.o pr22266_ar.o gcctestdir/ld + $(LINK) -Bgcctestdir/ pr22266_main.o pr22266_ar.o +Only in binutils-2.30/gold/testsuite: Makefile.am.orig +diff -rup binutils.orig/gold/testsuite/Makefile.in binutils-2.30/gold/testsuite/Makefile.in +--- binutils.orig/gold/testsuite/Makefile.in 2018-08-14 16:18:17.939466896 +0100 ++++ binutils-2.30/gold/testsuite/Makefile.in 2018-08-14 16:23:15.813244761 +0100 +@@ -814,28 +814,30 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E + @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ two_file_test_tmp_4.o \ + @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ two_file_test_5.a \ + @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ two_file_test_6.a +-@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_84 = pr22266 ++@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_84 = gnu_property_test.sh ++@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_85 = gnu_property_test.stdout ++@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_86 = pr22266 + + # These tests work with native and cross linkers. + + # Test script section order. +-@NATIVE_OR_CROSS_LINKER_TRUE@am__append_85 = script_test_10.sh +-@NATIVE_OR_CROSS_LINKER_TRUE@am__append_86 = script_test_10.stdout +-@NATIVE_OR_CROSS_LINKER_TRUE@am__append_87 = script_test_10 ++@NATIVE_OR_CROSS_LINKER_TRUE@am__append_87 = script_test_10.sh ++@NATIVE_OR_CROSS_LINKER_TRUE@am__append_88 = script_test_10.stdout ++@NATIVE_OR_CROSS_LINKER_TRUE@am__append_89 = script_test_10 + + # These tests work with cross linkers only. +-@DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_88 = split_i386.sh +-@DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_89 = split_i386_1.stdout split_i386_2.stdout \ ++@DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_90 = split_i386.sh ++@DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_91 = split_i386_1.stdout split_i386_2.stdout \ + @DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_i386_3.stdout split_i386_4.stdout split_i386_r.stdout + +-@DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_90 = split_i386_1 split_i386_2 split_i386_3 \ ++@DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_92 = split_i386_1 split_i386_2 split_i386_3 \ + @DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_i386_4 split_i386_r + +-@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_91 = split_x86_64.sh \ ++@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_93 = split_x86_64.sh \ + @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ bnd_plt_1.sh \ + @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ bnd_ifunc_1.sh \ + @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ bnd_ifunc_2.sh +-@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_92 = split_x86_64_1.stdout \ ++@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_94 = split_x86_64_1.stdout \ + @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_x86_64_2.stdout \ + @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_x86_64_3.stdout \ + @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_x86_64_4.stdout \ +@@ -843,14 +845,14 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E + @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ bnd_plt_1.stdout \ + @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ bnd_ifunc_1.stdout \ + @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ bnd_ifunc_2.stdout +-@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_93 = split_x86_64_1 split_x86_64_2 split_x86_64_3 \ ++@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_95 = split_x86_64_1 split_x86_64_2 split_x86_64_3 \ + @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_x86_64_4 split_x86_64_r + +-@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_94 = split_x32.sh +-@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_95 = split_x32_1.stdout split_x32_2.stdout \ ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_96 = split_x32.sh ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_97 = split_x32_1.stdout split_x32_2.stdout \ + @DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_x32_3.stdout split_x32_4.stdout split_x32_r.stdout + +-@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_96 = split_x32_1 split_x32_2 split_x32_3 \ ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_98 = split_x32_1 split_x32_2 split_x32_3 \ + @DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_x32_4 split_x32_r + + +@@ -871,7 +873,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E + # Check Thumb to ARM farcall veneers + + # Check handling of --target1-abs, --target1-rel and --target2 options +-@DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_97 = arm_abs_global.sh \ ++@DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_99 = arm_abs_global.sh \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_branch_in_range.sh \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_branch_out_of_range.sh \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_fix_v4bx.sh \ +@@ -894,7 +896,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_target2_got_rel.sh + + # The test demonstrates why the constructor of a target object should not access options. +-@DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_98 = arm_abs_global.stdout \ ++@DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_100 = arm_abs_global.stdout \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_bl_in_range.stdout \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_bl_out_of_range.stdout \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ thumb_bl_in_range.stdout \ +@@ -947,7 +949,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_target2_abs.stdout \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_target2_got_rel.stdout \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_target_lazy_init +-@DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_99 = arm_abs_global \ ++@DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_101 = arm_abs_global \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_bl_in_range \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_bl_out_of_range \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ thumb_bl_in_range \ +@@ -998,20 +1000,20 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_target2_abs \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_target2_got_rel \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_target_lazy_init +-@DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_100 = aarch64_reloc_none.sh \ ++@DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_102 = aarch64_reloc_none.sh \ + @DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ aarch64_relocs.sh \ + @DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ pr21430.sh \ + @DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ aarch64_tlsdesc.sh +-@DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_101 = aarch64_reloc_none.stdout \ ++@DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_103 = aarch64_reloc_none.stdout \ + @DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ aarch64_relocs.stdout \ + @DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ pr21430.stdout \ + @DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ aarch64_tlsdesc.stdout +-@DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_102 = aarch64_reloc_none \ ++@DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_104 = aarch64_reloc_none \ + @DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ aarch64_relocs \ + @DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ pr21430 \ + @DEFAULT_TARGET_AARCH64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ aarch64_tlsdesc +-@DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_103 = split_s390.sh +-@DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_104 = split_s390_z1.stdout split_s390_z2.stdout split_s390_z3.stdout \ ++@DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_105 = split_s390.sh ++@DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_106 = split_s390_z1.stdout split_s390_z2.stdout split_s390_z3.stdout \ + @DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_s390_z4.stdout split_s390_n1.stdout split_s390_n2.stdout \ + @DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_s390_a1.stdout split_s390_a2.stdout split_s390_z1_ns.stdout \ + @DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_s390_z2_ns.stdout split_s390_z3_ns.stdout split_s390_z4_ns.stdout \ +@@ -1023,7 +1025,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E + @DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_s390x_z4_ns.stdout split_s390x_n1_ns.stdout \ + @DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_s390x_n2_ns.stdout split_s390x_r.stdout + +-@DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_105 = split_s390_z1 split_s390_z2 split_s390_z3 \ ++@DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_107 = split_s390_z1 split_s390_z2 split_s390_z3 \ + @DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_s390_z4 split_s390_n1 split_s390_n2 split_s390_a1 \ + @DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_s390_a2 split_s390_z1_ns split_s390_z2_ns split_s390_z3_ns \ + @DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_s390_z4_ns split_s390_n1_ns split_s390_n2_ns split_s390_r \ +@@ -1032,10 +1034,10 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E + @DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_s390x_z1_ns split_s390x_z2_ns split_s390x_z3_ns \ + @DEFAULT_TARGET_S390_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_s390x_z4_ns split_s390x_n1_ns split_s390x_n2_ns split_s390x_r + +-@DEFAULT_TARGET_X86_64_TRUE@am__append_106 = *.dwo *.dwp +-@DEFAULT_TARGET_X86_64_TRUE@am__append_107 = dwp_test_1.sh \ ++@DEFAULT_TARGET_X86_64_TRUE@am__append_108 = *.dwo *.dwp ++@DEFAULT_TARGET_X86_64_TRUE@am__append_109 = dwp_test_1.sh \ + @DEFAULT_TARGET_X86_64_TRUE@ dwp_test_2.sh +-@DEFAULT_TARGET_X86_64_TRUE@am__append_108 = dwp_test_1.stdout \ ++@DEFAULT_TARGET_X86_64_TRUE@am__append_110 = dwp_test_1.stdout \ + @DEFAULT_TARGET_X86_64_TRUE@ dwp_test_2.stdout + subdir = testsuite + DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +@@ -2828,9 +2830,9 @@ MOSTLYCLEANFILES = *.so *.syms *.stdout + $(am__append_34) $(am__append_37) $(am__append_41) \ + $(am__append_47) $(am__append_51) $(am__append_52) \ + $(am__append_58) $(am__append_78) $(am__append_81) \ +- $(am__append_83) $(am__append_87) $(am__append_90) \ +- $(am__append_93) $(am__append_96) $(am__append_99) \ +- $(am__append_102) $(am__append_105) $(am__append_106) ++ $(am__append_83) $(am__append_89) $(am__append_92) \ ++ $(am__append_95) $(am__append_98) $(am__append_101) \ ++ $(am__append_104) $(am__append_107) $(am__append_108) + + # We will add to these later, for each individual test. Note + # that we add each test under check_SCRIPTS or check_PROGRAMS; +@@ -2839,18 +2841,18 @@ check_SCRIPTS = $(am__append_2) $(am__ap + $(am__append_29) $(am__append_35) $(am__append_42) \ + $(am__append_45) $(am__append_49) $(am__append_53) \ + $(am__append_56) $(am__append_62) $(am__append_73) \ +- $(am__append_76) $(am__append_79) $(am__append_85) \ +- $(am__append_88) $(am__append_91) $(am__append_94) \ +- $(am__append_97) $(am__append_100) $(am__append_103) \ +- $(am__append_107) ++ $(am__append_76) $(am__append_79) $(am__append_84) \ ++ $(am__append_87) $(am__append_90) $(am__append_93) \ ++ $(am__append_96) $(am__append_99) $(am__append_102) \ ++ $(am__append_105) $(am__append_109) + check_DATA = $(am__append_3) $(am__append_20) $(am__append_24) \ + $(am__append_30) $(am__append_36) $(am__append_43) \ + $(am__append_46) $(am__append_50) $(am__append_54) \ + $(am__append_57) $(am__append_63) $(am__append_74) \ +- $(am__append_77) $(am__append_80) $(am__append_86) \ +- $(am__append_89) $(am__append_92) $(am__append_95) \ +- $(am__append_98) $(am__append_101) $(am__append_104) \ +- $(am__append_108) ++ $(am__append_77) $(am__append_80) $(am__append_85) \ ++ $(am__append_88) $(am__append_91) $(am__append_94) \ ++ $(am__append_97) $(am__append_100) $(am__append_103) \ ++ $(am__append_106) $(am__append_110) + BUILT_SOURCES = $(am__append_40) + TESTS = $(check_SCRIPTS) $(check_PROGRAMS) + +@@ -5737,6 +5739,8 @@ exception_x86_64_bnd_test.log: exception + @p='exception_x86_64_bnd_test$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) + pr22266.log: pr22266$(EXEEXT) + @p='pr22266$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) ++gnu_property_test.sh.log: gnu_property_test.sh ++ @p='gnu_property_test.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) + .test.log: + @p='$<'; $(am__check_pre) $(TEST_LOG_COMPILE) "$$tst" $(am__check_post) + @am__EXEEXT_TRUE@.test$(EXEEXT).log: +@@ -7394,6 +7403,18 @@ uninstall-am: + @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -c -fpic -Bgcctestdir/ -Wa,-madd-bnd-prefix -o $@ $< + @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@exception_x86_64_bnd_2.o: exception_test_2.cc gcctestdir/as + @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -c -Bgcctestdir/ -Wa,-madd-bnd-prefix -o $@ $< ++@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@gnu_property_test.stdout: gnu_property_test ++@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(TEST_READELF) -n $< >$@ ++@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@gnu_property_test: gcctestdir/ld gnu_property_a.o gnu_property_b.o gnu_property_c.o ++@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ gcctestdir/ld -o $@ gnu_property_a.o gnu_property_b.o gnu_property_c.o ++@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@gnu_property_main.o: gnu_property_main.c ++@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(COMPILE) -c -o $@ $< ++@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@gnu_property_a.o: gnu_property_a.S ++@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(COMPILE) -c -o $@ $< ++@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@gnu_property_b.o: gnu_property_b.S ++@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(COMPILE) -c -o $@ $< ++@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@gnu_property_c.o: gnu_property_c.S ++@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(COMPILE) -c -o $@ $< + @GCC_TRUE@@NATIVE_LINKER_TRUE@pr22266: pr22266_main.o pr22266_ar.o gcctestdir/ld + @GCC_TRUE@@NATIVE_LINKER_TRUE@ $(LINK) -Bgcctestdir/ pr22266_main.o pr22266_ar.o + @GCC_TRUE@@NATIVE_LINKER_TRUE@pr22266_ar.o: pr22266_a.o gcctestdir/ld +Only in binutils-2.30/gold/testsuite: Makefile.in.orig +Only in binutils-2.30/gold/testsuite: Makefile.in.rej +diff -rup binutils.orig/gold/x86_64.cc binutils-2.30/gold/x86_64.cc +--- binutils.orig/gold/x86_64.cc 2018-08-14 16:18:17.926466993 +0100 ++++ binutils-2.30/gold/x86_64.cc 2018-08-14 16:23:26.758163112 +0100 +@@ -590,7 +590,8 @@ class Target_x86_64 : public Sized_targe + got_tlsdesc_(NULL), global_offset_table_(NULL), rela_dyn_(NULL), + rela_irelative_(NULL), copy_relocs_(elfcpp::R_X86_64_COPY), + got_mod_index_offset_(-1U), tlsdesc_reloc_info_(), +- tls_base_symbol_defined_(false) ++ tls_base_symbol_defined_(false), isa_1_used_(0), isa_1_needed_(0), ++ feature_1_(0), object_feature_1_(0), seen_first_object_(false) + { } + + // Hook for a new output section. +@@ -1188,6 +1189,20 @@ class Target_x86_64 : public Sized_targe + this->rela_dyn_section(layout)); + } + ++ // Record a target-specific program property in the .note.gnu.property ++ // section. ++ void ++ record_gnu_property(int, int, size_t, const unsigned char*, const Object*); ++ ++ // Merge the target-specific program properties from the current object. ++ void ++ merge_gnu_properties(const Object*); ++ ++ // Finalize the target-specific program properties and add them back to ++ // the layout. ++ void ++ do_finalize_gnu_properties(Layout*) const; ++ + // Information about this specific target which we pass to the + // general Target structure. + static const Target::Target_info x86_64_info; +@@ -1245,6 +1260,17 @@ class Target_x86_64 : public Sized_targe + std::vector tlsdesc_reloc_info_; + // True if the _TLS_MODULE_BASE_ symbol has been defined. + bool tls_base_symbol_defined_; ++ // Target-specific program properties, from .note.gnu.property section. ++ // Each bit represents a specific feature. ++ uint32_t isa_1_used_; ++ uint32_t isa_1_needed_; ++ uint32_t feature_1_; ++ // Target-specific properties from the current object. ++ // These bits get ANDed into FEATURE_1_ after all properties for the object ++ // have been processed. ++ uint32_t object_feature_1_; ++ // Whether we have seen our first object, for use in initializing FEATURE_1_. ++ bool seen_first_object_; + }; + + template<> +@@ -1431,6 +1457,93 @@ Target_x86_64::rela_irelative_sect + return this->rela_irelative_; + } + ++// Record a target-specific program property from the .note.gnu.property ++// section. ++template ++void ++Target_x86_64::record_gnu_property( ++ int, int pr_type, ++ size_t pr_datasz, const unsigned char* pr_data, ++ const Object* object) ++{ ++ uint32_t val = 0; ++ ++ switch (pr_type) ++ { ++ case elfcpp::GNU_PROPERTY_X86_ISA_1_USED: ++ case elfcpp::GNU_PROPERTY_X86_ISA_1_NEEDED: ++ case elfcpp::GNU_PROPERTY_X86_FEATURE_1_AND: ++ if (pr_datasz != 4) ++ { ++ gold_warning(_("%s: corrupt .note.gnu.property section " ++ "(pr_datasz for property %d is not 4)"), ++ object->name().c_str(), pr_type); ++ return; ++ } ++ val = elfcpp::Swap<32, false>::readval(pr_data); ++ break; ++ default: ++ gold_warning(_("%s: unknown program property type 0x%x " ++ "in .note.gnu.property section"), ++ object->name().c_str(), pr_type); ++ break; ++ } ++ ++ switch (pr_type) ++ { ++ case elfcpp::GNU_PROPERTY_X86_ISA_1_USED: ++ this->isa_1_used_ |= val; ++ break; ++ case elfcpp::GNU_PROPERTY_X86_ISA_1_NEEDED: ++ this->isa_1_needed_ |= val; ++ break; ++ case elfcpp::GNU_PROPERTY_X86_FEATURE_1_AND: ++ // If we see multiple feature props in one object, OR them together. ++ this->object_feature_1_ |= val; ++ break; ++ } ++} ++ ++// Merge the target-specific program properties from the current object. ++template ++void ++Target_x86_64::merge_gnu_properties(const Object*) ++{ ++ if (this->seen_first_object_) ++ this->feature_1_ &= this->object_feature_1_; ++ else ++ { ++ this->feature_1_ = this->object_feature_1_; ++ this->seen_first_object_ = true; ++ } ++ this->object_feature_1_ = 0; ++} ++ ++static inline void ++add_property(Layout* layout, unsigned int pr_type, uint32_t val) ++{ ++ unsigned char buf[4]; ++ elfcpp::Swap<32, false>::writeval(buf, val); ++ layout->add_gnu_property(elfcpp::NT_GNU_PROPERTY_TYPE_0, pr_type, 4, buf); ++} ++ ++// Finalize the target-specific program properties and add them back to ++// the layout. ++template ++void ++Target_x86_64::do_finalize_gnu_properties(Layout* layout) const ++{ ++ if (this->isa_1_used_ != 0) ++ add_property(layout, elfcpp::GNU_PROPERTY_X86_ISA_1_USED, ++ this->isa_1_used_); ++ if (this->isa_1_needed_ != 0) ++ add_property(layout, elfcpp::GNU_PROPERTY_X86_ISA_1_NEEDED, ++ this->isa_1_needed_); ++ if (this->feature_1_ != 0) ++ add_property(layout, elfcpp::GNU_PROPERTY_X86_FEATURE_1_AND, ++ this->feature_1_); ++} ++ + // Write the first three reserved words of the .got.plt section. + // The remainder of the section is written while writing the PLT + // in Output_data_plt_i386::do_write. +Only in binutils-2.30/gold: x86_64.cc.orig +--- /dev/null 2018-08-14 08:11:42.835432884 +0100 ++++ binutils-2.30/gold/testsuite/gnu_property_a.S 2018-08-14 16:23:15.813244761 +0100 +@@ -0,0 +1,46 @@ ++#define NT_GNU_PROPERTY_TYPE_0 5 ++ ++#define GNU_PROPERTY_STACK_SIZE 1 ++#define GNU_PROPERTY_X86_ISA_1_USED 0xc0000000 ++#define GNU_PROPERTY_X86_ISA_1_NEEDED 0xc0000001 ++#define GNU_PROPERTY_X86_FEATURE_1_AND 0xc0000002 ++ ++#if __SIZEOF_PTRDIFF_T__ == 8 ++# define ALIGN 3 ++#elif __SIZEOF_PTRDIFF_T__ == 4 ++# define ALIGN 2 ++#endif ++ ++ .text ++ .globl _start ++_start: ++ ret ++ ++ .section ".note.gnu.property", "a" ++ .p2align ALIGN ++ ++ .long 1f - 0f /* name length */ ++ .long 5f - 2f /* data length */ ++ .long NT_GNU_PROPERTY_TYPE_0 /* note type */ ++0: .asciz "GNU" /* vendor name */ ++1: ++ .p2align ALIGN ++2: .long GNU_PROPERTY_STACK_SIZE /* pr_type. */ ++ .long 4f - 3f /* pr_datasz. */ ++3: ++ .dc.a 0x800 /* Stack size. */ ++4: ++ .p2align ALIGN ++ .long GNU_PROPERTY_X86_ISA_1_USED ++ .long 4 ++ .byte 0x01,0x10,0x00,0x00 ++ .p2align ALIGN ++ .long GNU_PROPERTY_X86_ISA_1_NEEDED ++ .long 4 ++ .byte 0x01,0x10,0x00,0x00 ++ .p2align ALIGN ++ .long GNU_PROPERTY_X86_FEATURE_1_AND ++ .long 4 ++ .byte 0x01,0x00,0x00,0x00 ++ .p2align ALIGN ++5: +--- /dev/null 2018-08-14 08:11:42.835432884 +0100 ++++ binutils-2.30/gold/testsuite/gnu_property_b.S 2018-08-14 16:18:47.795244173 +0100 +@@ -0,0 +1,38 @@ ++#define NT_GNU_PROPERTY_TYPE_0 5 ++ ++#define GNU_PROPERTY_STACK_SIZE 1 ++#define GNU_PROPERTY_NO_COPY_ON_PROTECTED 2 ++#define GNU_PROPERTY_X86_ISA_1_USED 0xc0000000 ++#define GNU_PROPERTY_X86_ISA_1_NEEDED 0xc0000001 ++#define GNU_PROPERTY_X86_FEATURE_1_AND 0xc0000002 ++ ++#if __SIZEOF_PTRDIFF_T__ == 8 ++# define ALIGN 3 ++#elif __SIZEOF_PTRDIFF_T__ == 4 ++# define ALIGN 2 ++#endif ++ ++ .section ".note.gnu.property", "a" ++ .p2align ALIGN ++ .long 1f - 0f /* name length */ ++ .long 3f - 2f /* data length */ ++ .long NT_GNU_PROPERTY_TYPE_0 /* note type */ ++0: .asciz "GNU" /* vendor name */ ++1: ++ .p2align ALIGN ++2: .long GNU_PROPERTY_NO_COPY_ON_PROTECTED /* pr_type. */ ++ .long 0 /* pr_datasz. */ ++ .p2align ALIGN ++ .long GNU_PROPERTY_X86_ISA_1_USED ++ .long 4 ++ .byte 0x01,0x11,0x00,0x00 ++ .p2align ALIGN ++ .long GNU_PROPERTY_X86_ISA_1_NEEDED ++ .long 4 ++ .byte 0x01,0x11,0x00,0x00 ++ .p2align ALIGN ++ .long GNU_PROPERTY_X86_FEATURE_1_AND ++ .long 4 ++ .byte 0x03,0x00,0x00,0x00 ++ .p2align ALIGN ++3: +--- /dev/null 2018-08-14 08:11:42.835432884 +0100 ++++ binutils-2.30/gold/testsuite/gnu_property_c.S 2018-08-14 16:18:47.795244173 +0100 +@@ -0,0 +1,44 @@ ++#define NT_GNU_PROPERTY_TYPE_0 5 ++ ++#define GNU_PROPERTY_STACK_SIZE 1 ++#define GNU_PROPERTY_NO_COPY_ON_PROTECTED 2 ++#define GNU_PROPERTY_X86_ISA_1_USED 0xc0000000 ++#define GNU_PROPERTY_X86_ISA_1_NEEDED 0xc0000001 ++#define GNU_PROPERTY_X86_FEATURE_1_AND 0xc0000002 ++ ++#if __SIZEOF_PTRDIFF_T__ == 8 ++# define ALIGN 3 ++#elif __SIZEOF_PTRDIFF_T__ == 4 ++# define ALIGN 2 ++#endif ++ ++ .section ".note.gnu.property", "a" ++ .p2align ALIGN ++ .long 1f - 0f /* name length */ ++ .long 5f - 2f /* data length */ ++ .long NT_GNU_PROPERTY_TYPE_0 /* note type */ ++0: .asciz "GNU" /* vendor name */ ++1: ++ .p2align ALIGN ++2: .long GNU_PROPERTY_STACK_SIZE /* pr_type. */ ++ .long 4f - 3f /* pr_datasz. */ ++3: ++ .dc.a 0x111100 /* Stack size. */ ++4: ++ .p2align ALIGN ++ .long GNU_PROPERTY_NO_COPY_ON_PROTECTED /* pr_type. */ ++ .long 0 /* pr_datasz. */ ++ .p2align ALIGN ++ .long GNU_PROPERTY_X86_ISA_1_USED ++ .long 4 ++ .byte 0x11,0x10,0x00,0x00 ++ .p2align ALIGN ++ .long GNU_PROPERTY_X86_ISA_1_NEEDED ++ .long 4 ++ .byte 0x11,0x10,0x00,0x00 ++ .p2align ALIGN ++ .long GNU_PROPERTY_X86_FEATURE_1_AND ++ .long 4 ++ .byte 0x01,0x00,0x00,0x00 ++ .p2align ALIGN ++5: +--- /dev/null 2018-08-14 08:11:42.835432884 +0100 ++++ binutils-2.30/gold/testsuite/gnu_property_main.c 2018-08-14 16:18:47.795244173 +0100 +@@ -0,0 +1,5 @@ ++int ++main(void) ++{ ++ return 0; ++} +--- /dev/null 2018-08-14 08:11:42.835432884 +0100 ++++ binutils-2.30/gold/testsuite/gnu_property_test.sh 2018-08-14 16:18:47.795244173 +0100 +@@ -0,0 +1,64 @@ ++#!/bin/sh ++ ++# gnu_property_test.sh -- test .note.gnu.property section. ++ ++# Copyright (C) 2018 Free Software Foundation, Inc. ++# Written by Cary Coutant . ++ ++# This file is part of gold. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3 of the License, or ++# (at your option) any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, ++# MA 02110-1301, USA. ++ ++# This script checks that after linking the three object files ++# gnu_property_[abc].S, each of which contains a .note.gnu.property ++# section, the resulting output has only a single such note section, ++# and that the properties have been correctly combined. ++ ++check() ++{ ++ if ! grep -q "$2" "$1" ++ then ++ echo "Did not find expected output in $1:" ++ echo " $2" ++ echo "" ++ echo "Actual output below:" ++ cat "$1" ++ exit 1 ++ fi ++} ++ ++check_count() ++{ ++ if test "`grep -c "$2" "$1"`" != "$3" ++ then ++ echo "Did not find correct number of note sections in $1:" ++ echo " $2" ++ echo "" ++ echo "Actual output below:" ++ cat "$1" ++ exit 1 ++ fi ++} ++ ++check_count gnu_property_test.stdout "GNU\s*0x[0-9a-f]*\s*NT_GNU_PROPERTY_TYPE_0" 1 ++ ++check gnu_property_test.stdout "stack size: 0x111100" ++check gnu_property_test.stdout "no copy on protected" ++check gnu_property_test.stdout "x86 ISA used: i486, SSE2, SSE4_2, AVX512CD" ++check gnu_property_test.stdout "x86 ISA needed: i486, SSE2, SSE4_2, AVX512CD" ++check gnu_property_test.stdout "x86 feature: IBT" ++ ++exit 0 +--- binutils.orig/elfcpp/elfcpp.h 2018-08-14 16:18:18.007466389 +0100 ++++ binutils-2.30/elfcpp/elfcpp.h 2018-08-14 16:36:27.151339505 +0100 +@@ -984,7 +984,9 @@ enum + NT_GNU_BUILD_ID = 3, + // The version of gold used to link. Th descriptor is just a + // string. +- NT_GNU_GOLD_VERSION = 4 ++ NT_GNU_GOLD_VERSION = 4, ++ // Program property note, as described in "Linux Extensions to the gABI". ++ NT_GNU_PROPERTY_TYPE_0 = 5 + }; + + // The OS values which may appear in word 0 of a NT_GNU_ABI_TAG note. +@@ -999,6 +1001,21 @@ enum + ELF_NOTE_OS_SYLLABLE = 5 + }; + ++// Program property types for NT_GNU_PROPERTY_TYPE_0. ++ ++enum ++{ ++ GNU_PROPERTY_STACK_SIZE = 1, ++ GNU_PROPERTY_NO_COPY_ON_PROTECTED = 2, ++ GNU_PROPERTY_LOPROC = 0xc0000000, ++ GNU_PROPERTY_X86_ISA_1_USED = 0xc0000000, ++ GNU_PROPERTY_X86_ISA_1_NEEDED = 0xc0000001, ++ GNU_PROPERTY_X86_FEATURE_1_AND = 0xc0000002, ++ GNU_PROPERTY_HIPROC = 0xdfffffff, ++ GNU_PROPERTY_LOUSER = 0xe0000000, ++ GNU_PROPERTY_HIUSER = 0xffffffff ++}; ++ + } // End namespace elfcpp. + + // Include internal details after defining the types. +--- binutils.orig/elfcpp/x86_64.h 2018-08-14 16:18:18.006466396 +0100 ++++ binutils-2.30/elfcpp/x86_64.h 2018-08-14 16:36:55.838125405 +0100 +@@ -103,6 +103,12 @@ enum + R_X86_64_GNU_VTENTRY = 251 + }; + ++// The bit values that can appear in the GNU_PROPERTY_X86_FEATURE_1_AND ++// program property. ++ ++const uint64_t GNU_PROPERTY_X86_FEATURE_1_IBT = 1ULL << 0; ++const uint64_t GNU_PROPERTY_X86_FEATURE_1_SHSTK = 1ULL << 1; ++ + } // End namespace elfcpp. + + #endif // !defined(ELFCPP_X86_64_H) +--- binutils.orig/gold/object.cc 2018-08-14 16:43:20.553254144 +0100 ++++ binutils-2.30/gold/object.cc 2018-08-14 16:43:35.275144269 +0100 +@@ -1618,6 +1618,7 @@ Sized_relobj_file::do_ + for (unsigned int i = 1; i < shnum; ++i, pshdrs += This::shdr_size) + { + typename This::Shdr shdr(pshdrs); ++ unsigned int sh_type = shdr.get_sh_type(); + + if (shdr.get_sh_name() >= section_names_size) + { diff --git a/SOURCES/binutils-ifunc-relocs-in-notes.patch b/SOURCES/binutils-ifunc-relocs-in-notes.patch new file mode 100644 index 0000000..c31ef9f --- /dev/null +++ b/SOURCES/binutils-ifunc-relocs-in-notes.patch @@ -0,0 +1,296 @@ +diff -rup binutils.orig/bfd/elf32-i386.c binutils-2.30/bfd/elf32-i386.c +--- binutils.orig/bfd/elf32-i386.c 2018-03-09 14:43:05.324208873 +0000 ++++ binutils-2.30/bfd/elf32-i386.c 2018-03-09 14:43:23.158000456 +0000 +@@ -2202,12 +2202,19 @@ elf_i386_relocate_section (bfd *output_b + + if ((input_section->flags & SEC_ALLOC) == 0) + { ++ /* If this is a SHT_NOTE section without SHF_ALLOC, treat ++ STT_GNU_IFUNC symbol as STT_FUNC. */ ++ if (elf_section_type (input_section) == SHT_NOTE) ++ goto skip_ifunc; + /* Dynamic relocs are not propagated for SEC_DEBUGGING + sections because such sections are not SEC_ALLOC and + thus ld.so will not process them. */ + if ((input_section->flags & SEC_DEBUGGING) != 0) + continue; +- abort (); ++ _bfd_error_handler (_("%B: error: relocation againt ifunc symbol in non-alloc section %A"), ++ input_bfd, input_section); ++ bfd_set_error (bfd_error_invalid_operation); ++ return FALSE; + } + + /* STT_GNU_IFUNC symbol must go through PLT. */ +@@ -2421,6 +2428,7 @@ do_ifunc_pointer: + } + } + ++ skip_ifunc: + resolved_to_zero = (eh != NULL + && UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh)); + +diff -rup binutils.orig/bfd/elf32-s390.c binutils-2.30/bfd/elf32-s390.c +--- binutils.orig/bfd/elf32-s390.c 2018-03-09 14:43:05.325208861 +0000 ++++ binutils-2.30/bfd/elf32-s390.c 2018-03-09 14:43:31.353904647 +0000 +@@ -2601,6 +2601,9 @@ elf_s390_relocate_section (bfd *output_b + case R_390_8: + case R_390_16: + case R_390_32: ++ if ((input_section->flags & SEC_ALLOC) == 0) ++ break; ++ + if (h != NULL + && s390_is_ifunc_symbol_p (h) + && h->def_regular) +@@ -2662,9 +2665,6 @@ elf_s390_relocate_section (bfd *output_b + } + } + +- if ((input_section->flags & SEC_ALLOC) == 0) +- break; +- + if ((bfd_link_pic (info) + && (h == NULL + || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT +Only in binutils-2.30/bfd: elf32-s390.c.orig +diff -rup binutils.orig/bfd/elf64-s390.c binutils-2.30/bfd/elf64-s390.c +--- binutils.orig/bfd/elf64-s390.c 2018-03-09 14:43:05.341208674 +0000 ++++ binutils-2.30/bfd/elf64-s390.c 2018-03-09 14:43:31.354904635 +0000 +@@ -2559,6 +2559,9 @@ elf_s390_relocate_section (bfd *output_b + case R_390_32: + case R_390_64: + ++ if ((input_section->flags & SEC_ALLOC) == 0) ++ break; ++ + if (h != NULL + && s390_is_ifunc_symbol_p (h) + && h->def_regular) +@@ -2621,9 +2624,6 @@ elf_s390_relocate_section (bfd *output_b + } + } + +- if ((input_section->flags & SEC_ALLOC) == 0) +- break; +- + if ((bfd_link_pic (info) + && (h == NULL + || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT +Only in binutils-2.30/bfd: elf64-s390.c.orig +diff -rup binutils.orig/bfd/elf64-x86-64.c binutils-2.30/bfd/elf64-x86-64.c +--- binutils.orig/bfd/elf64-x86-64.c 2018-03-09 14:43:05.344208639 +0000 ++++ binutils-2.30/bfd/elf64-x86-64.c 2018-03-09 14:43:23.161000420 +0000 +@@ -2499,12 +2499,19 @@ elf_x86_64_relocate_section (bfd *output + + if ((input_section->flags & SEC_ALLOC) == 0) + { ++ /* If this is a SHT_NOTE section without SHF_ALLOC, treat ++ STT_GNU_IFUNC symbol as STT_FUNC. */ ++ if (elf_section_type (input_section) == SHT_NOTE) ++ goto skip_ifunc; + /* Dynamic relocs are not propagated for SEC_DEBUGGING + sections because such sections are not SEC_ALLOC and + thus ld.so will not process them. */ + if ((input_section->flags & SEC_DEBUGGING) != 0) + continue; +- abort (); ++ _bfd_error_handler (_("%B: error: relocation againt ifunc symbol in non-alloc section %A"), ++ input_bfd, input_section); ++ bfd_set_error (bfd_error_invalid_operation); ++ return FALSE; + } + + switch (r_type) +@@ -2722,6 +2729,7 @@ do_ifunc_pointer: + } + } + ++ skip_ifunc: + resolved_to_zero = (eh != NULL + && UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh)); + +diff -rup binutils.orig/bfd/elfnn-aarch64.c binutils-2.30/bfd/elfnn-aarch64.c +--- binutils.orig/bfd/elfnn-aarch64.c 2018-03-09 14:43:05.337208721 +0000 ++++ binutils-2.30/bfd/elfnn-aarch64.c 2018-03-09 14:43:31.355904624 +0000 +@@ -4987,6 +4987,11 @@ elfNN_aarch64_final_link_relocate (reloc + + if ((input_section->flags & SEC_ALLOC) == 0) + { ++ /* If this is a SHT_NOTE section without SHF_ALLOC, treat ++ STT_GNU_IFUNC symbol as STT_FUNC. */ ++ if (elf_section_type (input_section) == SHT_NOTE) ++ goto skip_ifunc; ++ + /* Dynamic relocs are not propagated for SEC_DEBUGGING + sections because such sections are not SEC_ALLOC and + thus ld.so will not process them. */ +@@ -5180,6 +5185,7 @@ bad_ifunc_reloc: + } + } + ++ skip_ifunc: + resolved_to_zero = (h != NULL + && UNDEFWEAK_NO_DYNAMIC_RELOC (info, h)); + +Only in binutils-2.30/bfd: elfnn-aarch64.c.orig +diff -rup binutils.orig/bfd/elfxx-sparc.c binutils-2.30/bfd/elfxx-sparc.c +--- binutils.orig/bfd/elfxx-sparc.c 2018-03-09 14:43:05.333208768 +0000 ++++ binutils-2.30/bfd/elfxx-sparc.c 2018-03-09 14:43:31.355904624 +0000 +@@ -3026,7 +3026,13 @@ _bfd_sparc_elf_relocate_section (bfd *ou + + if ((input_section->flags & SEC_ALLOC) == 0 + || h->plt.offset == (bfd_vma) -1) +- abort (); ++ { ++ /* If this is a SHT_NOTE section without SHF_ALLOC, treat ++ STT_GNU_IFUNC symbol as STT_FUNC. */ ++ if (elf_section_type (input_section) == SHT_NOTE) ++ goto skip_ifunc; ++ abort (); ++ } + + plt_sec = htab->elf.splt; + if (! plt_sec) +@@ -3130,6 +3136,7 @@ _bfd_sparc_elf_relocate_section (bfd *ou + } + } + ++ skip_ifunc: + eh = (struct _bfd_sparc_elf_link_hash_entry *) h; + resolved_to_zero = (eh != NULL + && UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh)); +Only in binutils-2.30/bfd: elfxx-sparc.c.orig +diff -rup binutils.orig/ld/testsuite/ld-ifunc/ifunc.exp binutils-2.30/ld/testsuite/ld-ifunc/ifunc.exp +--- binutils.orig/ld/testsuite/ld-ifunc/ifunc.exp 2018-03-09 14:43:04.844214486 +0000 ++++ binutils-2.30/ld/testsuite/ld-ifunc/ifunc.exp 2018-03-09 14:43:31.355904624 +0000 +@@ -47,6 +47,9 @@ if ![check_shared_lib_support] { + return + } + ++# This test does not need a compiler... ++run_dump_test "ifuncmod5" ++ + # We need a working compiler. (Strictly speaking this is + # not true, we could use target specific assembler files). + if { [which $CC] == 0 } { +Only in binutils-2.30: testsuite +--- /dev/null 2018-03-09 07:59:09.608015200 +0000 ++++ binutils-2.30/ld/testsuite/ld-ifunc/ifuncmod5.s 2018-03-09 14:45:45.698334500 +0000 +@@ -0,0 +1,105 @@ ++ .file "ifuncmod5.c" ++ ++ .text ++ .type ifuncmod5.c, STT_NOTYPE ++ifuncmod5.c: ++ .size ifuncmod5.c, 0 ++ ++ .pushsection .gnu.build.attributes, "", %note ++ .balign 4 ++ .dc.l 8 ++ .dc.l 16 ++ .dc.l 0x100 ++ .asciz "GA$3p4" ++ .dc.a ifuncmod5.c ++ .dc.a ifuncmod5.c_end ++ .popsection ++ ++.Ltext0: ++#APP ++ .protected global ++ .type foo, %gnu_indirect_function ++ .type foo_hidden, %gnu_indirect_function ++ .type foo_protected, %gnu_indirect_function ++ .hidden foo_hidden ++ .protected foo_protected ++#NO_APP ++ .align 8 ++ .type one, %function ++one: ++ .dc.l 0 ++ .size one, .-one ++ .align 8 ++ ++.globl foo ++ .type foo, %function ++foo: ++ .dc.l 0 ++ .size foo, .-foo ++ ++ .pushsection .gnu.build.attributes ++ .dc.l 6 ++ .dc.l 16 ++ .dc.l 0x101 ++ .dc.b 0x47, 0x41, 0x2a, 0x2, 0, 0 ++ .dc.b 0, 0 ++ .dc.a foo ++ .dc.a foo_end ++ .popsection ++ ++foo_end: ++ .align 8 ++.globl foo_hidden ++ .type foo_hidden, %function ++foo_hidden: ++ .dc.l 0 ++ .size foo_hidden, .-foo_hidden ++ ++ .pushsection .gnu.build.attributes ++ .dc.l 6 ++ .dc.l 16 ++ .dc.l 0x101 ++ .dc.b 0x47, 0x41, 0x2a, 0x2, 0, 0 ++ .dc.b 0, 0 ++ .dc.a foo_hidden ++ .dc.a foo_hidden_end ++ .popsection ++ ++foo_hidden_end: ++ .align 8 ++ ++ .globl foo_protected ++ .type foo_protected, %function ++foo_protected: ++ .dc.l 0 ++ ++ .size foo_protected, .-foo_protected ++ ++ .pushsection .gnu.build.attributes ++ .dc.l 6 ++ .dc.l 16 ++ .dc.l 0x101 ++ .dc.b 0x47, 0x41, 0x2a, 0x2, 0, 0 ++ .dc.b 0, 0 ++ .dc.a foo_protected ++ .dc.a foo_protected_end ++ .popsection ++ ++foo_protected_end: ++ .globl global ++ ++ .data ++ .align 4 ++ .type global, %object ++ .size global, 4 ++global: ++ .long -1 ++ ++ .text ++ .Letext0: ++ ++ifuncmod5.c_end: ++ .type ifuncmod5.c_end, STT_NOTYPE ++ .size ifuncmod5.c_end, 0 ++ ++ +--- /dev/null 2018-03-09 07:59:09.608015200 +0000 ++++ binutils-2.30/ld/testsuite/ld-ifunc/ifuncmod5.d 2018-03-09 14:45:45.698334500 +0000 +@@ -0,0 +1,8 @@ ++# name: Reloc against IFUNC symbol in NOTE section ++# ld: -shared ++# nm: -p ++ ++# We do not actually care about the notes at the moment. ++# The purpose of this test is to make sure that the link completes successfully. ++#pass ++ diff --git a/SOURCES/binutils-improved-note-merging.patch b/SOURCES/binutils-improved-note-merging.patch new file mode 100644 index 0000000..ec3bee2 --- /dev/null +++ b/SOURCES/binutils-improved-note-merging.patch @@ -0,0 +1,2084 @@ +diff -rupN binutils.orig/binutils/objcopy.c binutils-2.30/binutils/objcopy.c +--- binutils.orig/binutils/objcopy.c 2019-10-28 17:08:43.352324932 +0000 ++++ binutils-2.30/binutils/objcopy.c 2019-10-28 17:20:26.378052081 +0000 +@@ -97,8 +97,14 @@ static int deterministic = -1; /* Enabl + static int status = 0; /* Exit status. */ + + static bfd_boolean merge_notes = FALSE; /* Merge note sections. */ +-static bfd_byte * merged_notes = NULL; /* Contents on note section undergoing a merge. */ +-static bfd_size_type merged_size = 0; /* New, smaller size of the merged note section. */ ++ ++typedef struct merged_note_section ++{ ++ asection * sec; /* The section that is being merged. */ ++ bfd_byte * contents;/* New contents of the section. */ ++ bfd_size_type size; /* New size of the section. */ ++ struct merged_note_section * next; /* Link to next merged note section. */ ++} merged_note_section; + + enum strip_action + { +@@ -1259,7 +1265,7 @@ is_update_section (bfd *abfd ATTRIBUTE_U + } + + static bfd_boolean +-is_merged_note_section (bfd * abfd, asection * sec) ++is_mergeable_note_section (bfd * abfd, asection * sec) + { + if (merge_notes + && bfd_get_flavour (abfd) == bfd_target_elf_flavour +@@ -1268,9 +1274,9 @@ is_merged_note_section (bfd * abfd, asec + We should add support for more note types. */ + && ((elf_section_data (sec)->this_hdr.sh_flags & SHF_GNU_BUILD_NOTE) != 0 + /* Old versions of GAS (prior to 2.27) could not set the section +- flags to OS-specific values, so we also accept sections with the +- expected name. */ +- || (strcmp (sec->name, GNU_BUILD_ATTRS_SECTION_NAME) == 0))) ++ flags to OS-specific values, so we also accept sections that ++ start with the expected name. */ ++ || (CONST_STRNEQ (sec->name, GNU_BUILD_ATTRS_SECTION_NAME)))) + return TRUE; + + return FALSE; +@@ -1893,56 +1899,81 @@ copy_unknown_object (bfd *ibfd, bfd *obf + return TRUE; + } + +-/* Returns the number of bytes needed to store VAL. */ +- +-static inline unsigned int +-num_bytes (unsigned long val) +-{ +- unsigned int count = 0; +- +- /* FIXME: There must be a faster way to do this. */ +- while (val) +- { +- count ++; +- val >>= 8; +- } +- return count; +-} +- + typedef struct objcopy_internal_note + { + Elf_Internal_Note note; ++ unsigned long padded_namesz; + bfd_vma start; + bfd_vma end; +- bfd_boolean modified; + } objcopy_internal_note; + +-/* Returns TRUE if a gap does, or could, exist between the address range +- covered by PNOTE1 and PNOTE2. */ ++#define DEBUG_MERGE 0 ++ ++#if DEBUG_MERGE ++#define merge_debug(format, ...) fprintf (stderr, format, ## __VA_ARGS__) ++#else ++#define merge_debug(format, ...) ++#endif ++ ++/* Returns TRUE iff PNOTE1 overlaps or adjoins PNOTE2. */ + + static bfd_boolean +-gap_exists (objcopy_internal_note * pnote1, +- objcopy_internal_note * pnote2) ++overlaps_or_adjoins (objcopy_internal_note * pnote1, ++ objcopy_internal_note * pnote2) + { +- /* Without range end notes, we assume that a gap might exist. */ +- if (pnote1->end == 0 || pnote2->end == 0) ++ if (pnote1->end < pnote2->start) ++ /* FIXME: Alignment of 16 bytes taken from x86_64 binaries. ++ Really we should extract the alignment of the section ++ covered by the notes. */ ++ return BFD_ALIGN (pnote1->end, 16) < pnote2->start; ++ ++ if (pnote2->end < pnote2->start) ++ return BFD_ALIGN (pnote2->end, 16) < pnote1->start; ++ ++ if (pnote1->end < pnote2->end) + return TRUE; + +- /* FIXME: Alignment of 16 bytes taken from x86_64 binaries. +- Really we should extract the alignment of the section covered by the notes. */ +- return BFD_ALIGN (pnote1->end, 16) < pnote2->start; ++ if (pnote2->end < pnote1->end) ++ return TRUE; ++ ++ return FALSE; ++} ++ ++/* Returns TRUE iff NEEDLE is fully contained by HAYSTACK. */ ++ ++static bfd_boolean ++contained_by (objcopy_internal_note * needle, ++ objcopy_internal_note * haystack) ++{ ++ return needle->start >= haystack->start && needle->end <= haystack->end; + } + + static bfd_boolean + is_open_note (objcopy_internal_note * pnote) + { +- return (pnote->note.type == NT_GNU_BUILD_ATTRIBUTE_OPEN); ++ return pnote->note.type == NT_GNU_BUILD_ATTRIBUTE_OPEN; + } + + static bfd_boolean + is_func_note (objcopy_internal_note * pnote) + { +- return (pnote->note.type == NT_GNU_BUILD_ATTRIBUTE_FUNC); ++ return pnote->note.type == NT_GNU_BUILD_ATTRIBUTE_FUNC; ++} ++ ++static bfd_boolean ++is_deleted_note (objcopy_internal_note * pnote) ++{ ++ return pnote->note.type == 0; ++} ++ ++static bfd_boolean ++is_version_note (objcopy_internal_note * pnote) ++{ ++ return (pnote->note.namesz > 4 ++ && pnote->note.namedata[0] == 'G' ++ && pnote->note.namedata[1] == 'A' ++ && pnote->note.namedata[2] == '$' ++ && pnote->note.namedata[3] == GNU_BUILD_ATTRIBUTE_VERSION); + } + + static bfd_boolean +@@ -1955,11 +1986,97 @@ is_64bit (bfd * abfd) + return elf_elfheader (abfd)->e_ident[EI_CLASS] == ELFCLASS64; + } + ++/* This sorting function is used to get the notes into an order ++ that makes merging easy. */ ++ ++static int ++compare_gnu_build_notes (const void * data1, const void * data2) ++{ ++ objcopy_internal_note * pnote1 = (objcopy_internal_note *) data1; ++ objcopy_internal_note * pnote2 = (objcopy_internal_note *) data2; ++ ++ /* Sort notes based upon the attribute they record. */ ++ int cmp = memcmp (pnote1->note.namedata + 3, ++ pnote2->note.namedata + 3, ++ pnote1->note.namesz < pnote2->note.namesz ? ++ pnote1->note.namesz - 3 : pnote2->note.namesz - 3); ++ if (cmp) ++ return cmp; ++ ++ if (pnote1->end < pnote2->start) ++ return -1; ++ if (pnote1->start > pnote2->end) ++ return 1; ++ ++ /* Overlaps - we should merge the two ranges. */ ++ if (pnote1->start < pnote2->start) ++ return -1; ++ if (pnote1->end > pnote2->end) ++ return 1; ++ ++ /* Put OPEN notes before function notes. */ ++ if (is_open_note (pnote1) && ! is_open_note (pnote2)) ++ return -1; ++ if (! is_open_note (pnote1) && is_open_note (pnote2)) ++ return 1; ++ ++ return 0; ++} ++ ++/* This sorting function is used to get the notes into an order ++ that makes eliminating address ranges easier. */ ++ ++static int ++sort_gnu_build_notes (const void * data1, const void * data2) ++{ ++ objcopy_internal_note * pnote1 = (objcopy_internal_note *) data1; ++ objcopy_internal_note * pnote2 = (objcopy_internal_note *) data2; ++ ++ if (pnote1->note.type != pnote2->note.type) ++ { ++ /* Move deleted notes to the end. */ ++ if (is_deleted_note (pnote1)) /* 1: OFD 2: OFD */ ++ return 1; ++ ++ /* Move OPEN notes to the start. */ ++ if (is_open_note (pnote1)) /* 1: OF 2: OFD */ ++ return -1; ++ ++ if (is_deleted_note (pnote2)) /* 1: F 2: O D */ ++ return 1; ++ ++ return 1; /* 1: F 2: O */ ++ } ++ ++ /* Sort by starting address. */ ++ if (pnote1->start < pnote2->start) ++ return -1; ++ if (pnote1->start > pnote2->start) ++ return 1; ++ ++ /* Then by end address (bigger range first). */ ++ if (pnote1->end > pnote2->end) ++ return -1; ++ if (pnote1->end < pnote2->end) ++ return 1; ++ ++ /* Then by attribute type. */ ++ if (pnote1->note.namesz > 4 ++ && pnote2->note.namesz > 4 ++ && pnote1->note.namedata[3] != pnote2->note.namedata[3]) ++ return pnote1->note.namedata[3] - pnote2->note.namedata[3]; ++ ++ return 0; ++} ++ + /* Merge the notes on SEC, removing redundant entries. + Returns the new, smaller size of the section upon success. */ + + static bfd_size_type +-merge_gnu_build_notes (bfd * abfd, asection * sec, bfd_size_type size, bfd_byte * contents) ++merge_gnu_build_notes (bfd * abfd, ++ asection * sec, ++ bfd_size_type size, ++ bfd_byte * contents) + { + objcopy_internal_note * pnotes_end; + objcopy_internal_note * pnotes = NULL; +@@ -1968,18 +2085,14 @@ merge_gnu_build_notes (bfd * abfd, asect + unsigned version_1_seen = 0; + unsigned version_2_seen = 0; + unsigned version_3_seen = 0; +- bfd_boolean duplicate_found = FALSE; + const char * err = NULL; + bfd_byte * in = contents; +- int attribute_type_byte; +- int val_start; + unsigned long previous_func_start = 0; + unsigned long previous_open_start = 0; + unsigned long previous_func_end = 0; + unsigned long previous_open_end = 0; + long relsize; + +- + relsize = bfd_get_reloc_upper_bound (abfd, sec); + if (relsize > 0) + { +@@ -1992,19 +2105,33 @@ merge_gnu_build_notes (bfd * abfd, asect + relcount = bfd_canonicalize_reloc (abfd, sec, relpp, isympp); + free (relpp); + if (relcount != 0) +- goto done; ++ { ++ if (! is_strip) ++ non_fatal (_("%s[%s]: Cannot merge - there are relocations against this section"), ++ bfd_get_filename (abfd), bfd_section_name (abfd, sec)); ++ goto done; ++ } + } + + /* Make a copy of the notes and convert to our internal format. +- Minimum size of a note is 12 bytes. */ +- pnote = pnotes = (objcopy_internal_note *) xcalloc ((size / 12), sizeof (* pnote)); ++ Minimum size of a note is 12 bytes. Also locate the version ++ notes and check them. */ ++ pnote = pnotes = (objcopy_internal_note *) ++ xcalloc ((size / 12), sizeof (* pnote)); + while (remain >= 12) + { + bfd_vma start, end; + +- pnote->note.namesz = (bfd_get_32 (abfd, in ) + 3) & ~3; +- pnote->note.descsz = (bfd_get_32 (abfd, in + 4) + 3) & ~3; +- pnote->note.type = bfd_get_32 (abfd, in + 8); ++ pnote->note.namesz = bfd_get_32 (abfd, in); ++ pnote->note.descsz = bfd_get_32 (abfd, in + 4); ++ pnote->note.type = bfd_get_32 (abfd, in + 8); ++ pnote->padded_namesz = (pnote->note.namesz + 3) & ~3; ++ ++ if (((pnote->note.descsz + 3) & ~3) != pnote->note.descsz) ++ { ++ err = _("corrupt GNU build attribute note: description size not a factor of 4"); ++ goto done; ++ } + + if (pnote->note.type != NT_GNU_BUILD_ATTRIBUTE_OPEN + && pnote->note.type != NT_GNU_BUILD_ATTRIBUTE_FUNC) +@@ -2013,7 +2140,7 @@ merge_gnu_build_notes (bfd * abfd, asect + goto done; + } + +- if (pnote->note.namesz + pnote->note.descsz + 12 > remain) ++ if (pnote->padded_namesz + pnote->note.descsz + 12 > remain) + { + err = _("corrupt GNU build attribute note: note too big"); + goto done; +@@ -2026,21 +2153,17 @@ merge_gnu_build_notes (bfd * abfd, asect + } + + pnote->note.namedata = (char *)(in + 12); +- pnote->note.descdata = (char *)(in + 12 + pnote->note.namesz); ++ pnote->note.descdata = (char *)(in + 12 + pnote->padded_namesz); + +- remain -= 12 + pnote->note.namesz + pnote->note.descsz; +- in += 12 + pnote->note.namesz + pnote->note.descsz; ++ remain -= 12 + pnote->padded_namesz + pnote->note.descsz; ++ in += 12 + pnote->padded_namesz + pnote->note.descsz; + + if (pnote->note.namesz > 2 + && pnote->note.namedata[0] == '$' + && pnote->note.namedata[1] == GNU_BUILD_ATTRIBUTE_VERSION + && pnote->note.namedata[2] == '1') + ++ version_1_seen; +- else if (pnote->note.namesz > 4 +- && pnote->note.namedata[0] == 'G' +- && pnote->note.namedata[1] == 'A' +- && pnote->note.namedata[2] == '$' +- && pnote->note.namedata[3] == GNU_BUILD_ATTRIBUTE_VERSION) ++ else if (is_version_note (pnote)) + { + if (pnote->note.namedata[4] == '2') + ++ version_2_seen; +@@ -2146,11 +2269,18 @@ merge_gnu_build_notes (bfd * abfd, asect + + if (version_1_seen == 0 && version_2_seen == 0 && version_3_seen == 0) + { ++#if 0 + err = _("bad GNU build attribute notes: no known versions detected"); + goto done; ++#else ++ /* This happens with glibc. No idea why. */ ++ non_fatal (_("%s[%s]: Warning: version note missing - assuming version 3"), ++ bfd_get_filename (abfd), bfd_section_name (abfd, sec)); ++ version_3_seen = 2; ++#endif + } + +- if ((version_1_seen > 0 && version_2_seen > 0) ++ if ( (version_1_seen > 0 && version_2_seen > 0) + || (version_1_seen > 0 && version_3_seen > 0) + || (version_2_seen > 0 && version_3_seen > 0)) + { +@@ -2158,271 +2288,215 @@ merge_gnu_build_notes (bfd * abfd, asect + goto done; + } + +- /* Merging is only needed if there is more than one version note... */ +- if (version_1_seen == 1 || version_2_seen == 1 || version_3_seen == 1) +- goto done; +- +- attribute_type_byte = version_1_seen ? 1 : 3; +- val_start = attribute_type_byte + 1; +- +- /* The first note should be the first version note. */ +- if (pnotes[0].note.namedata[attribute_type_byte] != GNU_BUILD_ATTRIBUTE_VERSION) ++ /* We are now only supporting the merging v3+ notes ++ - it makes things much simpler. */ ++ if (version_3_seen == 0) + { +- err = _("bad GNU build attribute notes: first note not version note"); ++ merge_debug ("%s: skipping merge - not using v3 notes", bfd_section_name (sec)); + goto done; + } + ++ merge_debug ("Merging section %s which contains %ld notes\n", ++ sec->name, pnotes_end - pnotes); ++ ++ /* Sort the notes. */ ++ qsort (pnotes, pnotes_end - pnotes, sizeof (* pnotes), ++ compare_gnu_build_notes); ++ ++#if DEBUG_MERGE ++ merge_debug ("Results of initial sort:\n"); ++ for (pnote = pnotes; pnote < pnotes_end; pnote ++) ++ merge_debug ("offset %#08lx range %#08lx..%#08lx type %ld attribute %d namesz %ld\n", ++ (pnote->note.namedata - (char *) contents) - 12, ++ pnote->start, pnote->end, ++ pnote->note.type, ++ pnote->note.namedata[3], ++ pnote->note.namesz ++ ); ++#endif ++ + /* Now merge the notes. The rules are: +- 1. Preserve the ordering of the notes. +- 2. Preserve any NT_GNU_BUILD_ATTRIBUTE_FUNC notes. +- 3. Eliminate any NT_GNU_BUILD_ATTRIBUTE_OPEN notes that have the same +- full name field as the immediately preceeding note with the same type +- of name and whose address ranges coincide. +- IE - if there are gaps in the coverage of the notes, then these gaps +- must be preserved. +- 4. Combine the numeric value of any NT_GNU_BUILD_ATTRIBUTE_OPEN notes +- of type GNU_BUILD_ATTRIBUTE_STACK_SIZE. +- 5. If an NT_GNU_BUILD_ATTRIBUTE_OPEN note is going to be preserved and +- its description field is empty then the nearest preceeding OPEN note +- with a non-empty description field must also be preserved *OR* the +- description field of the note must be changed to contain the starting +- address to which it refers. +- 6. Notes with the same start and end address can be deleted. */ ++ 1. If a note has a zero range, it can be eliminated. ++ 2. If two notes have the same namedata then: ++ 2a. If one note's range is fully covered by the other note ++ then it can be deleted. ++ 2b. If one note's range partially overlaps or adjoins the ++ other note then if they are both of the same type (open ++ or func) then they can be merged and one deleted. If ++ they are of different types then they cannot be merged. */ + for (pnote = pnotes + 1; pnote < pnotes_end; pnote ++) + { +- int note_type; +- objcopy_internal_note * back; +- objcopy_internal_note * prev_open_with_range = NULL; ++ /* Skip already deleted notes. ++ FIXME: Can this happen ? We are scanning forwards and ++ deleting backwards after all. */ ++ if (is_deleted_note (pnote)) ++ continue; + +- /* Rule 6 - delete 0-range notes. */ ++ /* Rule 1 - delete 0-range notes. */ + if (pnote->start == pnote->end) + { +- duplicate_found = TRUE; ++ merge_debug ("Delete note at offset %#08lx - empty range\n", ++ (pnote->note.namedata - (char *) contents) - 12); + pnote->note.type = 0; + continue; + } + +- /* Rule 2 - preserve function notes. */ +- if (! is_open_note (pnote)) +- { +- int iter; +- +- /* Check to see if there is an identical previous function note. +- This can happen with overlays for example. */ +- for (iter = 0, back = pnote -1; back >= pnotes; back --) +- { +- if (back->start == pnote->start +- && back->end == pnote->end +- && back->note.namesz == pnote->note.namesz +- && memcmp (back->note.namedata, pnote->note.namedata, pnote->note.namesz) == 0) +- { +- duplicate_found = TRUE; +- pnote->note.type = 0; +- break; +- } +- +- /* Don't scan too far back however. */ +- if (iter ++ > 16) +- break; +- } +- continue; +- } +- +- note_type = pnote->note.namedata[attribute_type_byte]; +- +- /* Scan backwards from pnote, looking for duplicates. +- Clear the type field of any found - but do not delete them just yet. */ +- for (back = pnote - 1; back >= pnotes; back --) +- { +- int back_type = back->note.namedata[attribute_type_byte]; +- +- /* If this is the first open note with an address +- range that we have encountered then record it. */ +- if (prev_open_with_range == NULL +- && back->note.descsz > 0 +- && ! is_func_note (back)) +- prev_open_with_range = back; +- +- if (! is_open_note (back)) +- continue; ++ int iter; ++ objcopy_internal_note * back; + +- /* If the two notes are different then keep on searching. */ +- if (back_type != note_type) ++ /* Rule 2: Check to see if there is an identical previous note. */ ++ for (iter = 0, back = pnote - 1; back >= pnotes; back --) ++ { ++ if (is_deleted_note (back)) + continue; + +- /* Rule 4 - combine stack size notes. */ +- if (back_type == GNU_BUILD_ATTRIBUTE_STACK_SIZE) ++ /* Our sorting function should have placed all identically ++ attributed notes together, so if we see a note of a different ++ attribute type stop searching. */ ++ if (back->note.namesz != pnote->note.namesz ++ || memcmp (back->note.namedata, ++ pnote->note.namedata, pnote->note.namesz) != 0) ++ break; ++ ++ if (back->start == pnote->start ++ && back->end == pnote->end) + { +- unsigned char * name; +- unsigned long note_val; +- unsigned long back_val; +- unsigned int shift; +- unsigned int bytes; +- unsigned long byte; +- +- for (shift = 0, note_val = 0, +- bytes = pnote->note.namesz - val_start, +- name = (unsigned char *) pnote->note.namedata + val_start; +- bytes--;) +- { +- byte = (* name ++) & 0xff; +- note_val |= byte << shift; +- shift += 8; +- } +- +- for (shift = 0, back_val = 0, +- bytes = back->note.namesz - val_start, +- name = (unsigned char *) back->note.namedata + val_start; +- bytes--;) +- { +- byte = (* name ++) & 0xff; +- back_val |= byte << shift; +- shift += 8; +- } +- +- back_val += note_val; +- if (num_bytes (back_val) >= back->note.namesz - val_start) +- { +- /* We have a problem - the new value requires more bytes of +- storage in the name field than are available. Currently +- we have no way of fixing this, so we just preserve both +- notes. */ +- continue; +- } +- +- /* Write the new val into back. */ +- name = (unsigned char *) back->note.namedata + val_start; +- while (name < (unsigned char *) back->note.namedata +- + back->note.namesz) +- { +- byte = back_val & 0xff; +- * name ++ = byte; +- if (back_val == 0) +- break; +- back_val >>= 8; +- } +- +- duplicate_found = TRUE; ++ merge_debug ("Delete note at offset %#08lx - duplicate of note at offset %#08lx\n", ++ (pnote->note.namedata - (char *) contents) - 12, ++ (back->note.namedata - (char *) contents) - 12); + pnote->note.type = 0; + break; + } + +- /* Rule 3 - combine identical open notes. */ +- if (back->note.namesz == pnote->note.namesz +- && memcmp (back->note.namedata, +- pnote->note.namedata, back->note.namesz) == 0 +- && ! gap_exists (back, pnote)) ++ /* Rule 2a. */ ++ if (contained_by (pnote, back)) + { +- duplicate_found = TRUE; ++ merge_debug ("Delete note at offset %#08lx - fully contained by note at %#08lx\n", ++ (pnote->note.namedata - (char *) contents) - 12, ++ (back->note.namedata - (char *) contents) - 12); + pnote->note.type = 0; ++ break; ++ } + +- if (pnote->end > back->end) +- back->end = pnote->end; ++#if DEBUG_MERGE ++ /* This should not happen as we have sorted the ++ notes with earlier starting addresses first. */ ++ if (contained_by (back, pnote)) ++ merge_debug ("ERROR: UNEXPECTED CONTAINMENT\n"); ++#endif ++ ++ /* Rule 2b. */ ++ if (overlaps_or_adjoins (back, pnote) ++ && is_func_note (back) == is_func_note (pnote)) ++ { ++ merge_debug ("Delete note at offset %#08lx - merge into note at %#08lx\n", ++ (pnote->note.namedata - (char *) contents) - 12, ++ (back->note.namedata - (char *) contents) - 12); + +- if (version_3_seen) +- back->modified = TRUE; ++ back->end = back->end > pnote->end ? back->end : pnote->end; ++ back->start = back->start < pnote->start ? back->start : pnote->start; ++ pnote->note.type = 0; + break; + } + +- /* Rule 5 - Since we are keeping this note we must check to see +- if its description refers back to an earlier OPEN version +- note that has been scheduled for deletion. If so then we +- must make sure that version note is also preserved. */ +- if (version_3_seen) +- { +- /* As of version 3 we can just +- move the range into the note. */ +- pnote->modified = TRUE; +- pnote->note.type = NT_GNU_BUILD_ATTRIBUTE_FUNC; +- back->modified = TRUE; +- back->note.type = NT_GNU_BUILD_ATTRIBUTE_FUNC; +- } +- else ++ /* Don't scan too far back however. */ ++ if (iter ++ > 16) + { +- if (pnote->note.descsz == 0 +- && prev_open_with_range != NULL +- && prev_open_with_range->note.type == 0) +- prev_open_with_range->note.type = NT_GNU_BUILD_ATTRIBUTE_OPEN; ++ /* FIXME: Not sure if this can ever be triggered. */ ++ merge_debug ("ITERATION LIMIT REACHED\n"); ++ break; + } +- +- /* We have found a similar attribute but the details do not match. +- Stop searching backwards. */ +- break; + } +- } +- +- if (duplicate_found) +- { +- bfd_byte * new_contents; +- bfd_byte * old; +- bfd_byte * new; +- bfd_size_type new_size; +- bfd_vma prev_start = 0; +- bfd_vma prev_end = 0; +- +- /* Eliminate the duplicates. */ +- new = new_contents = xmalloc (size); +- for (pnote = pnotes, old = contents; +- pnote < pnotes_end; +- pnote ++) +- { +- bfd_size_type note_size = 12 + pnote->note.namesz + pnote->note.descsz; +- +- if (pnote->note.type != 0) ++#if DEBUG_MERGE ++ if (! is_deleted_note (pnote)) ++ merge_debug ("Unable to do anything with note at %#08lx\n", ++ (pnote->note.namedata - (char *) contents) - 12); ++#endif ++ } ++ ++ /* Resort the notes. */ ++ merge_debug ("Final sorting of notes\n"); ++ qsort (pnotes, pnotes_end - pnotes, sizeof (* pnotes), sort_gnu_build_notes); ++ ++ /* Reconstruct the ELF notes. */ ++ bfd_byte * new_contents; ++ bfd_byte * old; ++ bfd_byte * new; ++ bfd_size_type new_size; ++ bfd_vma prev_start = 0; ++ bfd_vma prev_end = 0; ++ ++ new = new_contents = xmalloc (size); ++ for (pnote = pnotes, old = contents; ++ pnote < pnotes_end; ++ pnote ++) ++ { ++ bfd_size_type note_size = 12 + pnote->padded_namesz + pnote->note.descsz; ++ ++ if (! is_deleted_note (pnote)) ++ { ++ /* Create the note, potentially using the ++ address range of the previous note. */ ++ if (pnote->start == prev_start && pnote->end == prev_end) ++ { ++ bfd_put_32 (abfd, pnote->note.namesz, new); ++ bfd_put_32 (abfd, 0, new + 4); ++ bfd_put_32 (abfd, pnote->note.type, new + 8); ++ new += 12; ++ memcpy (new, pnote->note.namedata, pnote->note.namesz); ++ if (pnote->note.namesz < pnote->padded_namesz) ++ memset (new + pnote->note.namesz, 0, pnote->padded_namesz - pnote->note.namesz); ++ new += pnote->padded_namesz; ++ } ++ else + { +- if (pnote->modified) ++ bfd_put_32 (abfd, pnote->note.namesz, new); ++ bfd_put_32 (abfd, is_64bit (abfd) ? 16 : 8, new + 4); ++ bfd_put_32 (abfd, pnote->note.type, new + 8); ++ new += 12; ++ memcpy (new, pnote->note.namedata, pnote->note.namesz); ++ if (pnote->note.namesz < pnote->padded_namesz) ++ memset (new + pnote->note.namesz, 0, pnote->padded_namesz - pnote->note.namesz); ++ new += pnote->padded_namesz; ++ if (is_64bit (abfd)) + { +- /* If the note has been modified then we must copy it by +- hand, potentially adding in a new description field. */ +- if (pnote->start == prev_start && pnote->end == prev_end) +- { +- bfd_put_32 (abfd, pnote->note.namesz, new); +- bfd_put_32 (abfd, 0, new + 4); +- bfd_put_32 (abfd, pnote->note.type, new + 8); +- new += 12; +- memcpy (new, pnote->note.namedata, pnote->note.namesz); +- new += pnote->note.namesz; +- } +- else +- { +- bfd_put_32 (abfd, pnote->note.namesz, new); +- bfd_put_32 (abfd, is_64bit (abfd) ? 16 : 8, new + 4); +- bfd_put_32 (abfd, pnote->note.type, new + 8); +- new += 12; +- memcpy (new, pnote->note.namedata, pnote->note.namesz); +- new += pnote->note.namesz; +- if (is_64bit (abfd)) +- { +- bfd_put_64 (abfd, pnote->start, new); +- bfd_put_64 (abfd, pnote->end, new + 8); +- new += 16; +- } +- else +- { +- bfd_put_32 (abfd, pnote->start, new); +- bfd_put_32 (abfd, pnote->end, new + 4); +- new += 8; +- } +- } ++ bfd_put_64 (abfd, pnote->start, new); ++ bfd_put_64 (abfd, pnote->end, new + 8); ++ new += 16; + } + else + { +- memcpy (new, old, note_size); +- new += note_size; ++ bfd_put_32 (abfd, pnote->start, new); ++ bfd_put_32 (abfd, pnote->end, new + 4); ++ new += 8; + } ++ + prev_start = pnote->start; + prev_end = pnote->end; + } +- +- old += note_size; + } + +- new_size = new - new_contents; +- memcpy (contents, new_contents, new_size); +- size = new_size; +- free (new_contents); ++ old += note_size; + } + ++#if DEBUG_MERGE ++ merge_debug ("Results of merge:\n"); ++ for (pnote = pnotes; pnote < pnotes_end; pnote ++) ++ if (! is_deleted_note (pnote)) ++ merge_debug ("offset %#08lx range %#08lx..%#08lx type %ld attribute %d namesz %ld\n", ++ (pnote->note.namedata - (char *) contents) - 12, ++ pnote->start, pnote->end, ++ pnote->note.type, ++ pnote->note.namedata[3], ++ pnote->note.namesz ++ ); ++#endif ++ ++ new_size = new - new_contents; ++ memcpy (contents, new_contents, new_size); ++ size = new_size; ++ free (new_contents); ++ + done: + if (err) + { +@@ -2761,52 +2835,61 @@ copy_object (bfd *ibfd, bfd *obfd, const + } + } + ++ merged_note_section * merged_note_sections = NULL; + if (merge_notes) + { + /* This palaver is necessary because we must set the output + section size first, before its contents are ready. */ +- osec = bfd_get_section_by_name (ibfd, GNU_BUILD_ATTRS_SECTION_NAME); +- if (osec && is_merged_note_section (ibfd, osec)) ++ for (osec = ibfd->sections; osec != NULL; osec = osec->next) + { +- bfd_size_type size; +- +- size = bfd_get_section_size (osec); ++ if (! is_mergeable_note_section (ibfd, osec)) ++ continue; ++ ++ bfd_size_type size = bfd_section_size (obfd, osec); + if (size == 0) + { +- bfd_nonfatal_message (NULL, ibfd, osec, _("warning: note section is empty")); +- merge_notes = FALSE; ++ bfd_nonfatal_message (NULL, ibfd, osec, ++ _("warning: note section is empty")); ++ continue; + } +- else if (! bfd_get_full_section_contents (ibfd, osec, & merged_notes)) ++ ++ merged_note_section * merged = xmalloc (sizeof * merged); ++ merged->contents = NULL; ++ if (! bfd_get_full_section_contents (ibfd, osec, & merged->contents)) + { +- bfd_nonfatal_message (NULL, ibfd, osec, _("warning: could not load note section")); +- free (merged_notes); +- merged_notes = NULL; +- merge_notes = FALSE; ++ bfd_nonfatal_message (NULL, ibfd, osec, ++ _("warning: could not load note section")); ++ free (merged->contents); ++ free (merged); ++ continue; + } +- else ++ ++ merged->size = merge_gnu_build_notes (ibfd, osec, size, ++ merged->contents); ++ if (merged->size == size) ++ { ++ /* Merging achieves nothing. */ ++ merge_debug ("Merge of section %s achieved nothing - skipping\n", ++ bfd_section_name (obfd, osec)); ++ free (merged->contents); ++ free (merged); ++ continue; ++ } ++ ++ if (osec->output_section == NULL ++ || !bfd_set_section_size (obfd, osec->output_section, merged->size)) + { +- merged_size = merge_gnu_build_notes (ibfd, osec, size, merged_notes); +- if (merged_size == size) +- { +- /* Merging achieves nothing. */ +- free (merged_notes); +- merged_notes = NULL; +- merge_notes = FALSE; +- merged_size = 0; +- } +- else +- { +- if (osec->output_section == NULL +- || ! bfd_set_section_size (obfd, osec->output_section, merged_size)) +- { +- bfd_nonfatal_message (NULL, obfd, osec, _("warning: failed to set merged notes size")); +- free (merged_notes); +- merged_notes = NULL; +- merge_notes = FALSE; +- merged_size = 0; +- } +- } ++ bfd_nonfatal_message (NULL, obfd, osec, ++ _("warning: failed to set merged notes size")); ++ free (merged->contents); ++ free (merged); ++ continue; + } ++ ++ /* Add section to list of merged sections. */ ++ merged->sec = osec; ++ merged->next = merged_note_sections; ++ merged_note_sections = merged; + } + } + +@@ -3134,25 +3217,72 @@ copy_object (bfd *ibfd, bfd *obfd, const + } + } + +- if (merge_notes) ++ if (merged_note_sections != NULL) + { +- osec = bfd_get_section_by_name (obfd, GNU_BUILD_ATTRS_SECTION_NAME); +- if (osec && is_merged_note_section (obfd, osec)) ++ merged_note_section * merged = NULL; ++ ++ for (osec = obfd->sections; osec != NULL; osec = osec->next) + { +- if (! bfd_set_section_contents (obfd, osec, merged_notes, 0, merged_size)) ++ if (! is_mergeable_note_section (obfd, osec)) ++ continue; ++ ++ if (merged == NULL) ++ merged = merged_note_sections; ++ ++ /* It is likely that output sections are in the same order ++ as the input sections, but do not assume that this is ++ the case. */ ++ if (strcmp (bfd_section_name (obfd, merged->sec), ++ bfd_section_name (obfd, osec)) != 0) ++ { ++ for (merged = merged_note_sections; ++ merged != NULL; ++ merged = merged->next) ++ if (strcmp (bfd_section_name (obfd, merged->sec), ++ bfd_section_name (obfd, osec)) == 0) ++ break; ++ ++ if (merged == NULL) ++ { ++ bfd_nonfatal_message ++ (NULL, obfd, osec, ++ _("error: failed to copy merged notes into output")); ++ continue; ++ } ++ } ++ ++ if (! is_mergeable_note_section (obfd, osec)) + { +- bfd_nonfatal_message (NULL, obfd, osec, _("error: failed to copy merged notes into output")); +- /* There is a potential resource leak here, but it is not important. */ +- /* coverity[leaked_storage: FALSE] */ ++ bfd_nonfatal_message ++ (NULL, obfd, osec, ++ _("error: failed to copy merged notes into output")); ++ continue; ++ } ++ ++ if (! bfd_set_section_contents (obfd, osec, merged->contents, 0, ++ merged->size)) ++ { ++ bfd_nonfatal_message ++ (NULL, obfd, osec, ++ _("error: failed to copy merged notes into output")); + return FALSE; + } ++ ++ merged = merged->next; ++ } ++ ++ /* Free the memory. */ ++ merged_note_section * next; ++ for (merged = merged_note_sections; merged != NULL; merged = next) ++ { ++ next = merged->next; ++ free (merged->contents); ++ free (merged); + } +- else if (! is_strip) +- bfd_nonfatal_message (NULL, obfd, osec, _("could not find any mergeable note sections")); +- free (merged_notes); +- merged_notes = NULL; +- merge_notes = FALSE; + } ++ else if (merge_notes && ! is_strip) ++ non_fatal (_("%s: Could not find any mergeable note sections"), ++ bfd_get_filename (ibfd)); + + if (gnu_debuglink_filename != NULL) + { +@@ -3915,7 +4045,7 @@ skip_section (bfd *ibfd, sec_ptr isectio + + /* When merging a note section we skip the copying of the contents, + but not the copying of the relocs associated with the contents. */ +- if (skip_copy && is_merged_note_section (ibfd, isection)) ++ if (skip_copy && is_mergeable_note_section (ibfd, isection)) + return TRUE; + + flags = bfd_get_section_flags (ibfd, isection); +diff -rupN binutils.orig/binutils/testsuite/binutils-all/note-2-32.d binutils-2.30/binutils/testsuite/binutils-all/note-2-32.d +--- binutils.orig/binutils/testsuite/binutils-all/note-2-32.d 2019-10-28 17:08:43.358324887 +0000 ++++ binutils-2.30/binutils/testsuite/binutils-all/note-2-32.d 2019-10-28 17:16:57.804615900 +0000 +@@ -5,13 +5,12 @@ + #source: note-2-32.s + + #... +- Owner Data size Description +-[ ]+\$1[ ]+0x00000004[ ]+OPEN[ ]+Applies to region from 0x100 \(note1.s\) +-[ ]+\$gcc 7.0.1[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 +-[ ]+\+true[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 +-[ ]+\*static[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 +-[ ]+\*0x0[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 +-[ ]+\$1[ ]+0x00000004[ ]+OPEN[ ]+Applies to region from 0x104 \(note2.s\) +-[ ]+!false[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x104 +-[ ]+\*pic[ ]+0x00000004[ ]+func[ ]+Applies to region from 0x104 \(func1\) ++[ ]+Owner[ ]+Data size[ ]+Description ++[ ]+GA\$3p1[ ]+0x00000008[ ]+OPEN[ ]+Applies to region from 0x100 to 0x10b \(note1.s\) ++[ ]+GA\$gcc 7.0.1[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x10b ++[ ]+GA\*0x0[ ]+0x00000008[ ]+OPEN[ ]+Applies to region from 0x100 to 0x108 \(note1.s\) ++[ ]+GA\+true[ ]+0x00000008[ ]+OPEN[ ]+Applies to region from 0x100 to 0x104 \(note1.s\) ++[ ]+GA\*static[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x104 ++[ ]+GA!false[ ]+0x00000008[ ]+OPEN[ ]+Applies to region from 0x104 to 0x108 \(note2.s\) ++[ ]+GA\*pic[ ]+0x00000008[ ]+func[ ]+Applies to region from 0x104 to 0x106 \(func1\) + #... +diff -rupN binutils.orig/binutils/testsuite/binutils-all/note-2-32.s binutils-2.30/binutils/testsuite/binutils-all/note-2-32.s +--- binutils.orig/binutils/testsuite/binutils-all/note-2-32.s 2019-10-28 17:08:43.355324910 +0000 ++++ binutils-2.30/binutils/testsuite/binutils-all/note-2-32.s 2019-10-28 17:09:04.609165478 +0000 +@@ -6,32 +6,37 @@ note1.s: + + .pushsection .gnu.build.attributes, "0x100000", %note + .balign 4 +- .dc.l 4 +- .dc.l 4 ++ .dc.l 8 ++ .dc.l 8 + .dc.l 0x100 +- .asciz "$1" ++ .asciz "GA$3p1" + .dc.l 0x100 ++ .dc.l 0x104 + +- .dc.l 12 ++ .dc.l 14 + .dc.l 0 + .dc.l 0x100 +- .asciz "$gcc 7.0.1" ++ .asciz "GA$gcc 7.0.1" ++ .dc.b 0,0 + +- .dc.l 3 ++ .dc.l 5 + .dc.l 0 + .dc.l 0x100 +- .dc.b 0x2b, 0x2, 0 +- .dc.b 0 ++ .dc.b 0x47, 0x41, 0x2b, 0x2, 0 ++ .dc.b 0,0,0 + +- .dc.l 4 ++ .dc.l 6 + .dc.l 0 + .dc.l 0x100 +- .dc.b 0x2a, 0x7, 0, 0 ++ .dc.b 0x47, 0x41, 0x2a, 0x7, 0, 0 ++ .dc.b 0,0 + +- .dc.l 4 ++ .dc.l 6 + .dc.l 0 + .dc.l 0x100 +- .dc.b 0x2a, 0x6, 0, 0 ++ .dc.b 0x47, 0x41, 0x2a, 0x6, 0, 0 ++ .dc.b 0,0 ++ + .popsection + + +@@ -42,33 +47,38 @@ func1: + .dc.l 0x100 + + .pushsection .gnu.build.attributes, "0x100000", %note +- .dc.l 4 +- .dc.l 4 ++ .dc.l 8 ++ .dc.l 8 + .dc.l 0x100 +- .asciz "$1" ++ .asciz "GA$3p1" + .dc.l 0x104 +- +- .dc.l 12 ++ .dc.l 0x108 ++ ++ .dc.l 14 + .dc.l 0 + .dc.l 0x100 +- .asciz "$gcc 7.0.1" ++ .asciz "GA$gcc 7.0.1" ++ .dc.b 0,0 + +- .dc.l 3 ++ .dc.l 5 + .dc.l 0 + .dc.l 0x100 +- .dc.b 0x21, 0x2, 0 +- .dc.b 0 ++ .dc.b 0x47, 0x41, 0x21, 0x2, 0 ++ .dc.b 0,0,0 + +- .dc.l 4 +- .dc.l 4 ++ .dc.l 6 ++ .dc.l 8 + .dc.l 0x101 +- .dc.b 0x2a, 0x7, 1, 0 +- .dc.l 0x104 ++ .dc.b 0x47, 0x41, 0x2a, 0x7, 1, 0 ++ .dc.b 0,0 ++ .dc.l 0x104 ++ .dc.l 0x106 + +- .dc.l 4 ++ .dc.l 6 + .dc.l 0 + .dc.l 0x100 +- .dc.b 0x2a, 0x6, 0, 0 ++ .dc.b 0x47, 0x41, 0x2a, 0x6, 0, 0 ++ .dc.b 0,0 + .popsection + + +@@ -77,16 +87,18 @@ note3.s: + .dc.l 0x100 + + .pushsection .gnu.build.attributes, "0x100000", %note +- .dc.l 4 +- .dc.l 4 ++ .dc.l 8 ++ .dc.l 8 + .dc.l 0x100 +- .asciz "$1" ++ .asciz "GA$3p1" + .dc.l 0x108 ++ .dc.l 0x10b + +- .dc.l 12 ++ .dc.l 14 + .dc.l 0 + .dc.l 0x100 +- .asciz "$gcc 7.0.1" ++ .asciz "GA$gcc 7.0.1" ++ .dc.b 0,0 + + .popsection + +diff -rupN binutils.orig/binutils/testsuite/binutils-all/note-2-64.d binutils-2.30/binutils/testsuite/binutils-all/note-2-64.d +--- binutils.orig/binutils/testsuite/binutils-all/note-2-64.d 2019-10-28 17:08:43.356324902 +0000 ++++ binutils-2.30/binutils/testsuite/binutils-all/note-2-64.d 2019-10-28 17:17:05.724556490 +0000 +@@ -3,19 +3,18 @@ + #objcopy: --merge-notes + #name: merge notes section (64-bits) + #source: note-2-64.s +-#not-target: sparc64-*-* ++#not-target: sparc64-*-* + # Internally the Sparc64 backend uses two relocs for every one reloc visible externally. + # Unfortunately the BFD library does not provide a target specific way to delete individual + # relocs, so the note merging feature fails. + + #... +- Owner Data size Description +-[ ]+\$1[ ]+0x00000008[ ]+OPEN[ ]+Applies to region from 0x100 \(note1.s\) +-[ ]+\$gcc 7.0.1[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 +-[ ]+\+true[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 +-[ ]+\*static[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 +-[ ]+\*0x0[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 +-[ ]+\$1[ ]+0x00000008[ ]+OPEN[ ]+Applies to region from 0x104 \(note2.s\) +-[ ]+!false[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x104 +-[ ]+\*pic[ ]+0x00000008[ ]+func[ ]+Applies to region from 0x104 \(func1\) ++[ ]+Owner[ ]+Data size[ ]+Description ++[ ]+GA\$3p1[ ]+0x00000010[ ]+OPEN[ ]+Applies to region from 0x100 to 0x10b \(note1.s\) ++[ ]+GA\$gcc 7.0.1[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x10b ++[ ]+GA\*0x0[ ]+0x00000010[ ]+OPEN[ ]+Applies to region from 0x100 to 0x108 \(note1.s\) ++[ ]+GA\+true[ ]+0x00000010[ ]+OPEN[ ]+Applies to region from 0x100 to 0x104 \(note1.s\) ++[ ]+GA\*static[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x104 ++[ ]+GA!false[ ]+0x00000010[ ]+OPEN[ ]+Applies to region from 0x104 to 0x108 \(note2.s\) ++[ ]+GA\*pic[ ]+0x00000010[ ]+func[ ]+Applies to region from 0x104 to 0x106 \(func1\) + #... +diff -rupN binutils.orig/binutils/testsuite/binutils-all/note-2-64.s binutils-2.30/binutils/testsuite/binutils-all/note-2-64.s +--- binutils.orig/binutils/testsuite/binutils-all/note-2-64.s 2019-10-28 17:08:43.354324917 +0000 ++++ binutils-2.30/binutils/testsuite/binutils-all/note-2-64.s 2019-10-28 17:09:04.609165478 +0000 +@@ -6,32 +6,43 @@ note1.s: + + .pushsection .gnu.build.attributes, "0x100000", %note + .balign 4 +- .dc.l 4 + .dc.l 8 ++ .dc.l 16 + .dc.l 0x100 +- .asciz "$1" ++ .asciz "GA$3p1" + .8byte 0x100 ++ .8byte 0x104 + +- .dc.l 12 ++ .dc.l 14 + .dc.l 0 + .dc.l 0x100 +- .asciz "$gcc 7.0.1" ++ .asciz "GA$gcc 7.0.1" ++ .dc.b 0,0 ++ ++ .dc.l 5 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x2b, 0x2, 0 ++ .dc.b 0,0,0 + +- .dc.l 3 ++ .dc.l 6 + .dc.l 0 + .dc.l 0x100 +- .dc.b 0x2b, 0x2, 0 +- .dc.b 0 ++ .dc.b 0x47, 0x41, 0x2a, 0x7, 0, 0 ++ .dc.b 0,0 + +- .dc.l 4 ++ .dc.l 6 + .dc.l 0 + .dc.l 0x100 +- .dc.b 0x2a, 0x7, 0, 0 ++ .dc.b 0x47, 0x41, 0x2a, 0x6, 0, 0 ++ .dc.b 0,0 + +- .dc.l 4 ++ .dc.l 6 + .dc.l 0 + .dc.l 0x100 +- .dc.b 0x2a, 0x6, 0, 0 ++ .dc.b 0x47, 0x41, 0x2a, 0x7, 0, 0 ++ .dc.b 0,0 ++ + .popsection + + +@@ -43,33 +54,38 @@ func1: + .dc.l 0x100 + + .pushsection .gnu.build.attributes, "0x100000", %note +- .dc.l 4 +- .dc.l 8 ++ .dc.l 8 ++ .dc.l 16 + .dc.l 0x100 +- .asciz "$1" ++ .asciz "GA$3p1" + .8byte 0x104 ++ .8byte 0x108 + +- .dc.l 12 ++ .dc.l 14 + .dc.l 0 + .dc.l 0x100 +- .asciz "$gcc 7.0.1" +- +- .dc.l 3 ++ .asciz "GA$gcc 7.0.1" ++ .dc.b 0,0 ++ ++ .dc.l 5 + .dc.l 0 + .dc.l 0x100 +- .dc.b 0x21, 0x2, 0 +- .dc.b 0 ++ .dc.b 0x47, 0x41, 0x21, 0x2, 0 ++ .dc.b 0,0,7 + +- .dc.l 4 +- .dc.l 8 ++ .dc.l 6 ++ .dc.l 16 + .dc.l 0x101 +- .dc.b 0x2a, 0x7, 1, 0 ++ .dc.b 0x47, 0x41, 0x2a, 0x7, 1, 0 ++ .dc.b 0,0 + .8byte 0x104 ++ .8byte 0x106 + +- .dc.l 4 ++ .dc.l 6 + .dc.l 0 + .dc.l 0x100 +- .dc.b 0x2a, 0x6, 0, 0 ++ .dc.b 0x47, 0x41, 0x2a, 0x6, 0, 0 ++ .dc.b 0,0 + .popsection + + +@@ -78,15 +94,17 @@ note3.s: + .dc.l 0x100 + + .pushsection .gnu.build.attributes, "0x100000", %note +- .dc.l 4 +- .dc.l 8 ++ .dc.l 8 ++ .dc.l 16 + .dc.l 0x100 +- .asciz "$1" ++ .asciz "GA$3p1" + .8byte 0x108 ++ .8byte 0x10b + +- .dc.l 12 ++ .dc.l 14 + .dc.l 0 + .dc.l 0x100 +- .asciz "$gcc 7.0.1" ++ .asciz "GA$gcc 7.0.1" ++ .dc.b 0,0 + + .popsection +diff -rupN binutils.orig/binutils/testsuite/binutils-all/note-3-32.d binutils-2.30/binutils/testsuite/binutils-all/note-3-32.d +--- binutils.orig/binutils/testsuite/binutils-all/note-3-32.d 2019-10-28 17:08:43.356324902 +0000 ++++ binutils-2.30/binutils/testsuite/binutils-all/note-3-32.d 2019-10-28 17:09:04.609165478 +0000 +@@ -7,12 +7,12 @@ + #... + Displaying notes found in: .gnu.build.attributes + [ ]+Owner[ ]+Data size[ ]+Description +-[ ]+GA\$2p1[ ]+0x0000000.[ ]+OPEN[ ]+Applies to region from 0x100 to 0x122 \(note_1.s\) +-[ ]+GA\$gcc 6.3.1 20161221[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x122 +-[ ]+GA\*GOW:0x700[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x122 ++[ ]+GA\$3p1[ ]+0x0000000.[ ]+OPEN[ ]+Applies to region from 0x100 to 0x122 \(note_1.s\) + [ ]+GA\*off[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x122 +-[ ]+GA\*FORTIFY:0xff[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x122 ++[ ]+GA\$gcc 6.3.1 20161221[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x122 ++[ ]+GA\*0x[0-9a-f]+[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x122 + [ ]+GA\*PIC[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x122 + [ ]+GA\!false[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x122 +-[ ]+GA\*0x[0-9a-f]+[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x122 ++[ ]+GA\*FORTIFY:0xff[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x122 ++[ ]+GA\*GOW:0x700[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x122 + #... +diff -rupN binutils.orig/binutils/testsuite/binutils-all/note-3-32.s binutils-2.30/binutils/testsuite/binutils-all/note-3-32.s +--- binutils.orig/binutils/testsuite/binutils-all/note-3-32.s 2019-10-28 17:08:43.354324917 +0000 ++++ binutils-2.30/binutils/testsuite/binutils-all/note-3-32.s 2019-10-28 17:09:04.609165478 +0000 +@@ -9,10 +9,11 @@ note_1.s: + .balign 4 + + .dc.l 8 +- .dc.l 4 ++ .dc.l 8 + .dc.l 0x100 +- .asciz "GA$2p1" +- .dc.l note_1.s ++ .asciz "GA$3p1" ++ .dc.l 0x100 /* note_1.s */ ++ .dc.l 0x122 /* note_1.s end */ + + .dc.l 23 + .dc.l 0 +@@ -55,4 +56,12 @@ note_1.s: + .dc.l 0x100 + .dc.b 0x47, 0x41, 0x2a, 0x6, 0xf2, 0x3, 0x38, 0xee, 0xce, 0xfa, 0x5e, 0x3c, 0 + .dc.b 0, 0, 0 ++ ++ .dc.l 5 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x21, 0x8, 0 ++ .dc.b 0, 0, 0 ++ ++ + .popsection +diff -rupN binutils.orig/binutils/testsuite/binutils-all/note-3-64.d binutils-2.30/binutils/testsuite/binutils-all/note-3-64.d +--- binutils.orig/binutils/testsuite/binutils-all/note-3-64.d 2019-10-28 17:08:43.357324895 +0000 ++++ binutils-2.30/binutils/testsuite/binutils-all/note-3-64.d 2019-10-28 17:09:04.609165478 +0000 +@@ -7,12 +7,12 @@ + #... + Displaying notes found in: .gnu.build.attributes + [ ]+Owner[ ]+Data size[ ]+Description +-[ ]+GA\$2p1[ ]+0x0000000.[ ]+OPEN[ ]+Applies to region from 0x100 to 0x122 \(note_1.s\) +-[ ]+GA\$gcc 6.3.1 20161221[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x122 +-[ ]+GA\*GOW:0x700[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x122 ++[ ]+GA\$3p1[ ]+0x00000010[ ]+OPEN[ ]+Applies to region from 0x100 to 0x122 \(note_1.s\) + [ ]+GA\*off[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x122 +-[ ]+GA\*FORTIFY:0xff[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x122 ++[ ]+GA\$gcc 6.3.1 20161221[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x122 ++[ ]+GA\*0x[0-9a-f]+[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x122 + [ ]+GA\*PIC[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x122 + [ ]+GA\!false[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x122 +-[ ]+GA\*0x[0-9a-f]+[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x122 ++[ ]+GA\*FORTIFY:0xff[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x122 ++[ ]+GA\*GOW:0x700[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x122 + #... +diff -rupN binutils.orig/binutils/testsuite/binutils-all/note-3-64.s binutils-2.30/binutils/testsuite/binutils-all/note-3-64.s +--- binutils.orig/binutils/testsuite/binutils-all/note-3-64.s 2019-10-28 17:08:43.357324895 +0000 ++++ binutils-2.30/binutils/testsuite/binutils-all/note-3-64.s 2019-10-28 17:09:04.609165478 +0000 +@@ -9,10 +9,11 @@ note_1.s: + .balign 4 + + .dc.l 8 +- .dc.l 8 ++ .dc.l 16 + .dc.l 0x100 +- .asciz "GA$2p1" +- .8byte note_1.s ++ .asciz "GA$3p1" ++ .8byte 0x100 /* note_1.s */ ++ .8byte 0x122 /* note_1 end */ + + .dc.l 23 + .dc.l 0 +@@ -55,4 +56,11 @@ note_1.s: + .dc.l 0x100 + .dc.b 0x47, 0x41, 0x2a, 0x6, 0xf2, 0x3, 0x38, 0xee, 0xce, 0xfa, 0x5e, 0x3c, 0 + .dc.b 0, 0, 0 ++ ++ .dc.l 6 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x2a, 0x7, 0x2, 0 ++ .dc.b 0, 0 ++ + .popsection +diff -rupN binutils.orig/binutils/testsuite/binutils-all/note-4-32.d binutils-2.30/binutils/testsuite/binutils-all/note-4-32.d +--- binutils.orig/binutils/testsuite/binutils-all/note-4-32.d 2019-10-28 17:08:43.357324895 +0000 ++++ binutils-2.30/binutils/testsuite/binutils-all/note-4-32.d 2019-10-28 17:17:19.515453041 +0000 +@@ -7,13 +7,13 @@ + #... + Displaying notes found in: .gnu.build.attributes + [ ]+Owner[ ]+Data size[ ]+Description +-[ ]+GA\$3p3[ ]+0x00000008[ ]+OPEN[ ]+Applies to region from 0x100 to 0x110 \(note_4.s\) +-[ ]+GA\$gcc 7.2.1 20170915[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x110 +-[ ]+GA\*GOW:0x700[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x110 +-[ ]+GA\*off[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x110 +-[ ]+GA\*FORTIFY:0xff[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x110 +-[ ]+GA\*PIC[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x110 +-[ ]+GA\!false[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x110 +-[ ]+GA\*0x[0-9a-f]+[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x110 +-[ ]+GA\*strong[ ]+0x00000008[ ]+func[ ]+Applies to region from 0x108 to 0x10c.* ++[ ]+GA\$3p3[ ]+0x00000008[ ]+OPEN[ ]+Applies to region from 0x10. to 0x110 \(note_4.s\) ++[ ]+GA\*off[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x10. to 0x110 ++[ ]+GA\$gcc 7.2.1 20170915[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x10. to 0x110 ++[ ]+GA\*0x[0-9a-f]+[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x10. to 0x110 ++[ ]+GA\*PIC[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x10. to 0x110 ++[ ]+GA\!false[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x10. to 0x110 ++[ ]+GA\*FORTIFY:0xff[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x10. to 0x110 ++[ ]+GA\*GOW:0x700[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x10. to 0x110 ++[ ]+GA\*strong[ ]+0x00000008[ ]+func[ ]+Applies to region from 0x10. to 0x10c.* + #... +diff -rupN binutils.orig/binutils/testsuite/binutils-all/note-4-32.s binutils-2.30/binutils/testsuite/binutils-all/note-4-32.s +--- binutils.orig/binutils/testsuite/binutils-all/note-4-32.s 2019-10-28 17:08:43.355324910 +0000 ++++ binutils-2.30/binutils/testsuite/binutils-all/note-4-32.s 2019-10-28 17:17:23.931419915 +0000 +@@ -1,6 +1,6 @@ + .text + .org 0x100 +-note_4.s: ++ .equiv note_4.s, . + 2 + .dc.l 0 + .dc.l 0 + +@@ -18,8 +18,8 @@ note_4.s_end: + .dc.l 8 + .dc.l 0x100 + .asciz "GA$3p3" +- .dc.l note_4.s +- .dc.l note_4.s_end ++ .dc.l 0x100 /* note_4.s - 2 */ ++ .dc.l 0x110 /* note_4.s_end */ + + .dc.l 23 + .dc.l 0 +@@ -63,12 +63,18 @@ note_4.s_end: + .dc.b 0x47, 0x41, 0x2a, 0x6, 0xf2, 0x3, 0x38, 0xee, 0xce, 0xfa, 0x5e, 0x3c, 0 + .dc.b 0, 0, 0 + ++ .dc.l 5 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x21, 0x8, 0 ++ .dc.b 0, 0, 0 ++ + .dc.l 6 + .dc.l 8 + .dc.l 0x101 + .dc.b 0x47, 0x41, 0x2a, 0x2, 0x3, 0 + .dc.b 0, 0 +- .dc.l bar +- .dc.l bar_end ++ .dc.l 0x108 /* bar */ ++ .dc.l 0x10c /* bar_end */ + + .popsection +diff -rupN binutils.orig/binutils/testsuite/binutils-all/note-4-64.d binutils-2.30/binutils/testsuite/binutils-all/note-4-64.d +--- binutils.orig/binutils/testsuite/binutils-all/note-4-64.d 2019-10-28 17:08:43.356324902 +0000 ++++ binutils-2.30/binutils/testsuite/binutils-all/note-4-64.d 2019-10-28 17:09:04.609165478 +0000 +@@ -8,13 +8,13 @@ + #... + Displaying notes found in: .gnu.build.attributes + [ ]+Owner[ ]+Data size[ ]+Description +-[ ]+GA\$3p3[ ]+0x00000010[ ]+OPEN[ ]+Applies to region from 0x100 to 0x120 \(note_4.s\) ++[ ]+GA\$3p3[ ]+0x00000010[ ]+OPEN[ ]+Applies to region from 0x100 to 0x120.* +-[ ]+GA\$gcc 7.2.1 20170915[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x120 +-[ ]+GA\*GOW:0x700[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x120 + [ ]+GA\*off[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x120 +-[ ]+GA\*FORTIFY:0xff[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x120 ++[ ]+GA\$gcc 7.2.1 20170915[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x120 ++[ ]+GA\*0x[0-9a-f]+[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x120 + [ ]+GA\*PIC[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x120 + [ ]+GA\!false[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x120 +-[ ]+GA\*0x[0-9a-f]+[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x120 +-[ ]+GA\*strong[ ]+0x00000010[ ]+func[ ]+Applies to region from 0x110 to 0x11c.* ++[ ]+GA\*FORTIFY:0xff[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x120 ++[ ]+GA\*GOW:0x700[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x120 ++[ ]+GA\*strong[ ]+0x00000010[ ]+func[ ]+Applies to region from 0x110 to 0x120.* + #... +diff -rupN binutils.orig/binutils/testsuite/binutils-all/note-4-64.s binutils-2.30/binutils/testsuite/binutils-all/note-4-64.s +--- binutils.orig/binutils/testsuite/binutils-all/note-4-64.s 2019-10-28 17:08:43.356324902 +0000 ++++ binutils-2.30/binutils/testsuite/binutils-all/note-4-64.s 2019-10-28 17:17:29.355379229 +0000 +@@ -1,6 +1,6 @@ + .text + .org 0x100 +-note_4.s: ++ .equiv note_4.s, . + 2 + .dc.l 0 + .dc.l 0 + .dc.l 0 +@@ -22,8 +22,8 @@ note_4.s_end: + .dc.l 16 + .dc.l 0x100 + .asciz "GA$3p3" +- .8byte note_4.s +- .8byte note_4.s_end ++ .8byte 0x100 /* note_4.s - 2 */ ++ .8byte 0x120 /* note_4.s_end */ + + .dc.l 23 + .dc.l 0 +@@ -68,11 +68,17 @@ note_4.s_end: + .dc.b 0, 0, 0 + + .dc.l 6 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x2a, 0x7, 0x2, 0 ++ .dc.b 0, 0 ++ ++ .dc.l 6 + .dc.l 16 + .dc.l 0x101 + .dc.b 0x47, 0x41, 0x2a, 0x2, 0x3, 0 + .dc.b 0, 0 +- .8byte bar +- .8byte bar_end ++ .8byte 0x110 /* bar */ ++ .8byte 0x120 /* bar_end */ + + .popsection +diff -rupN binutils.orig/binutils/testsuite/binutils-all/note-6-32.d binutils-2.30/binutils/testsuite/binutils-all/note-6-32.d +--- binutils.orig/binutils/testsuite/binutils-all/note-6-32.d 1970-01-01 01:00:00.000000000 +0100 ++++ binutils-2.30/binutils/testsuite/binutils-all/note-6-32.d 2019-10-28 17:17:38.955307217 +0000 +@@ -0,0 +1,20 @@ ++#PROG: objcopy ++#readelf: --notes --wide ++#objcopy: --merge-notes ++#name: v3 gnu build attribute note merging (32-bit) ++#source: note-6-32.s ++ ++#... ++Displaying notes found in: .gnu.build.attributes ++[ ]+Owner[ ]+Data size[ ]+Description ++[ ]+GA\$3p1[ ]+0x00000008[ ]+OPEN[ ]+Applies to region from 0x100 to 0x106 \(note_test\) ++[ ]+GA\*off[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x106 ++[ ]+GA\$gcc 8.3.1 20190507[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x106 ++[ ]+GA\*0x[0-9a-f]+[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x106 ++[ ]+GA\*PIC[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x106 ++[ ]+GA\!false[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x106 ++[ ]+GA\*FORTIFY:0xff[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x106 ++[ ]+GA\*GOW:0x700[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x106 ++[ ]+GA\$3p1[ ]+0x00000008[ ]+func[ ]+Applies to region from 0x102 to 0x106 ++[ ]+GA\$hello world[ ]+0x00000000[ ]+func[ ]+Applies to region from 0x102 to 0x106 ++#... +diff -rupN binutils.orig/binutils/testsuite/binutils-all/note-6-32.s binutils-2.30/binutils/testsuite/binutils-all/note-6-32.s +--- binutils.orig/binutils/testsuite/binutils-all/note-6-32.s 1970-01-01 01:00:00.000000000 +0100 ++++ binutils-2.30/binutils/testsuite/binutils-all/note-6-32.s 2019-10-28 17:17:38.955307217 +0000 +@@ -0,0 +1,145 @@ ++ .text ++ .org 0x100 ++ .global note_test ++note_test: ++note_1_start: ++ .word 0 ++note_1_end: ++note_2_start: ++ .word 0 ++note_2_end: ++note_3_start: ++ .word 0 ++note_3_end: ++note_test_end: ++ .size note_test, note_test_end - note_test ++ ++ .pushsection .gnu.build.attributes, "", %note ++ .balign 4 ++ ++ .dc.l 8 ++ .dc.l 8 ++ .dc.l 0x100 ++ .asciz "GA$3p1" ++ .4byte 0x100 /* note_1_start */ ++ .4byte 0x102 /* note_1_end */ ++ ++ .dc.l 23 ++ .dc.l 0 ++ .dc.l 0x100 ++ .asciz "GA$gcc 8.3.1 20190507" ++ .dc.b 0 ++ ++ .dc.l 10 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x2a, 0x47, 0x4f, 0x57, 0, 0, 0x7, 0 ++ .dc.b 0, 0 ++ ++ .dc.l 6 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x2a, 0x2, 0, 0 ++ .dc.b 0, 0 ++ ++ .dc.l 13 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x2a, 0x46, 0x4f, 0x52, 0x54, 0x49, 0x46, 0x59, 0, 0xff, 0 ++ .dc.b 0, 0, 0 ++ ++ .dc.l 6 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x2a, 0x7, 0x2, 0 ++ .dc.b 0, 0 ++ ++ .dc.l 5 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x21, 0x8, 0 ++ .dc.b 0, 0, 0 ++ ++ .dc.l 13 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x2a, 0x6, 0xf2, 0x3, 0x38, 0xee, 0xce, 0xfa, 0x5e, 0x3c, 0 ++ .dc.b 0, 0, 0 ++ ++ ++ .dc.l 8 ++ .dc.l 8 ++ .dc.l 0x100 ++ .asciz "GA$3p1" ++ .4byte 0x102 /* note_2_start */ ++ .4byte 0x106 /* note_3_end */ ++ ++ .dc.l 23 ++ .dc.l 0 ++ .dc.l 0x100 ++ .asciz "GA$gcc 8.3.1 20190507" ++ .dc.b 0 ++ ++ .dc.l 10 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x2a, 0x47, 0x4f, 0x57, 0, 0, 0x7, 0 ++ .dc.b 0, 0 ++ ++ .dc.l 6 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x2a, 0x2, 0, 0 ++ .dc.b 0, 0 ++ ++ .dc.l 13 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x2a, 0x46, 0x4f, 0x52, 0x54, 0x49, 0x46, 0x59, 0, 0xff, 0 ++ .dc.b 0, 0, 0 ++ ++ .dc.l 6 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x2a, 0x7, 0x2, 0 ++ .dc.b 0, 0 ++ ++ .dc.l 5 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x21, 0x8, 0 ++ .dc.b 0, 0, 0 ++ ++ .dc.l 13 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x2a, 0x6, 0xf2, 0x3, 0x38, 0xee, 0xce, 0xfa, 0x5e, 0x3c, 0 ++ .dc.b 0, 0, 0 ++ ++ ++ .dc.l 8 ++ .dc.l 8 ++ .dc.l 0x101 ++ .asciz "GA$3p1" ++ .4byte 0x102 /* note_2_start */ ++ .4byte 0x104 /* note_2_end */ ++ ++ .dc.l 16 ++ .dc.l 0 ++ .dc.l 0x101 ++ .asciz "GA$hello world" ++ ++ ++ .dc.l 8 ++ .dc.l 8 ++ .dc.l 0x101 ++ .asciz "GA$3p1" ++ .4byte 0x104 /* note_3_start */ ++ .4byte 0x106 /* note_3_end */ ++ ++ .dc.l 16 ++ .dc.l 0 ++ .dc.l 0x101 ++ .asciz "GA$hello world" ++ ++ .popsection +diff -rupN binutils.orig/binutils/testsuite/binutils-all/note-6-64.d binutils-2.30/binutils/testsuite/binutils-all/note-6-64.d +--- binutils.orig/binutils/testsuite/binutils-all/note-6-64.d 1970-01-01 01:00:00.000000000 +0100 ++++ binutils-2.30/binutils/testsuite/binutils-all/note-6-64.d 2019-10-28 17:17:43.659271931 +0000 +@@ -0,0 +1,20 @@ ++#PROG: objcopy ++#readelf: --notes --wide ++#objcopy: --merge-notes ++#name: v3 gnu build attribute note merging (64-bit) ++#source: note-6-64.s ++ ++#... ++Displaying notes found in: .gnu.build.attributes ++[ ]+Owner[ ]+Data size[ ]+Description ++[ ]+GA\$3p1[ ]+0x00000010[ ]+OPEN[ ]+Applies to region from 0x100 to 0x106 \(note_test\) ++[ ]+GA\*off[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x106 ++[ ]+GA\$gcc 8.3.1 20190507[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x106 ++[ ]+GA\*0x[0-9a-f]+[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x106 ++[ ]+GA\*PIC[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x106 ++[ ]+GA\!false[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x106 ++[ ]+GA\*FORTIFY:0xff[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x106 ++[ ]+GA\*GOW:0x700[ ]+0x00000000[ ]+OPEN[ ]+Applies to region from 0x100 to 0x106 ++[ ]+GA\$3p1[ ]+0x00000010[ ]+func[ ]+Applies to region from 0x102 to 0x106 ++[ ]+GA\$hello world[ ]+0x00000000[ ]+func[ ]+Applies to region from 0x102 to 0x106 ++#... +diff -rupN binutils.orig/binutils/testsuite/binutils-all/note-6-64.s binutils-2.30/binutils/testsuite/binutils-all/note-6-64.s +--- binutils.orig/binutils/testsuite/binutils-all/note-6-64.s 1970-01-01 01:00:00.000000000 +0100 ++++ binutils-2.30/binutils/testsuite/binutils-all/note-6-64.s 2019-10-28 17:17:43.659271931 +0000 +@@ -0,0 +1,145 @@ ++ .text ++ .org 0x100 ++ .global note_test ++note_test: ++note_1_start: ++ .word 0 ++note_1_end: ++note_2_start: ++ .word 0 ++note_2_end: ++note_3_start: ++ .word 0 ++note_3_end: ++note_test_end: ++ .size note_test, note_test_end - note_test ++ ++ .pushsection .gnu.build.attributes, "", %note ++ .balign 4 ++ ++ .dc.l 8 ++ .dc.l 16 ++ .dc.l 0x100 ++ .asciz "GA$3p1" ++ .8byte 0x100 /* note_1_start */ ++ .8byte 0x102 /* note_1_end */ ++ ++ .dc.l 23 ++ .dc.l 0 ++ .dc.l 0x100 ++ .asciz "GA$gcc 8.3.1 20190507" ++ .dc.b 0 ++ ++ .dc.l 10 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x2a, 0x47, 0x4f, 0x57, 0, 0, 0x7, 0 ++ .dc.b 0, 0 ++ ++ .dc.l 6 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x2a, 0x2, 0, 0 ++ .dc.b 0, 0 ++ ++ .dc.l 13 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x2a, 0x46, 0x4f, 0x52, 0x54, 0x49, 0x46, 0x59, 0, 0xff, 0 ++ .dc.b 0, 0, 0 ++ ++ .dc.l 6 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x2a, 0x7, 0x2, 0 ++ .dc.b 0, 0 ++ ++ .dc.l 5 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x21, 0x8, 0 ++ .dc.b 0, 0, 0 ++ ++ .dc.l 13 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x2a, 0x6, 0xf2, 0x3, 0x38, 0xee, 0xce, 0xfa, 0x5e, 0x3c, 0 ++ .dc.b 0, 0, 0 ++ ++ ++ .dc.l 8 ++ .dc.l 16 ++ .dc.l 0x100 ++ .asciz "GA$3p1" ++ .8byte 0x102 /* note_2_start */ ++ .8byte 0x106 /* note_3_end */ ++ ++ .dc.l 23 ++ .dc.l 0 ++ .dc.l 0x100 ++ .asciz "GA$gcc 8.3.1 20190507" ++ .dc.b 0 ++ ++ .dc.l 10 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x2a, 0x47, 0x4f, 0x57, 0, 0, 0x7, 0 ++ .dc.b 0, 0 ++ ++ .dc.l 6 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x2a, 0x2, 0, 0 ++ .dc.b 0, 0 ++ ++ .dc.l 13 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x2a, 0x46, 0x4f, 0x52, 0x54, 0x49, 0x46, 0x59, 0, 0xff, 0 ++ .dc.b 0, 0, 0 ++ ++ .dc.l 6 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x2a, 0x7, 0x2, 0 ++ .dc.b 0, 0 ++ ++ .dc.l 5 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x21, 0x8, 0 ++ .dc.b 0, 0, 0 ++ ++ .dc.l 13 ++ .dc.l 0 ++ .dc.l 0x100 ++ .dc.b 0x47, 0x41, 0x2a, 0x6, 0xf2, 0x3, 0x38, 0xee, 0xce, 0xfa, 0x5e, 0x3c, 0 ++ .dc.b 0, 0, 0 ++ ++ ++ .dc.l 8 ++ .dc.l 16 ++ .dc.l 0x101 ++ .asciz "GA$3p1" ++ .8byte 0x102 /* note_2_start */ ++ .8byte 0x104 /* note_2_end */ ++ ++ .dc.l 16 ++ .dc.l 0 ++ .dc.l 0x101 ++ .asciz "GA$hello world" ++ ++ ++ .dc.l 8 ++ .dc.l 16 ++ .dc.l 0x101 ++ .asciz "GA$3p1" ++ .8byte 0x104 /* note_3_start */ ++ .8byte 0x106 /* note_3_end */ ++ ++ .dc.l 16 ++ .dc.l 0 ++ .dc.l 0x101 ++ .asciz "GA$hello world" ++ ++ .popsection +diff -rupN binutils.orig/binutils/testsuite/binutils-all/objcopy.exp binutils-2.30/binutils/testsuite/binutils-all/objcopy.exp +--- binutils.orig/binutils/testsuite/binutils-all/objcopy.exp 2019-10-28 17:08:43.353324925 +0000 ++++ binutils-2.30/binutils/testsuite/binutils-all/objcopy.exp 2019-10-28 17:09:04.610165471 +0000 +@@ -1057,10 +1057,12 @@ if [is_elf_format] { + run_dump_test "note-2-64" + run_dump_test "note-3-64" + run_dump_test "note-4-64" ++ run_dump_test "note-6-64" + } else { + run_dump_test "note-2-32" + run_dump_test "note-3-32" + run_dump_test "note-4-32" ++ run_dump_test "note-6-32" + } + run_dump_test "note-5" + } +--- binutils.orig/binutils/objcopy.c 2019-11-06 10:21:47.933091869 +0000 ++++ binutils-2.30/binutils/objcopy.c 2019-11-06 15:12:26.964599817 +0000 +@@ -2502,7 +2502,7 @@ merge_gnu_build_notes (bfd * ab + { + bfd_set_error (bfd_error_bad_value); + bfd_nonfatal_message (NULL, abfd, sec, err); +- status = 1; ++ /* status = 1; */ + } + + free (pnotes); +@@ -2859,7 +2859,7 @@ copy_object (bfd *ibfd, bfd *obfd, const + { + bfd_nonfatal_message (NULL, ibfd, osec, + _("warning: could not load note section")); +- free (merged->contents); ++ /* Do NOT free merged->contents - it is cached and might be used elsewhere. */ + free (merged); + continue; + } +@@ -2871,7 +2871,7 @@ copy_object (bfd *ibfd, bfd *obfd, const + /* Merging achieves nothing. */ + merge_debug ("Merge of section %s achieved nothing - skipping\n", + bfd_section_name (obfd, osec)); +- free (merged->contents); ++ /* Do NOT free merged->contents - it is cached and might be used elsewhere. */ + free (merged); + continue; + } +@@ -2881,7 +2881,7 @@ copy_object (bfd *ibfd, bfd *obfd, const + { + bfd_nonfatal_message (NULL, obfd, osec, + _("warning: failed to set merged notes size")); +- free (merged->contents); ++ /* Do NOT free merged->contents - it is cached and might be used elsewhere. */ + free (merged); + continue; + } +@@ -4519,7 +4519,7 @@ strip_main (int argc, char *argv[]) + int i; + char *output_file = NULL; + +- merge_notes = TRUE; ++ /* merge_notes = TRUE; */ + + while ((c = getopt_long (argc, argv, "I:O:F:K:MN:R:o:sSpdgxXHhVvwDU", + strip_options, (int *) 0)) != EOF) +--- binutils.orig/binutils/objcopy.c 2019-11-06 16:37:57.018843494 +0000 ++++ binutils-2.30/binutils/objcopy.c 2019-11-06 16:40:52.669564222 +0000 +@@ -2845,7 +2845,13 @@ copy_object (bfd *ibfd, bfd *obfd, const + if (! is_mergeable_note_section (ibfd, osec)) + continue; + ++ /* If the section is going to be completly deleted then ++ do not bother to merge it. */ ++ if (osec->output_section == NULL) ++ continue; ++ + bfd_size_type size = bfd_section_size (obfd, osec); ++ + if (size == 0) + { + bfd_nonfatal_message (NULL, ibfd, osec, +@@ -2859,29 +2865,22 @@ copy_object (bfd *ibfd, bfd *obfd, const + { + bfd_nonfatal_message (NULL, ibfd, osec, + _("warning: could not load note section")); +- /* Do NOT free merged->contents - it is cached and might be used elsewhere. */ + free (merged); + continue; + } + + merged->size = merge_gnu_build_notes (ibfd, osec, size, + merged->contents); +- if (merged->size == size) +- { +- /* Merging achieves nothing. */ +- merge_debug ("Merge of section %s achieved nothing - skipping\n", +- bfd_section_name (obfd, osec)); +- /* Do NOT free merged->contents - it is cached and might be used elsewhere. */ +- free (merged); +- continue; +- } ++ /* FIXME: Once we have read the contents in, we must write ++ them out again. So even if the mergeing has achieved ++ nothing we still add this entry to the merge list. */ + +- if (osec->output_section == NULL +- || !bfd_set_section_size (obfd, osec->output_section, merged->size)) ++ if (size != merged->size ++ && !bfd_set_section_size (obfd, osec->output_section, merged->size)) + { + bfd_nonfatal_message (NULL, obfd, osec, + _("warning: failed to set merged notes size")); +- /* Do NOT free merged->contents - it is cached and might be used elsewhere. */ ++ free (merged->contents); + free (merged); + continue; + } +@@ -3246,16 +3245,16 @@ copy_object (bfd *ibfd, bfd *obfd, const + { + bfd_nonfatal_message + (NULL, obfd, osec, +- _("error: failed to copy merged notes into output")); ++ _("error: failed to locate merged notes")); + continue; + } + } + +- if (! is_mergeable_note_section (obfd, osec)) ++ if (merged->contents == NULL) + { + bfd_nonfatal_message + (NULL, obfd, osec, +- _("error: failed to copy merged notes into output")); ++ _("error: failed to merged notes")); + continue; + } + +--- binutils.orig/binutils/objcopy.c 2019-11-20 10:59:20.993888328 +0000 ++++ binutils-2.30/binutils/objcopy.c 2019-11-20 16:59:50.714905419 +0000 +@@ -2292,7 +2292,7 @@ merge_gnu_build_notes (bfd * ab + - it makes things much simpler. */ + if (version_3_seen == 0) + { +- merge_debug ("%s: skipping merge - not using v3 notes", bfd_section_name (sec)); ++ merge_debug ("%s: skipping merge - not using v3 notes", bfd_section_name (abfd, sec)); + goto done; + } + +@@ -2324,7 +2324,7 @@ merge_gnu_build_notes (bfd * ab + other note then if they are both of the same type (open + or func) then they can be merged and one deleted. If + they are of different types then they cannot be merged. */ +- for (pnote = pnotes + 1; pnote < pnotes_end; pnote ++) ++ for (pnote = pnotes; pnote < pnotes_end; pnote ++) + { + /* Skip already deleted notes. + FIXME: Can this happen ? We are scanning forwards and +@@ -2426,7 +2426,9 @@ merge_gnu_build_notes (bfd * ab + bfd_vma prev_start = 0; + bfd_vma prev_end = 0; + +- new = new_contents = xmalloc (size); ++ /* Not sure how, but the notes might grow in size. ++ (eg see PR 1774507). Allow for this here. */ ++ new = new_contents = xmalloc (size * 2); + for (pnote = pnotes, old = contents; + pnote < pnotes_end; + pnote ++) +@@ -2493,8 +2495,11 @@ merge_gnu_build_notes (bfd * ab + #endif + + new_size = new - new_contents; +- memcpy (contents, new_contents, new_size); +- size = new_size; ++ if (new_size < size) ++ { ++ memcpy (contents, new_contents, new_size); ++ size = new_size; ++ } + free (new_contents); + + done: +@@ -2940,6 +2945,7 @@ copy_object (bfd *ibfd, bfd *obfd, const + pdump->filename, + strerror (errno)); + free (contents); ++ fclose (f); + /* There is a potential resource leak here, but it is not important. */ + /* coverity[leaked_storage: FALSE] */ + return FALSE; diff --git a/SOURCES/binutils-linkonce-notes.patch b/SOURCES/binutils-linkonce-notes.patch new file mode 100644 index 0000000..3a01ec1 --- /dev/null +++ b/SOURCES/binutils-linkonce-notes.patch @@ -0,0 +1,127 @@ +--- binutils.orig/gas/write.c 2018-05-14 12:22:27.893671804 +0100 ++++ binutils-2.30/gas/write.c 2018-05-14 15:39:03.900509629 +0100 +@@ -1901,6 +1901,7 @@ maybe_generate_build_notes (void) + segT sec; + char * note; + offsetT note_size; ++ offsetT total_size; + offsetT desc_size; + offsetT desc2_offset; + int desc_reloc; +@@ -1918,7 +1919,8 @@ maybe_generate_build_notes (void) + SEC_READONLY | SEC_HAS_CONTENTS | SEC_DATA); + bfd_set_section_alignment (stdoutput, sec, 2); + +- /* Create a version note. */ ++ /* Work out the size of the notes that we will create, ++ and the relocation we should use. */ + if (bfd_arch_bits_per_address (stdoutput) <= 32) + { + note_size = 28; +@@ -1952,65 +1954,59 @@ maybe_generate_build_notes (void) + desc_reloc = BFD_RELOC_64; + } + +- frag_now_fix (); +- note = frag_more (note_size); +- memset (note, 0, note_size); ++ /* We have to create a note for *each* code section. ++ Linker garbage collection might discard some. */ ++ total_size = 0; ++ note = NULL; + +- if (target_big_endian) +- { +- note[3] = 8; /* strlen (name) + 1. */ +- note[7] = desc_size; /* Two 8-byte offsets. */ +- note[10] = NT_GNU_BUILD_ATTRIBUTE_OPEN >> 8; +- note[11] = NT_GNU_BUILD_ATTRIBUTE_OPEN & 0xff; +- } +- else +- { +- note[0] = 8; /* strlen (name) + 1. */ +- note[4] = desc_size; /* Two 8-byte offsets. */ +- note[8] = NT_GNU_BUILD_ATTRIBUTE_OPEN & 0xff; +- note[9] = NT_GNU_BUILD_ATTRIBUTE_OPEN >> 8; +- } +- +- /* The a1 version number indicates that this note was +- generated by the assembler and not the gcc annobin plugin. */ +- memcpy (note + 12, "GA$3a1", 8); +- +- /* Find the first code section symbol. */ + for (sym = symbol_rootP; sym != NULL; sym = sym->sy_next) + if (sym->bsym != NULL + && sym->bsym->flags & BSF_SECTION_SYM + && sym->bsym->section != NULL +- && sym->bsym->section->flags & SEC_CODE) ++ /* Skip linkonce sections - we cannot these section symbols as they may disappear. */ ++ && (sym->bsym->section->flags & (SEC_CODE | SEC_LINK_ONCE)) == SEC_CODE ++ /* Not all linkonce sections are flagged... */ ++ && strncmp (S_GET_NAME (sym), ".gnu.linkonce", sizeof ".gnu.linkonce" - 1) != 0) + { +- /* Found one - now create a relocation against this symbol. */ +- create_note_reloc (sec, sym, 20, desc_reloc, 0, note); +- break; +- } ++ /* Create a version note. */ ++ frag_now_fix (); ++ note = frag_more (note_size); ++ memset (note, 0, note_size); + +- /* Find the last code section symbol. */ +- if (sym) +- { +- for (sym = symbol_lastP; sym != NULL; sym = sym->sy_previous) +- if (sym->bsym != NULL +- && sym->bsym->flags & BSF_SECTION_SYM +- && sym->bsym->section != NULL +- && sym->bsym->section->flags & SEC_CODE) ++ if (target_big_endian) + { +- /* Create a relocation against the end of this symbol. */ +- create_note_reloc (sec, sym, desc2_offset, desc_reloc, +- bfd_get_section_size (sym->bsym->section), +- note); +- break; ++ note[3] = 8; /* strlen (name) + 1. */ ++ note[7] = desc_size; /* Two 8-byte offsets. */ ++ note[10] = NT_GNU_BUILD_ATTRIBUTE_OPEN >> 8; ++ note[11] = NT_GNU_BUILD_ATTRIBUTE_OPEN & 0xff; + } +- } +- /* else - if we were unable to find any code section symbols then +- probably there is no code in the output. So leaving the start +- and end values as zero in the note is OK. */ ++ else ++ { ++ note[0] = 8; /* strlen (name) + 1. */ ++ note[4] = desc_size; /* Two 8-byte offsets. */ ++ note[8] = NT_GNU_BUILD_ATTRIBUTE_OPEN & 0xff; ++ note[9] = NT_GNU_BUILD_ATTRIBUTE_OPEN >> 8; ++ } ++ ++ /* The a1 version number indicates that this note was ++ generated by the assembler and not the gcc annobin plugin. */ ++ memcpy (note + 12, "GA$3a1", 8); + +- /* FIXME: Maybe add a note recording the assembler command line and version ? */ ++ /* Create a relocation to install the start address of the note... */ ++ create_note_reloc (sec, sym, 20, desc_reloc, 0, note); ++ ++ /* ...and another one to install the end address. */ ++ create_note_reloc (sec, sym, desc2_offset, desc_reloc, ++ bfd_get_section_size (sym->bsym->section), ++ note); ++ ++ total_size += note_size; ++ /* FIXME: Maybe add a note recording the assembler command line and version ? */ ++ } + + /* Install the note(s) into the section. */ +- bfd_set_section_contents (stdoutput, sec, (bfd_byte *) note, 0, note_size); ++ if (total_size) ++ bfd_set_section_contents (stdoutput, sec, (bfd_byte *) note, 0, total_size); + subsegs_finish_section (sec); + relax_segment (seg_info (sec)->frchainP->frch_root, sec, 0); + size_seg (stdoutput, sec, NULL); diff --git a/SOURCES/binutils-merge-attribute-sections.patch b/SOURCES/binutils-merge-attribute-sections.patch new file mode 100644 index 0000000..0b75718 --- /dev/null +++ b/SOURCES/binutils-merge-attribute-sections.patch @@ -0,0 +1,23 @@ +diff -rup binutils.orig/gold/layout.cc binutils-2.30/gold/layout.cc +--- binutils.orig/gold/layout.cc 2018-07-27 12:02:14.160444849 +0100 ++++ binutils-2.30/gold/layout.cc 2018-07-27 12:03:11.543820863 +0100 +@@ -5133,6 +5133,7 @@ const Layout::Section_name_mapping Layou + MAPPING_INIT(".gnu.linkonce.armextab.", ".ARM.extab"), + MAPPING_INIT(".ARM.exidx", ".ARM.exidx"), + MAPPING_INIT(".gnu.linkonce.armexidx.", ".ARM.exidx"), ++ MAPPING_INIT(".gnu.build.attributes.", ".gnu.build.attributes"), + }; + #undef MAPPING_INIT + #undef MAPPING_INIT_EXACT +diff -rup binutils.orig/ld/scripttempl/elf.sc binutils-2.30/ld/scripttempl/elf.sc +--- binutils.orig/ld/scripttempl/elf.sc 2018-07-27 12:02:13.992446676 +0100 ++++ binutils-2.30/ld/scripttempl/elf.sc 2018-07-27 12:02:42.292138945 +0100 +@@ -692,6 +692,8 @@ cat <bsym != NULL + && sym->bsym->flags & BSF_SECTION_SYM + && sym->bsym->section != NULL +- /* Skip linkonce sections - we cannot these section symbols as they may disappear. */ ++ /* Skip linkonce sections - we cannot use these section symbols as they may disappear. */ + && (sym->bsym->section->flags & (SEC_CODE | SEC_LINK_ONCE)) == SEC_CODE + /* Not all linkonce sections are flagged... */ + && strncmp (S_GET_NAME (sym), ".gnu.linkonce", sizeof ".gnu.linkonce" - 1) != 0) +@@ -1993,10 +1993,10 @@ maybe_generate_build_notes (void) + memcpy (note + 12, "GA$3a1", 8); + + /* Create a relocation to install the start address of the note... */ +- create_note_reloc (sec, sym, 20, desc_reloc, 0, note); ++ create_note_reloc (sec, sym, total_size + 20, desc_reloc, 0, note); + + /* ...and another one to install the end address. */ +- create_note_reloc (sec, sym, desc2_offset, desc_reloc, ++ create_note_reloc (sec, sym, total_size + desc2_offset, desc_reloc, + bfd_get_section_size (sym->bsym->section), + note); + diff --git a/SOURCES/binutils-multiple-relocs-for-same-section.patch b/SOURCES/binutils-multiple-relocs-for-same-section.patch new file mode 100644 index 0000000..165c743 --- /dev/null +++ b/SOURCES/binutils-multiple-relocs-for-same-section.patch @@ -0,0 +1,23 @@ +--- binutils.orig/bfd/elf.c 2019-09-10 10:57:33.391081672 +0100 ++++ binutils-2.27/bfd/elf.c 2019-09-10 10:59:55.355010766 +0100 +@@ -2324,9 +2324,18 @@ bfd_section_from_shdr (bfd *abfd, unsign + else + p_hdr = &esdt->rel.hdr; + +- /* PR 17512: file: 0b4f81b7. */ ++ /* PR 17512: file: 0b4f81b7. ++ Also see PR 24456, for a file which deliberately has two reloc ++ sections. */ + if (*p_hdr != NULL) +- goto fail; ++ { ++ _bfd_error_handler ++ /* xgettext:c-format */ ++ (_("%B: warning: multiple relocation sections for section %A \ ++found - ignoring all but the first"), ++ abfd, target_sect); ++ goto success; ++ } + hdr2 = (Elf_Internal_Shdr *) bfd_alloc (abfd, sizeof (*hdr2)); + if (hdr2 == NULL) + goto fail; diff --git a/SOURCES/binutils-nfp.patch b/SOURCES/binutils-nfp.patch new file mode 100644 index 0000000..d8f8c93 --- /dev/null +++ b/SOURCES/binutils-nfp.patch @@ -0,0 +1,5427 @@ +# Add support for disassembling NFP binaries. (#1644391) + +diff -rup binutils.orig/bfd/archures.c binutils-2.30/bfd/archures.c +--- binutils.orig/bfd/archures.c 2019-03-07 13:21:14.246464815 +0000 ++++ binutils-2.30/bfd/archures.c 2019-03-07 14:44:05.704268413 +0000 +@@ -537,6 +537,9 @@ DESCRIPTION + .#define bfd_mach_wasm32 1 + . bfd_arch_pru, {* PRU. *} + .#define bfd_mach_pru 0 ++. bfd_arch_nfp, {* Netronome Flow Processor *} ++.#define bfd_mach_nfp3200 0x3200 ++.#define bfd_mach_nfp6000 0x6000 + . bfd_arch_last + . }; + */ +@@ -632,6 +635,7 @@ extern const bfd_arch_info_type bfd_ft32 + extern const bfd_arch_info_type bfd_msp430_arch; + extern const bfd_arch_info_type bfd_mt_arch; + extern const bfd_arch_info_type bfd_nds32_arch; ++extern const bfd_arch_info_type bfd_nfp_arch; + extern const bfd_arch_info_type bfd_nios2_arch; + extern const bfd_arch_info_type bfd_ns32k_arch; + extern const bfd_arch_info_type bfd_or1k_arch; +@@ -727,6 +731,7 @@ static const bfd_arch_info_type * const + &bfd_msp430_arch, + &bfd_mt_arch, + &bfd_nds32_arch, ++ &bfd_nfp_arch, + &bfd_nios2_arch, + &bfd_ns32k_arch, + &bfd_or1k_arch, +diff -rup binutils.orig/bfd/bfd-in2.h binutils-2.30/bfd/bfd-in2.h +--- binutils.orig/bfd/bfd-in2.h 2019-03-07 13:21:14.244464831 +0000 ++++ binutils-2.30/bfd/bfd-in2.h 2019-03-07 14:44:05.704268413 +0000 +@@ -2399,6 +2399,9 @@ enum bfd_architecture + #define bfd_mach_wasm32 1 + bfd_arch_pru, /* PRU. */ + #define bfd_mach_pru 0 ++ bfd_arch_nfp, /* Netronome Flow Processor */ ++#define bfd_mach_nfp3200 0x3200 ++#define bfd_mach_nfp6000 0x6000 + bfd_arch_last + }; + +diff -rup binutils.orig/bfd/config.bfd binutils-2.30/bfd/config.bfd +--- binutils.orig/bfd/config.bfd 2019-03-07 13:21:14.245464823 +0000 ++++ binutils-2.30/bfd/config.bfd 2019-03-07 14:44:05.705268406 +0000 +@@ -181,6 +181,7 @@ m88*) targ_archs=bfd_m88k_arch ;; + microblaze*) targ_archs=bfd_microblaze_arch ;; + mips*) targ_archs=bfd_mips_arch ;; + nds32*) targ_archs=bfd_nds32_arch ;; ++nfp) targ_archs=bfd_nfp_arch ;; + nios2*) targ_archs=bfd_nios2_arch ;; + or1k*|or1knd*) targ_archs=bfd_or1k_arch ;; + pdp11*) targ_archs=bfd_pdp11_arch ;; +@@ -1277,6 +1278,12 @@ case "${targ}" in + targ_selvecs=nds32_elf32_le_vec + ;; + ++#ifdef BFD64 ++ nfp-*-*) ++ targ_defvec=nfp_elf64_vec ++ ;; ++#endif ++ + ns32k-pc532-mach* | ns32k-pc532-ux*) + targ_defvec=ns32k_aout_pc532mach_vec + targ_underscore=yes +diff -rup binutils.orig/bfd/configure binutils-2.30/bfd/configure +--- binutils.orig/bfd/configure 2019-03-07 13:21:14.244464831 +0000 ++++ binutils-2.30/bfd/configure 2019-03-07 14:44:05.706268397 +0000 +@@ -14526,6 +14526,7 @@ do + nds32_elf32_le_vec) tb="$tb elf32-nds32.lo elf32.lo $elf" ;; + nds32_elf32_linux_be_vec) tb="$tb elf32-nds32.lo elf32.lo $elf" ;; + nds32_elf32_linux_le_vec) tb="$tb elf32-nds32.lo elf32.lo $elf" ;; ++ nfp_elf64_vec) tb="$tb elf64-nfp.lo elf64.lo $elf" ;; + nios2_elf32_be_vec) tb="$tb elf32-nios2.lo elf32.lo $elf" ;; + nios2_elf32_le_vec) tb="$tb elf32-nios2.lo elf32.lo $elf" ;; + ns32k_aout_pc532mach_vec) tb="$tb pc532-mach.lo aout-ns32k.lo" ;; +diff -rup binutils.orig/bfd/configure.ac binutils-2.30/bfd/configure.ac +--- binutils.orig/bfd/configure.ac 2019-03-07 13:21:14.264464675 +0000 ++++ binutils-2.30/bfd/configure.ac 2019-03-07 14:44:05.706268397 +0000 +@@ -584,6 +584,7 @@ do + nds32_elf32_le_vec) tb="$tb elf32-nds32.lo elf32.lo $elf" ;; + nds32_elf32_linux_be_vec) tb="$tb elf32-nds32.lo elf32.lo $elf" ;; + nds32_elf32_linux_le_vec) tb="$tb elf32-nds32.lo elf32.lo $elf" ;; ++ nfp_elf64_vec) tb="$tb elf64-nfp.lo elf64.lo $elf" ;; + nios2_elf32_be_vec) tb="$tb elf32-nios2.lo elf32.lo $elf" ;; + nios2_elf32_le_vec) tb="$tb elf32-nios2.lo elf32.lo $elf" ;; + ns32k_aout_pc532mach_vec) tb="$tb pc532-mach.lo aout-ns32k.lo" ;; +diff -rup binutils.orig/bfd/elf-bfd.h binutils-2.30/bfd/elf-bfd.h +--- binutils.orig/bfd/elf-bfd.h 2019-03-07 13:21:14.254464753 +0000 ++++ binutils-2.30/bfd/elf-bfd.h 2019-03-07 14:44:05.706268397 +0000 +@@ -1668,6 +1668,7 @@ struct bfd_elf_section_data + #define elf_linked_to_section(sec) (elf_section_data(sec)->linked_to) + #define elf_section_type(sec) (elf_section_data(sec)->this_hdr.sh_type) + #define elf_section_flags(sec) (elf_section_data(sec)->this_hdr.sh_flags) ++#define elf_section_info(sec) (elf_section_data(sec)->this_hdr.sh_info) + #define elf_group_name(sec) (elf_section_data(sec)->group.name) + #define elf_group_id(sec) (elf_section_data(sec)->group.id) + #define elf_next_in_group(sec) (elf_section_data(sec)->next_in_group) +diff -rup binutils.orig/bfd/Makefile.am binutils-2.30/bfd/Makefile.am +--- binutils.orig/bfd/Makefile.am 2019-03-07 13:21:14.244464831 +0000 ++++ binutils-2.30/bfd/Makefile.am 2019-03-07 14:44:05.703268422 +0000 +@@ -140,6 +140,7 @@ ALL_MACHINES = \ + cpu-msp430.lo \ + cpu-mt.lo \ + cpu-nds32.lo \ ++ cpu-nfp.lo \ + cpu-nios2.lo \ + cpu-ns32k.lo \ + cpu-or1k.lo \ +@@ -230,6 +231,7 @@ ALL_MACHINES_CFILES = \ + cpu-msp430.c \ + cpu-mt.c \ + cpu-nds32.c \ ++ cpu-nfp.c \ + cpu-ns32k.c \ + cpu-nios2.c \ + cpu-or1k.c \ +@@ -692,6 +694,7 @@ BFD64_BACKENDS = \ + elf64-mips.lo \ + elfxx-mips.lo \ + elf64-mmix.lo \ ++ elf64-nfp.lo \ + elf64-ppc.lo \ + elf32-riscv.lo \ + elf64-riscv.lo \ +@@ -731,6 +734,7 @@ BFD64_BACKENDS_CFILES = \ + elf64-ia64-vms.c \ + elf64-mips.c \ + elf64-mmix.c \ ++ elf64-nfp.c \ + elf64-ppc.c \ + elf64-s390.c \ + elf64-sh64.c \ +diff -rup binutils.orig/bfd/Makefile.in binutils-2.30/bfd/Makefile.in +--- binutils.orig/bfd/Makefile.in 2019-03-07 13:21:14.245464823 +0000 ++++ binutils-2.30/bfd/Makefile.in 2019-03-07 14:44:05.704268413 +0000 +@@ -474,6 +474,7 @@ ALL_MACHINES = \ + cpu-msp430.lo \ + cpu-mt.lo \ + cpu-nds32.lo \ ++ cpu-nfp.lo \ + cpu-nios2.lo \ + cpu-ns32k.lo \ + cpu-or1k.lo \ +@@ -564,6 +565,7 @@ ALL_MACHINES_CFILES = \ + cpu-msp430.c \ + cpu-mt.c \ + cpu-nds32.c \ ++ cpu-nfp.c \ + cpu-ns32k.c \ + cpu-nios2.c \ + cpu-or1k.c \ +@@ -1028,6 +1030,7 @@ BFD64_BACKENDS = \ + elf64-mips.lo \ + elfxx-mips.lo \ + elf64-mmix.lo \ ++ elf64-nfp.lo \ + elf64-ppc.lo \ + elf32-riscv.lo \ + elf64-riscv.lo \ +@@ -1067,6 +1070,7 @@ BFD64_BACKENDS_CFILES = \ + elf64-ia64-vms.c \ + elf64-mips.c \ + elf64-mmix.c \ ++ elf64-nfp.c \ + elf64-ppc.c \ + elf64-s390.c \ + elf64-sh64.c \ +@@ -1430,6 +1434,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-msp430.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-mt.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-nds32.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-nfp.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-nios2.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-ns32k.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-or1k.Plo@am__quote@ +@@ -1563,6 +1568,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-ia64.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-mips.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-mmix.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-nfp.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-ppc.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-riscv.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-s390.Plo@am__quote@ +diff -rup binutils.orig/bfd/targets.c binutils-2.30/bfd/targets.c +--- binutils.orig/bfd/targets.c 2019-03-07 13:21:14.261464698 +0000 ++++ binutils-2.30/bfd/targets.c 2019-03-07 14:49:56.512460817 +0000 +@@ -788,6 +788,7 @@ extern const bfd_target nds32_elf32_be_v + extern const bfd_target nds32_elf32_le_vec; + extern const bfd_target nds32_elf32_linux_be_vec; + extern const bfd_target nds32_elf32_linux_le_vec; ++extern const bfd_target nfp_elf64_vec; + extern const bfd_target nios2_elf32_be_vec; + extern const bfd_target nios2_elf32_le_vec; + extern const bfd_target ns32k_aout_pc532mach_vec; +@@ -1274,6 +1275,10 @@ static const bfd_target * const _bfd_tar + &nds32_elf32_linux_be_vec, + &nds32_elf32_linux_le_vec, + ++#ifdef BFD64 ++ &nfp_elf64_vec, ++#endif ++ + &nios2_elf32_be_vec, + &nios2_elf32_le_vec, + +diff -rup binutils.orig/binutils/NEWS binutils-2.30/binutils/NEWS +--- binutils.orig/binutils/NEWS 2019-03-07 13:21:13.399471393 +0000 ++++ binutils-2.30/binutils/NEWS 2019-03-07 14:44:05.712268349 +0000 +@@ -1,5 +1,7 @@ + -*- text -*- + ++* Add support for disassembling netronome Flow Processor (NFP) firmware files. ++ + Changes in 2.30: + + * Add --debug-dump=links option to readelf and --dwarf=links option to objdump +diff -rup binutils.orig/binutils/readelf.c binutils-2.30/binutils/readelf.c +--- binutils.orig/binutils/readelf.c 2019-03-07 13:21:13.417471253 +0000 ++++ binutils-2.30/binutils/readelf.c 2019-03-07 14:44:05.715268325 +0000 +@@ -131,6 +131,7 @@ + #include "elf/mt.h" + #include "elf/msp430.h" + #include "elf/nds32.h" ++#include "elf/nfp.h" + #include "elf/nios2.h" + #include "elf/or1k.h" + #include "elf/pj.h" +@@ -765,6 +766,7 @@ guess_is_rela (unsigned int e_machine) + case EM_CYGNUS_M32R: + case EM_SCORE: + case EM_XGATE: ++ case EM_NFP: + return FALSE; + + /* Targets that use RELA relocations. */ +@@ -1549,6 +1551,13 @@ dump_relocations (Filedata * fi + case EM_TI_PRU: + rtype = elf_pru_reloc_type (type); + break; ++ ++ case EM_NFP: ++ if (EF_NFP_MACH (filedata->file_header.e_flags) == E_NFP_MACH_3200) ++ rtype = elf_nfp3200_reloc_type (type); ++ else ++ rtype = elf_nfp_reloc_type (type); ++ break; + } + + if (rtype == NULL) +@@ -2461,6 +2470,7 @@ get_machine_name (unsigned e_machine) + case EM_RISCV: return "RISC-V"; + case EM_LANAI: return "Lanai 32-bit processor"; + case EM_BPF: return "Linux BPF"; ++ case EM_NFP: return "Netronome Flow Processor"; + + /* Large numbers... */ + case EM_MT: return "Morpho Techologies MT processor"; +@@ -3423,6 +3433,18 @@ get_machine_flags (Filedata * filedata, + decode_NDS32_machine_flags (e_flags, buf, sizeof buf); + break; + ++ case EM_NFP: ++ switch (EF_NFP_MACH (e_flags)) ++ { ++ case E_NFP_MACH_3200: ++ strcat (buf, ", NFP-32xx"); ++ break; ++ case E_NFP_MACH_6000: ++ strcat (buf, ", NFP-6xxx"); ++ break; ++ } ++ break; ++ + case EM_RISCV: + if (e_flags & EF_RISCV_RVC) + strcat (buf, ", RVC"); +@@ -4118,6 +4140,18 @@ get_msp430x_section_type_name (unsigned + } + + static const char * ++get_nfp_section_type_name (unsigned int sh_type) ++{ ++ switch (sh_type) ++ { ++ case SHT_NFP_MECONFIG: return "NFP_MECONFIG"; ++ case SHT_NFP_INITREG: return "NFP_INITREG"; ++ case SHT_NFP_UDEBUG: return "NFP_UDEBUG"; ++ default: return NULL; ++ } ++} ++ ++static const char * + get_v850_section_type_name (unsigned int sh_type) + { + switch (sh_type) +@@ -4204,6 +4238,9 @@ get_section_type_name (Filedata * fileda + case EM_MSP430: + result = get_msp430x_section_type_name (sh_type); + break; ++ case EM_NFP: ++ result = get_nfp_section_type_name (sh_type); ++ break; + case EM_V800: + case EM_V850: + case EM_CYGNUS_V850: +diff -rup binutils.orig/config.sub binutils-2.30/config.sub +--- binutils.orig/config.sub 2019-03-07 13:21:14.229464947 +0000 ++++ binutils-2.30/config.sub 2019-03-07 14:53:14.241881286 +0000 +@@ -293,6 +293,7 @@ case $basic_machine in + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ ++ | nfp \ + | nios | nios2 | nios2eb | nios2el \ + | ns16k | ns32k \ + | open8 | or1k | or1knd | or32 \ +diff -rup binutils.orig/include/dis-asm.h binutils-2.30/include/dis-asm.h +--- binutils.orig/include/dis-asm.h 2019-03-07 13:21:14.298464411 +0000 ++++ binutils-2.30/include/dis-asm.h 2019-03-07 14:44:05.716268317 +0000 +@@ -255,6 +255,7 @@ extern disassembler_ftype cris_get_disas + extern void print_aarch64_disassembler_options (FILE *); + extern void print_i386_disassembler_options (FILE *); + extern void print_mips_disassembler_options (FILE *); ++extern void print_nfp_disassembler_options (FILE *); + extern void print_ppc_disassembler_options (FILE *); + extern void print_riscv_disassembler_options (FILE *); + extern void print_arm_disassembler_options (FILE *); +diff -rup binutils.orig/include/elf/common.h binutils-2.30/include/elf/common.h +--- binutils.orig/include/elf/common.h 2019-03-07 13:21:14.295464435 +0000 ++++ binutils-2.30/include/elf/common.h 2019-03-07 14:44:05.716268317 +0000 +@@ -338,6 +338,7 @@ + #define EM_RISCV 243 /* RISC-V */ + #define EM_LANAI 244 /* Lanai 32-bit processor. */ + #define EM_BPF 247 /* Linux BPF – in-kernel virtual machine. */ ++#define EM_NFP 250 /* Netronome Flow Processor. */ + + /* If it is necessary to assign new unofficial EM_* values, please pick large + random numbers (0x8523, 0xa7f2, etc.) to minimize the chances of collision +diff -rup binutils.orig/opcodes/configure binutils-2.30/opcodes/configure +--- binutils.orig/opcodes/configure 2019-03-07 13:21:13.445471036 +0000 ++++ binutils-2.30/opcodes/configure 2019-03-07 14:44:05.718268301 +0000 +@@ -12700,6 +12700,7 @@ if test x${all_targets} = xfalse ; then + bfd_mt_arch) ta="$ta mt-asm.lo mt-desc.lo mt-dis.lo mt-ibld.lo mt-opc.lo" using_cgen=yes ;; + bfd_msp430_arch) ta="$ta msp430-dis.lo msp430-decode.lo" ;; + bfd_nds32_arch) ta="$ta nds32-asm.lo nds32-dis.lo" ;; ++ bfd_nfp_arch) ta="$ta nfp-dis.lo" ;; + bfd_nios2_arch) ta="$ta nios2-dis.lo nios2-opc.lo" ;; + bfd_ns32k_arch) ta="$ta ns32k-dis.lo" ;; + bfd_or1k_arch) ta="$ta or1k-asm.lo or1k-desc.lo or1k-dis.lo or1k-ibld.lo or1k-opc.lo" using_cgen=yes ;; +diff -rup binutils.orig/opcodes/configure.ac binutils-2.30/opcodes/configure.ac +--- binutils.orig/opcodes/configure.ac 2019-03-07 13:21:13.445471036 +0000 ++++ binutils-2.30/opcodes/configure.ac 2019-03-07 14:44:05.718268301 +0000 +@@ -300,6 +300,7 @@ if test x${all_targets} = xfalse ; then + bfd_mt_arch) ta="$ta mt-asm.lo mt-desc.lo mt-dis.lo mt-ibld.lo mt-opc.lo" using_cgen=yes ;; + bfd_msp430_arch) ta="$ta msp430-dis.lo msp430-decode.lo" ;; + bfd_nds32_arch) ta="$ta nds32-asm.lo nds32-dis.lo" ;; ++ bfd_nfp_arch) ta="$ta nfp-dis.lo" ;; + bfd_nios2_arch) ta="$ta nios2-dis.lo nios2-opc.lo" ;; + bfd_ns32k_arch) ta="$ta ns32k-dis.lo" ;; + bfd_or1k_arch) ta="$ta or1k-asm.lo or1k-desc.lo or1k-dis.lo or1k-ibld.lo or1k-opc.lo" using_cgen=yes ;; +diff -rup binutils.orig/opcodes/disassemble.c binutils-2.30/opcodes/disassemble.c +--- binutils.orig/opcodes/disassemble.c 2019-03-07 13:21:13.438471090 +0000 ++++ binutils-2.30/opcodes/disassemble.c 2019-03-07 14:44:05.718268301 +0000 +@@ -69,6 +69,7 @@ + #define ARCH_mt + #define ARCH_msp430 + #define ARCH_nds32 ++#define ARCH_nfp + #define ARCH_nios2 + #define ARCH_ns32k + #define ARCH_or1k +@@ -306,6 +307,11 @@ disassembler (enum bfd_architecture a, + disassemble = print_insn_nds32; + break; + #endif ++#ifdef ARCH_nfp ++ case bfd_arch_nfp: ++ disassemble = print_insn_nfp; ++ break; ++#endif + #ifdef ARCH_ns32k + case bfd_arch_ns32k: + disassemble = print_insn_ns32k; +@@ -576,6 +582,9 @@ disassembler_usage (FILE *stream ATTRIBU + #ifdef ARCH_mips + print_mips_disassembler_options (stream); + #endif ++#ifdef ARCH_nfp ++ print_nfp_disassembler_options (stream); ++#endif + #ifdef ARCH_powerpc + print_ppc_disassembler_options (stream); + #endif +diff -rup binutils.orig/opcodes/disassemble.h binutils-2.30/opcodes/disassemble.h +--- binutils.orig/opcodes/disassemble.h 2019-03-07 13:21:13.444471043 +0000 ++++ binutils-2.30/opcodes/disassemble.h 2019-03-07 14:44:05.718268301 +0000 +@@ -77,6 +77,7 @@ extern int print_insn_moxie (bfd_vma, d + extern int print_insn_msp430 (bfd_vma, disassemble_info *); + extern int print_insn_mt (bfd_vma, disassemble_info *); + extern int print_insn_nds32 (bfd_vma, disassemble_info *); ++extern int print_insn_nfp (bfd_vma, disassemble_info *); + extern int print_insn_ns32k (bfd_vma, disassemble_info *); + extern int print_insn_or1k (bfd_vma, disassemble_info *); + extern int print_insn_pdp11 (bfd_vma, disassemble_info *); +diff -rup binutils.orig/opcodes/Makefile.am binutils-2.30/opcodes/Makefile.am +--- binutils.orig/opcodes/Makefile.am 2019-03-07 13:21:13.445471036 +0000 ++++ binutils-2.30/opcodes/Makefile.am 2019-03-07 14:44:05.717268309 +0000 +@@ -209,6 +209,7 @@ TARGET_LIBOPCODES_CFILES = \ + mt-opc.c \ + nds32-asm.c \ + nds32-dis.c \ ++ nfp-dis.c \ + nios2-dis.c \ + nios2-opc.c \ + ns32k-dis.c \ +diff -rup binutils.orig/opcodes/Makefile.in binutils-2.30/opcodes/Makefile.in +--- binutils.orig/opcodes/Makefile.in 2019-03-07 13:21:13.426471183 +0000 ++++ binutils-2.30/opcodes/Makefile.in 2019-03-07 14:44:05.717268309 +0000 +@@ -511,6 +511,7 @@ TARGET_LIBOPCODES_CFILES = \ + mt-opc.c \ + nds32-asm.c \ + nds32-dis.c \ ++ nfp-dis.c \ + nios2-dis.c \ + nios2-opc.c \ + ns32k-dis.c \ +@@ -920,6 +921,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mt-opc.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nds32-asm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nds32-dis.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nfp-dis.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nios2-dis.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nios2-opc.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ns32k-dis.Plo@am__quote@ +--- /dev/null 2019-03-07 09:27:55.425999321 +0000 ++++ binutils-2.30/bfd/cpu-nfp.c 2019-03-07 14:44:05.706268397 +0000 +@@ -0,0 +1,62 @@ ++/* BFD library support routines for the NFP. ++ Copyright (C) 2017 Free Software Foundation, Inc. ++ Contributed by Francois H. Theron ++ ++ This file is part of BFD, the Binary File Descriptor library. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, ++ MA 02110-1301, USA. */ ++ ++#include "sysdep.h" ++#include "bfd.h" ++#include "libbfd.h" ++ ++static const bfd_arch_info_type * ++bfd_nfp_compatible (const bfd_arch_info_type * a, ++ const bfd_arch_info_type * b) ++{ ++ if (a->arch != b->arch) ++ return NULL; ++ ++ if (a->mach != b->mach) ++ return NULL; ++ ++ return a; ++} ++ ++#define N(machine, print, default, next) \ ++{ \ ++ 32, \ ++ 64, \ ++ 8, \ ++ bfd_arch_nfp, \ ++ machine, \ ++ "nfp", \ ++ print, \ ++ 3, \ ++ default, \ ++ bfd_nfp_compatible, \ ++ bfd_default_scan, \ ++ bfd_arch_default_fill, \ ++ next \ ++} ++ ++static const bfd_arch_info_type arch_info_struct[] = ++{ ++ N (bfd_mach_nfp3200, "NFP-32xx", FALSE, NULL) ++}; ++ ++const bfd_arch_info_type bfd_nfp_arch = ++ N (bfd_mach_nfp6000, "NFP-6xxx", TRUE, &arch_info_struct[0]); +--- /dev/null 2019-03-07 09:27:55.425999321 +0000 ++++ binutils-2.30/bfd/elf64-nfp.c 2019-03-07 14:44:05.706268397 +0000 +@@ -0,0 +1,276 @@ ++/* NFP-specific support for 64-bit ELF ++ Copyright (C) 2017-2018 Free Software Foundation, Inc. ++ Contributed by Francois H. Theron ++ ++ This file is part of BFD, the Binary File Descriptor library. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 51 Franklin Street - Fifth Floor, ++ Boston, MA 02110-1301, USA. */ ++ ++#include "sysdep.h" ++#include "bfd.h" ++#include "libbfd.h" ++#include "elf-bfd.h" ++#include "elf/nfp.h" ++#include "bfd_stdint.h" ++ ++ ++static bfd_reloc_status_type ++elf64_nfp_reloc (bfd * abfd ATTRIBUTE_UNUSED, ++ arelent * reloc_entry, ++ asymbol * symbol, ++ void *data ATTRIBUTE_UNUSED, ++ asection * input_section, ++ bfd * output_bfd, ++ char **error_message ATTRIBUTE_UNUSED); ++ ++/* We don't actually apply any relocations in this toolset ++ so we make them all do nothing, but at least display useful ++ names. ++ Most of these are mainly used by the NFP toolchain to resolve things ++ before the final ELF file is created. */ ++static reloc_howto_type elf_nfp_howto_table[] = ++{ ++ HOWTO (R_NFP_NOTYPE, /* Type. */ ++ 0, /* Rightshift. */ ++ 3, /* Size. */ ++ 0, /* Bitsize. */ ++ FALSE, /* PC_relative. */ ++ 0, /* Bitpos. */ ++ complain_overflow_dont,/* Complain_on_overflow. */ ++ elf64_nfp_reloc, /* Special_function. */ ++ "R_NFP_NOTYPE", /* Name. */ ++ FALSE, /* Partial_inplace. */ ++ 0, /* Src_mask. */ ++ 0, /* Dst_mask. */ ++ FALSE), /* PCrel_offset. */ ++ HOWTO (R_NFP_W32LE, 0, 3, 0, FALSE, 0, ++ complain_overflow_dont, elf64_nfp_reloc, ++ "R_NFP_W32LE", ++ FALSE, 0, 0, FALSE), ++ HOWTO (R_NFP_SRC8_A, 0, 3, 0, FALSE, 0, ++ complain_overflow_dont, elf64_nfp_reloc, ++ "R_NFP_SRC8_A", ++ FALSE, 0, 0, FALSE), ++ HOWTO (R_NFP_SRC8_B, 0, 3, 0, FALSE, 0, ++ complain_overflow_dont, elf64_nfp_reloc, ++ "R_NFP_SRC8_B", ++ FALSE, 0, 0, FALSE), ++ HOWTO (R_NFP_IMMED8_I, 0, 3, 0, FALSE, 0, ++ complain_overflow_dont, elf64_nfp_reloc, ++ "R_NFP_IMMED8_I", ++ FALSE, 0, 0, FALSE), ++ HOWTO (R_NFP_SC, 0, 3, 0, FALSE, 0, ++ complain_overflow_dont, elf64_nfp_reloc, ++ "R_NFP_SC", ++ FALSE, 0, 0, FALSE), ++ HOWTO (R_NFP_IMMED_LO16_I_A, 0, 3, 0, FALSE, 0, ++ complain_overflow_dont, elf64_nfp_reloc, ++ "R_NFP_IMMED_LO16_I_A", ++ FALSE, 0, 0, FALSE), ++ HOWTO (R_NFP_IMMED_LO16_I_B, 0, 3, 0, FALSE, 0, ++ complain_overflow_dont, elf64_nfp_reloc, ++ "R_NFP_IMMED_LO16_I_B", ++ TRUE, 0, 0, FALSE), ++ HOWTO (R_NFP_SRC7_B, 0, 3, 0, FALSE, 0, ++ complain_overflow_dont, elf64_nfp_reloc, ++ "R_NFP_SRC7_B", ++ FALSE, 0, 0, FALSE), ++ HOWTO (R_NFP_SRC7_A, 0, 3, 0, FALSE, 0, ++ complain_overflow_dont, elf64_nfp_reloc, ++ "R_NFP_SRC7_A", ++ FALSE, 0, 0, FALSE), ++ HOWTO (R_NFP_SRC8_I_B, 0, 3, 0, FALSE, 0, ++ complain_overflow_dont, elf64_nfp_reloc, ++ "R_NFP_SRC8_I_B", ++ FALSE, 0, 0, FALSE), ++ HOWTO (R_NFP_SRC8_I_A, 0, 3, 0, FALSE, 0, ++ complain_overflow_dont, elf64_nfp_reloc, ++ "R_NFP_SRC8_I_A", ++ FALSE, 0, 0, FALSE), ++ HOWTO (R_NFP_IMMED_HI16_I_A, 0, 3, 0, FALSE, 0, ++ complain_overflow_dont, elf64_nfp_reloc, ++ "R_NFP_IMMED_HI16_I_A", ++ FALSE, 0, 0, FALSE), ++ HOWTO (R_NFP_IMMED_HI16_I_B, 0, 3, 0, FALSE, 0, ++ complain_overflow_dont, elf64_nfp_reloc, ++ "R_NFP_IMMED_HI16_I_B", ++ FALSE, 0, 0, FALSE), ++ HOWTO (R_NFP_W64LE, 0, 3, 0, FALSE, 0, ++ complain_overflow_dont, elf64_nfp_reloc, ++ "R_NFP_W64LE", ++ FALSE, 0, 0, FALSE), ++ HOWTO (R_NFP_SH_INFO, 0, 3, 0, FALSE, 0, ++ complain_overflow_dont, elf64_nfp_reloc, ++ "R_NFP_SH_INFO", ++ FALSE, 0, 0, FALSE), ++ HOWTO (R_NFP_W32BE, 0, 3, 0, FALSE, 0, ++ complain_overflow_dont, elf64_nfp_reloc, ++ "R_NFP_W32BE", ++ FALSE, 0, 0, FALSE), ++ HOWTO (R_NFP_W64BE, 0, 3, 0, FALSE, 0, ++ complain_overflow_dont, elf64_nfp_reloc, ++ "R_NFP_W64BE", ++ FALSE, 0, 0, FALSE), ++ HOWTO (R_NFP_W32_29_24, 0, 3, 0, FALSE, 0, ++ complain_overflow_dont, elf64_nfp_reloc, ++ "R_NFP_W32_29_24", ++ FALSE, 0, 0, FALSE), ++ HOWTO (R_NFP_W32LE_AND, 0, 3, 0, FALSE, 0, ++ complain_overflow_dont, elf64_nfp_reloc, ++ "R_NFP_W32LE_AND", ++ FALSE, 0, 0, FALSE), ++ HOWTO (R_NFP_W32BE_AND, 0, 3, 0, FALSE, 0, ++ complain_overflow_dont, elf64_nfp_reloc, ++ "R_NFP_W32BE_AND", ++ FALSE, 0, 0, FALSE), ++ HOWTO (R_NFP_W32LE_OR, 0, 3, 0, FALSE, 0, ++ complain_overflow_dont, elf64_nfp_reloc, ++ "R_NFP_W32LE_OR", ++ FALSE, 0, 0, FALSE), ++ HOWTO (R_NFP_W32BE_OR, 0, 3, 0, FALSE, 0, ++ complain_overflow_dont, elf64_nfp_reloc, ++ "R_NFP_W32BE_OR", ++ FALSE, 0, 0, FALSE), ++ HOWTO (R_NFP_W64LE_AND, 0, 3, 0, FALSE, 0, ++ complain_overflow_dont, elf64_nfp_reloc, ++ "R_NFP_W64LE_AND", ++ FALSE, 0, 0, FALSE), ++ HOWTO (R_NFP_W64BE_AND, 0, 3, 0, FALSE, 0, ++ complain_overflow_dont, elf64_nfp_reloc, ++ "R_NFP_W64BE_AND", ++ FALSE, 0, 0, FALSE), ++ HOWTO (R_NFP_W64LE_OR, 0, 3, 0, FALSE, 0, ++ complain_overflow_dont, elf64_nfp_reloc, ++ "R_NFP_W64LE_OR", ++ FALSE, 0, 0, FALSE), ++ HOWTO (R_NFP_W64BE_OR, 0, 3, 0, FALSE, 0, ++ complain_overflow_dont, elf64_nfp_reloc, ++ "R_NFP_W64BE_OR", ++ FALSE, 0, 0, FALSE) ++}; ++ ++static bfd_boolean ++elf64_nfp_object_p (bfd * abfd) ++{ ++ /* If the e_machine value is one of the unofficial ones, we convert ++ it first and set e_flags accordingly for later consistency. */ ++ if (elf_elfheader (abfd)->e_machine == E_NFP_MACH_3200) ++ { ++ elf_elfheader (abfd)->e_machine = EM_NFP; ++ elf_elfheader (abfd)->e_flags &= ~EF_NFP_SET_MACH (~0); ++ elf_elfheader (abfd)->e_flags |= EF_NFP_SET_MACH (E_NFP_MACH_3200); ++ } ++ else if (elf_elfheader (abfd)->e_machine == E_NFP_MACH_6000) ++ { ++ elf_elfheader (abfd)->e_machine = EM_NFP; ++ elf_elfheader (abfd)->e_flags &= ~EF_NFP_SET_MACH (~0); ++ elf_elfheader (abfd)->e_flags |= EF_NFP_SET_MACH (E_NFP_MACH_6000); ++ } ++ ++ if (elf_elfheader (abfd)->e_machine == EM_NFP) ++ { ++ int e_mach = EF_NFP_MACH (elf_elfheader (abfd)->e_flags); ++ ++ switch (e_mach) ++ { ++ case E_NFP_MACH_3200: ++ case E_NFP_MACH_6000: ++ if (!bfd_default_set_arch_mach (abfd, bfd_arch_nfp, e_mach)) ++ return FALSE; ++ default: ++ break; ++ } ++ } ++ ++ return TRUE; ++} ++ ++static bfd_boolean ++elf64_nfp_section_from_shdr (bfd * abfd, ++ Elf_Internal_Shdr * hdr, ++ const char *name, int shindex) ++{ ++ switch (hdr->sh_type) ++ { ++ case SHT_NFP_INITREG: ++ case SHT_NFP_MECONFIG: ++ case SHT_NFP_UDEBUG: ++ return _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex); ++ default: ++ return FALSE; ++ } ++} ++ ++bfd_reloc_status_type ++elf64_nfp_reloc (bfd * abfd ATTRIBUTE_UNUSED, ++ arelent * reloc_entry ATTRIBUTE_UNUSED, ++ asymbol * symbol ATTRIBUTE_UNUSED, ++ void *data ATTRIBUTE_UNUSED, ++ asection * input_section ATTRIBUTE_UNUSED, ++ bfd * output_bfd ATTRIBUTE_UNUSED, ++ char **error_message ATTRIBUTE_UNUSED) ++{ ++ return bfd_reloc_ok; ++} ++ ++static bfd_boolean ++elf64_nfp_info_to_howto (bfd * abfd ATTRIBUTE_UNUSED, ++ arelent * cache_ptr, Elf_Internal_Rela * dst) ++{ ++ unsigned int r_type; ++ ++ r_type = ELF64_R_TYPE (dst->r_info); ++ if (r_type >= R_NFP_MAX) ++ { ++ /* xgettext:c-format */ ++ _bfd_error_handler (_("%pB: unsupported relocation type %#x"), ++ abfd, r_type); ++ bfd_set_error (bfd_error_bad_value); ++ return FALSE; ++ } ++ cache_ptr->howto = &elf_nfp_howto_table[r_type]; ++ return TRUE; ++} ++ ++static reloc_howto_type * ++elf64_nfp_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED, ++ bfd_reloc_code_real_type code ATTRIBUTE_UNUSED) ++{ ++ return NULL; ++} ++ ++static reloc_howto_type * ++elf64_nfp_reloc_name_lookup (bfd * abfd ATTRIBUTE_UNUSED, ++ const char *r_name ATTRIBUTE_UNUSED) ++{ ++ return NULL; ++} ++ ++#define ELF_ARCH bfd_arch_nfp ++#define ELF_MACHINE_CODE EM_NFP ++#define ELF_MACHINE_ALT1 E_NFP_MACH_6000 ++#define ELF_MACHINE_ALT2 E_NFP_MACH_3200 ++#define ELF_MAXPAGESIZE 1 ++#define TARGET_LITTLE_NAME "elf64-nfp" ++#define TARGET_LITTLE_SYM nfp_elf64_vec ++ ++#define elf_backend_object_p elf64_nfp_object_p ++#define elf_backend_section_from_shdr elf64_nfp_section_from_shdr ++#define elf_info_to_howto elf64_nfp_info_to_howto ++#define bfd_elf64_bfd_reloc_type_lookup elf64_nfp_reloc_type_lookup ++#define bfd_elf64_bfd_reloc_name_lookup elf64_nfp_reloc_name_lookup ++ ++#include "elf64-target.h" +--- /dev/null 2019-03-07 09:27:55.425999321 +0000 ++++ binutils-2.30/binutils/testsuite/binutils-all/nfp/objdump.exp 2019-03-07 14:44:05.715268325 +0000 +@@ -0,0 +1,52 @@ ++# Copyright (C) 2004-2018 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. ++ ++if {![istarget nfp*-*-*]} { ++ return ++} ++ ++if {![is_remote host] && [which $OBJDUMP] == 0} then { ++ perror "$OBJDUMP does not exist" ++ return ++} ++ ++send_user "Version [binutil_version $OBJDUMP]" ++ ++set outfile "tmpdir/dump.out" ++ ++set testname "NFP dissasembler NFP-6xxx instructions" ++set dumpfile "$srcdir/$subdir/test1.d" ++remote_exec host "${OBJDUMP} -d $srcdir/$subdir/test1_nfp6000.nffw" "" "/dev/null" "$outfile" ++if { [regexp_diff "${outfile}" "${dumpfile}"] } then { ++ fail $testname ++ return ++} ++ ++set testname "NFP dissasembler options: no-pc,ctx4" ++set dumpfile "$srcdir/$subdir/test2_no-pc_ctx4.d" ++remote_exec host "${OBJDUMP} -M no-pc,ctx4 -d $srcdir/$subdir/test2_nfp6000.nffw" "" "/dev/null" "$outfile" ++if { [regexp_diff "${outfile}" "${dumpfile}"] } then { ++ fail $testname ++ return ++} ++ ++set testname "NFP dissasembler options: ctx8" ++set dumpfile "$srcdir/$subdir/test2_ctx8.d" ++remote_exec host "${OBJDUMP} -M ctx8 -d $srcdir/$subdir/test2_nfp6000.nffw" "" "/dev/null" "$outfile" ++if { [regexp_diff "${outfile}" "${dumpfile}"] } then { ++ fail $testname ++ return ++} +--- /dev/null 2019-03-07 09:27:55.425999321 +0000 ++++ binutils-2.30/binutils/testsuite/binutils-all/nfp/test1.d 2019-03-07 14:47:35.561586781 +0000 +@@ -0,0 +1,997 @@ ++ ++.*: file format elf64-nfp ++ ++ ++Disassembly of section \.text\.i32\.me0: ++ ++0000000000000000 <\.text\.i32\.me0>: ++ 0: 000540f0012cd000 \.0 immed\[gprA_0, 0x1234\] ++ 8: 0002c0f0012cd280 \.1 immed\[n\$reg_0, 0x1234\] ++ 10: 000220f0012cd281 \.2 immed\[n\$reg_1, 0x1234\] ++ 18: 000660f0012cd200 \.3 immed\[\*l\$index0, 0x1234\] ++ 20: 0007c0f0012cd220 \.4 immed\[\*l\$index1, 0x1234\] ++ 28: 000fa0f0012cd230 \.5 immed\[\*l\$index1\+\+, 0x1234\] ++ 30: 000f40f0012cd231 \.6 immed\[\*l\$index1--, 0x1234\] ++ 38: 0008c8f0012cd200 \.7 immed\[\*l\$index2, 0x1234\] ++ 40: 0000a8f0012cd210 \.8 immed\[\*l\$index2\+\+, 0x1234\] ++ 48: 000048f0012cd211 \.9 immed\[\*l\$index2--, 0x1234\] ++ 50: 000968f0012cd220 \.10 immed\[\*l\$index3, 0x1234\] ++ 58: 0007e0f0012cd203 \.11 immed\[\*l\$index0\[3\], 0x1234\] ++ 60: 000540f0012cd225 \.12 immed\[\*l\$index1\[5\], 0x1234\] ++ 68: 000b28f0012cd207 \.13 immed\[\*l\$index2\[7\], 0x1234\] ++ 70: 000de8f0012cd229 \.14 immed\[\*l\$index3\[9\], 0x1234\] ++ 78: 000000f00ff003ff \.15 immed\[gprB_0, 0xffff\] ++ 80: 000d60f220000bff \.16 immed_b1\[gprB_2, 0xff\] ++ 88: 000f60f6200007ff \.17 immed_b3\[gprB_1, 0xff\] ++ 90: 000080f080000f00 \.18 immed\[gprB_3, 0xffffffff\] ++ 98: 000100f086600f77 \.19 immed\[gprB_3, 0xffff9988\] ++ a0: 000940f0012cd180 \.20 immed\[\$xfer_0, 0x1234\] ++ a8: 000a00f0043c8581 \.21 immed\[\$xfer_1, 0x4321\] ++ b0: 000180f0056de1ce \.22 immed\[\$xfer_30, 0x5678\] ++ b8: 0007c0f0400e8401 \.23 immed_w0\[gprA_1, 0xa1\] ++ c0: 000440f4400e8802 \.24 immed_w1\[gprA_2, 0xa2\] ++ c8: 000d00f4000e8c03 \.25 immed\[gprA_3, 0xa3, <<16\] ++ d0: 000520f001200334 \.26 immed\[gprB_0, 0x1234\] ++ d8: 000fa0f0400007b1 \.27 immed_w0\[gprB_1, 0xb1\] ++ e0: 000c20f440000bb2 \.28 immed_w1\[gprB_2, 0xb2\] ++ e8: 000560f400000fb3 \.29 immed\[gprB_3, 0xb3, <<16\] ++ f0: 000660f200000fb3 \.30 immed\[gprB_3, 0xb3, <<8\] ++ f8: 0001b0f200000fb3 \.31 immed\[gprB_3, 0xb3, <<8\], predicate_cc ++ 100: 0001c2f200000fb3 \.32 immed\[gprB_3, 0xb3, <<8\], gpr_wrboth ++ 108: 000ba0a0300c2f00 \.33 alu\[--, --, B, 0xb\] ++ 110: 0005a081f200da00 \.34 alu_shf\[--, --, B, 0x16, <<1\] ++ 118: 000be081d2018600 \.35 alu_shf\[--, --, B, 0x21, <<3\] ++ 120: 000240801201b200 \.36 alu_shf\[--, --, B, 0x2c, <<31\] ++ 128: 000fa081f800da00 \.37 alu_shf\[\$xfer_0, --, B, 0x16, <<1\] ++ 130: 0009e081f840da00 \.38 alu_shf\[\$xfer_4, --, B, 0x16, <<1\] ++ 138: 00006081fc80da00 \.39 alu_shf\[\$xfer_24, --, B, 0x16, <<1\] ++ 140: 000a2081fcf0da00 \.40 alu_shf\[\$xfer_31, --, B, 0x16, <<1\] ++ 148: 0004a0a0280c2f00 \.41 alu\[n\$reg_0, --, B, 0xb\] ++ 150: 0001e0a0281c2f00 \.42 alu\[n\$reg_1, --, B, 0xb\] ++ 158: 000880a0a00c2400 \.43 alu\[\*l\$index0, gprA_0, \+, 0x9\] ++ 160: 000100a0a43c2400 \.44 alu\[\*n\$index\+\+, gprA_0, \+, 0x9\] ++ 168: 000b208bc500a600 \.45 alu_shf\[\*l\$index0, gprA_0, OR, 0x9, <<4\] ++ 170: 000b00a0a20c2400 \.46 alu\[\*l\$index1, gprA_0, \+, 0x9\] ++ 178: 000740a0a30c2400 \.47 alu\[\*l\$index1\+\+, gprA_0, \+, 0x9\] ++ 180: 000200a0a31c2400 \.48 alu\[\*l\$index1--, gprA_0, \+, 0x9\] ++ 188: 000628a0a00c2400 \.49 alu\[\*l\$index2, gprA_0, \+, 0x9\] ++ 190: 000988aa210c2400 \.50 alu\[\*l\$index2\+\+, gprA_0, OR, 0x9\] ++ 198: 000f28a0a11c2400 \.51 alu\[\*l\$index2--, gprA_0, \+, 0x9\] ++ 1a0: 0005a8a0a20c2400 \.52 alu\[\*l\$index3, gprA_0, \+, 0x9\] ++ 1a8: 000480a0a03c2400 \.53 alu\[\*l\$index0\[3\], gprA_0, \+, 0x9\] ++ 1b0: 000800a0a25c2400 \.54 alu\[\*l\$index1\[5\], gprA_0, \+, 0x9\] ++ 1b8: 000c68a0a07c2400 \.55 alu\[\*l\$index2\[7\], gprA_0, \+, 0x9\] ++ 1c0: 000aa8a0a29c2400 \.56 alu\[\*l\$index3\[9\], gprA_0, \+, 0x9\] ++ 1c8: 000cc4b0c008a400 \.57 alu\[gprB_0, \*l\$index3\[9\], \+, gprA_0\] ++ 1d0: 000fe4b0c008c000 \.58 alu\[gprB_0, \*l\$index3\+\+, \+, gprA_0\] ++ 1d8: 000ac4b0c008c400 \.59 alu\[gprB_0, \*l\$index3--, \+, gprA_0\] ++ 1e0: 000bc4b080000229 \.60 alu\[gprB_0, \*l\$index3\[9\], \+, gprB_0\] ++ 1e8: 000724b080000230 \.61 alu\[gprB_0, \*l\$index3\+\+, \+, gprB_0\] ++ 1f0: 0007c4b080000231 \.62 alu\[gprB_0, \*l\$index3--, \+, gprB_0\] ++ 1f8: 000664b080000211 \.63 alu\[gprB_0, \*l\$index2--, \+, gprB_0\] ++ 200: 000a60b080000231 \.64 alu\[gprB_0, \*l\$index1--, \+, gprB_0\] ++ 208: 000bc0b080000211 \.65 alu\[gprB_0, \*l\$index0--, \+, gprB_0\] ++ 210: 000340b080000200 \.66 alu\[gprB_0, \*l\$index0, \+, gprB_0\] ++ 218: 000ee4b080000200 \.67 alu\[gprB_0, \*l\$index2, \+, gprB_0\] ++ 220: 000100b080000241 \.68 alu\[gprB_0, \*n\$index, \+, gprB_0\] ++ 228: 0004809bf0000241 \.69 alu_shf\[gprB_0, \*n\$index, OR, gprB_0, <<1\] ++ 230: 000f20a0001fff00 \.70 alu\[gprA_1, --, B, 0xff\] ++ 238: 0005c0b0002fff00 \.71 alu\[gprB_2, --, B, 0xff\] ++ 240: 000940a0000d6f00 \.72 alu\[gprA_0, --, B, 0x5b\] ++ 248: 000440a2000d6f00 \.73 alu\[gprA_0, --, ~B, 0x5b\] ++ 250: 000de081f032f200 \.74 alu_shf\[gprA_3, --, B, 0x5c, <<1\] ++ 258: 000de091d012f600 \.75 alu_shf\[gprB_1, --, B, 0x5d, <<3\] ++ 260: 000d60901022fa00 \.76 alu_shf\[gprB_2, --, B, 0x5e, <<31\] ++ 268: 000e40a0c0000402 \.77 alu\[gprA_0, gprB_1, \+, gprA_2\] ++ 270: 000340a2c0000402 \.78 alu\[gprA_0, gprB_1, \+16, gprA_2\] ++ 278: 000040a4c0000402 \.79 alu\[gprA_0, gprB_1, \+8, gprA_2\] ++ 280: 0007a0a8c0000402 \.80 alu\[gprA_0, gprB_1, \+carry, gprA_2\] ++ 288: 000d40a6c0000402 \.81 alu\[gprA_0, gprB_1, -carry, gprA_2\] ++ 290: 000aa0aac0000402 \.82 alu\[gprA_0, gprB_1, -, gprA_2\] ++ 298: 0009a0acc0000402 \.83 alu\[gprA_0, gprB_1, B-A, gprA_2\] ++ 2a0: 000da0aa40000402 \.84 alu\[gprA_0, gprB_1, OR, gprA_2\] ++ 2a8: 000740a440000402 \.85 alu\[gprA_0, gprB_1, AND, gprA_2\] ++ 2b0: 000a40a640000402 \.86 alu\[gprA_0, gprB_1, ~AND, gprA_2\] ++ 2b8: 0000a0a840000402 \.87 alu\[gprA_0, gprB_1, AND~, gprA_2\] ++ 2c0: 000ea0ac40000402 \.88 alu\[gprA_0, gprB_1, XOR, gprA_2\] ++ 2c8: 000321a0c0000402 \.89 alu\[gprA_0, gprB_1, \+, gprA_2\], no_cc ++ 2d0: 000990a0c0000402 \.90 alu\[gprA_0, gprB_1, \+, gprA_2\], predicate_cc ++ 2d8: 0009e2a0c0000402 \.91 alu\[gprA_0, gprB_1, \+, gprA_2\], gpr_wrboth ++ 2e0: 000353a0c0000402 \.92 alu\[gprA_0, gprB_1, \+, gprA_2\], no_cc, gpr_wrboth, predicate_cc ++ 2e8: 000d418b70080602 \.93 alu_shf\[gprA_0, gprB_1, OR, gprA_2, <<9\], no_cc ++ 2f0: 0006708a90080502 \.94 alu_shf\[gprA_0, gprB_1, OR, gprA_2, >>9\], predicate_cc ++ 2f8: 000ea28a90080402 \.95 alu_shf\[gprA_0, gprB_1, OR, gprA_2, >>rot9\], gpr_wrboth ++ 300: 000e138b70080402 \.96 alu_shf\[gprA_0, gprB_1, OR, gprA_2, >>rot23\], no_cc, gpr_wrboth, predicate_cc ++ 308: 000ba08a00080602 \.97 alu_shf\[gprA_0, gprB_1, OR, gprA_2, <>indirect\] ++ 318: 000ba0a0300c2f00 \.99 alu\[--, --, B, 0xb\] ++ 320: 000ae09d40380101 \.100 asr\[gprB_3, gprA_1, >>20\] ++ 328: 000ba0a0300c2f00 \.101 alu\[--, --, B, 0xb\] ++ 330: 000ea09d40310500 \.102 asr\[gprB_3, \*n\$index, >>20\] ++ 338: 000ba0a0300c2f00 \.103 alu\[--, --, B, 0xb\] ++ 340: 0007a09d40314100 \.104 asr\[gprB_3, \*l\$index0, >>20\] ++ 348: 000ba0a0300c2f00 \.105 alu\[--, --, B, 0xb\] ++ 350: 0000249d40316100 \.106 asr\[gprB_3, \*l\$index3, >>20\] ++ 358: 000ba0a0300c2f00 \.107 alu\[--, --, B, 0xb\] ++ 360: 000a049d40314100 \.108 asr\[gprB_3, \*l\$index2, >>20\] ++ 368: 000ba0a0300c2f00 \.109 alu\[--, --, B, 0xb\] ++ 370: 0004a08d45010d00 \.110 asr\[\*l\$index0, \*n\$index\+\+, >>20\] ++ 378: 000ba0a0300c2f00 \.111 alu\[--, --, B, 0xb\] ++ 380: 000ee08d45810d00 \.112 asr\[\*l\$index1, \*n\$index\+\+, >>20\] ++ 388: 000ba0a0300c2f00 \.113 alu\[--, --, B, 0xb\] ++ 390: 000a088d45010d00 \.114 asr\[\*l\$index2, \*n\$index\+\+, >>20\] ++ 398: 000ba0a0300c2f00 \.115 alu\[--, --, B, 0xb\] ++ 3a0: 0007819d40380101 \.116 asr\[gprB_3, gprA_1, >>20\], no_cc ++ 3a8: 000ba0a0300c2f00 \.117 alu\[--, --, B, 0xb\] ++ 3b0: 000d309d40380101 \.118 asr\[gprB_3, gprA_1, >>20\], predicate_cc ++ 3b8: 000ba0a0300c2f00 \.119 alu\[--, --, B, 0xb\] ++ 3c0: 000ba28d40380101 \.120 asr\[gprA_3, gprA_1, >>20\], gpr_wrboth ++ 3c8: 0008c0d818c08120 \.121 beq\[\.99\] ++ 3d0: 000d00d877c08120 \.122 beq\[\.479\] ++ 3d8: 000440d877e08120 \.123 beq\[\.479\], defer\[2\] ++ 3e0: 000000f0000c0300 \.124 nop ++ 3e8: 000000f0000c0300 \.125 nop ++ 3f0: 000540d877c08021 \.126 bne\[\.479\] ++ 3f8: 0004c0d877c08022 \.127 bmi\[\.479\] ++ 400: 000420d877c08023 \.128 bpl\[\.479\] ++ 408: 0007c0d877c08024 \.129 bcs\[\.479\] ++ 410: 0007c0d877c08024 \.130 bcs\[\.479\] ++ 418: 000720d877c08025 \.131 bcc\[\.479\] ++ 420: 000720d877c08025 \.132 bcc\[\.479\] ++ 428: 0006a0d877c08026 \.133 bvs\[\.479\] ++ 430: 000640d877c08027 \.134 bvc\[\.479\] ++ 438: 0001c0d877c08028 \.135 bge\[\.479\] ++ 440: 000120d877c08029 \.136 blt\[\.479\] ++ 448: 000040d877c0802b \.137 bgt\[\.479\] ++ 450: 0000a0d877c0802a \.138 ble\[\.479\] ++ 458: 000c60d818c08038 \.139 br\[\.99\] ++ 460: 000920d818d08038 \.140 br\[\.99\], defer\[1\] ++ 468: 000000f0000c0300 \.141 nop ++ 470: 000bc0d077c09000 \.142 br_bclr\[gprA_0, 3, \.479\] ++ 478: 000980d077c0e004 \.143 br_bclr\[gprA_4, 23, \.479\] ++ 480: 0002a0d077c0082c \.144 br_bclr\[gprB_2, 11, \.479\] ++ 488: 000300d077c02423 \.145 br_bclr\[gprB_9, 2, \.479\] ++ 490: 000260d077c02421 \.146 br_bclr\[gprB_9, 0, \.479\] ++ 498: 000280d077c02420 \.147 br_bclr\[gprB_9, 31, \.479\] ++ 4a0: 000f00d077f02423 \.148 br_bclr\[gprB_9, 2, \.479\], defer\[3\] ++ 4a8: 000000f0000c0300 \.149 nop ++ 4b0: 000000f0000c0300 \.150 nop ++ 4b8: 000000f0000c0300 \.151 nop ++ 4c0: 000680d077c42c2b \.152 br_bset\[gprB_11, 10, \.479\] ++ 4c8: 0006e0d077c4ac0b \.153 br_bset\[gprA_11, 10, \.479\] ++ 4d0: 0002a0c877d81020 \.154 br=byte\[gprB_4, 0, 0x0, \.479\], defer\[1\] ++ 4d8: 000000f0000c0300 \.155 nop ++ 4e0: 000a60c877c81520 \.156 br=byte\[gprB_5, 1, 0x0, \.479\] ++ 4e8: 0001e0c877c81620 \.157 br=byte\[gprB_5, 2, 0x0, \.479\] ++ 4f0: 0001a4c877c94220 \.158 br=byte\[\*l\$index2, 2, 0x0, \.479\] ++ 4f8: 000620c877c96220 \.159 br=byte\[\*l\$index1, 2, 0x0, \.479\] ++ 500: 000540c877c81b20 \.160 br=byte\[gprB_6, 3, 0x0, \.479\] ++ 508: 0000c0c877cc16ff \.161 br=byte\[gprB_5, 2, 0xff, \.479\] ++ 510: 000420c877c816a2 \.162 br=byte\[gprB_5, 2, 0x42, \.479\] ++ 518: 000380c877c416ff \.163 br!=byte\[gprB_5, 2, 0xff, \.479\] ++ 520: 0002a0c877c01620 \.164 br!=byte\[gprB_5, 2, 0x0, \.479\] ++ 528: 000c20d877c00236 \.165 br_cls_state\[cls_ring0_status, \.479\] ++ 530: 0001a0d877e20236 \.166 br_cls_state\[cls_ring8_status, \.479\], defer\[2\] ++ 538: 000000f0000c0300 \.167 nop ++ 540: 000000f0000c0300 \.168 nop ++ 548: 000be0d877c38236 \.169 br_cls_state\[cls_ring14_status, \.479\] ++ 550: 0007c0d877c3c236 \.170 br_cls_state\[cls_ring15_status, \.479\] ++ 558: 000720d877c3c237 \.171 br_!cls_state\[cls_ring15_status, \.479\] ++ 560: 000cc0d877c00237 \.172 br_!cls_state\[cls_ring0_status, \.479\] ++ 568: 000c00d877c00030 \.173 br=ctx\[0, \.479\] ++ 570: 000dc0d877c08030 \.174 br=ctx\[2, \.479\] ++ 578: 000f00d877c18030 \.175 br=ctx\[6, \.479\] ++ 580: 000a40d877d18030 \.176 br=ctx\[6, \.479\], defer\[1\] ++ 588: 000000f0000c0300 \.177 nop ++ 590: 000d40d877c00234 \.178 br_inp_state\[nn_empty, \.479\] ++ 598: 000160d877c04234 \.179 br_inp_state\[nn_full, \.479\] ++ 5a0: 000c80d877c08234 \.180 br_inp_state\[ctm_ring0_status, \.479\] ++ 5a8: 000100d877e28234 \.181 br_inp_state\[ctm_ring8_status, \.479\], defer\[2\] ++ 5b0: 000000f0000c0300 \.182 nop ++ 5b8: 000000f0000c0300 \.183 nop ++ 5c0: 000a80d877c38234 \.184 br_inp_state\[ctm_ring12_status, \.479\] ++ 5c8: 0006a0d877c3c234 \.185 br_inp_state\[ctm_ring13_status, \.479\] ++ 5d0: 000640d877c3c235 \.186 br_!inp_state\[ctm_ring13_status, \.479\] ++ 5d8: 000c60d877c08235 \.187 br_!inp_state\[ctm_ring0_status, \.479\] ++ 5e0: 000260d877c04232 \.188 br_signal\[1, \.479\] ++ 5e8: 000f80d877c08232 \.189 br_signal\[2, \.479\] ++ 5f0: 0005a0d877c3c232 \.190 br_signal\[15, \.479\] ++ 5f8: 000540d877c3c233 \.191 br_!signal\[15, \.479\] ++ 600: 000b60d877f2c232 \.192 br_signal\[11, \.479\], defer\[3\] ++ 608: 000000f0000c0300 \.193 nop ++ 610: 000000f0000c0300 \.194 nop ++ 618: 000000f0000c0300 \.195 nop ++ 620: 000e40a0c0000402 \.196 alu\[gprA_0, gprB_1, \+, gprA_2\] ++ 628: 0004408e02081200 \.197 byte_align_le\[--, gprB_4\] ++ 630: 0008c08e00981200 \.198 byte_align_le\[gprA_9, gprB_4\] ++ 638: 0004c08e00a81200 \.199 byte_align_le\[gprA_10, gprB_4\] ++ 640: 0001808e00b81200 \.200 byte_align_le\[gprA_11, gprB_4\] ++ 648: 000e40a0c0000402 \.201 alu\[gprA_0, gprB_1, \+, gprA_2\] ++ 650: 000c808e02001100 \.202 byte_align_be\[--, gprB_4\] ++ 658: 0000008e00901100 \.203 byte_align_be\[gprA_9, gprB_4\] ++ 660: 000c008e00a01100 \.204 byte_align_be\[gprA_10, gprB_4\] ++ 668: 0009408e00b01100 \.205 byte_align_be\[gprA_11, gprB_4\] ++ 670: 000d80a0300c0300 \.206 alu\[--, --, B, 0x0\] ++ 678: 000400a5b00c0000 \.207 cam_clear ++ 680: 000360bb80900007 \.208 cam_lookup\[gprB_9, gprA_7\] ++ 688: 0003a0bb80900200 \.209 cam_lookup\[gprB_9, \*l\$index0\] ++ 690: 000e04bb80900200 \.210 cam_lookup\[gprB_9, \*l\$index2\] ++ 698: 000f84bb80900203 \.211 cam_lookup\[gprB_9, \*l\$index2\[3\]\] ++ 6a0: 000bc0bb80900210 \.212 cam_lookup\[gprB_9, \*l\$index0\+\+\] ++ 6a8: 000280aba0000241 \.213 cam_lookup\[\*l\$index0, \*n\$index\] ++ 6b0: 000ec0aba1000241 \.214 cam_lookup\[\*l\$index0\+\+, \*n\$index\] ++ 6b8: 000288aba3000243 \.215 cam_lookup\[\*l\$index3\+\+, \*n\$index\+\+\] ++ 6c0: 000aa0aba0200243 \.216 cam_lookup\[\*l\$index0\[2\], \*n\$index\+\+\] ++ 6c8: 000060bb80901407 \.217 cam_lookup\[gprB_9, gprA_7\], lm_addr0\[1\] ++ 6d0: 000060bb80902807 \.218 cam_lookup\[gprB_9, gprA_7\], lm_addr1\[2\] ++ 6d8: 000660bb80907407 \.219 cam_lookup\[gprB_9, gprA_7\], lm_addr2\[3\] ++ 6e0: 000660bb80904807 \.220 cam_lookup\[gprB_9, gprA_7\], lm_addr3\[0\] ++ 6e8: 000222ab80900007 \.221 cam_lookup\[gprA_9, gprA_7\], gpr_wrboth ++ 6f0: 0004b0bb80900007 \.222 cam_lookup\[gprB_9, gprA_7\], predicate_cc ++ 6f8: 000a00a7809c0000 \.223 cam_read_tag\[gprA_9, 0x0\] ++ 700: 000da2a7809c0000 \.224 cam_read_tag\[gprA_9, 0x0\], gpr_wrboth ++ 708: 000dd0a7809c0000 \.225 cam_read_tag\[gprA_9, 0x0\], predicate_cc ++ 710: 000900a7809c2800 \.226 cam_read_tag\[gprA_9, 0xa\] ++ 718: 000a00a7809c3c00 \.227 cam_read_tag\[gprA_9, 0xf\] ++ 720: 0003e0af809c0000 \.228 cam_read_state\[gprA_9, 0x0\] ++ 728: 000442af809c0000 \.229 cam_read_state\[gprA_9, 0x0\], gpr_wrboth ++ 730: 000392af809c0000 \.230 cam_read_state\[gprA_9, 0x0\], gpr_wrboth, predicate_cc ++ 738: 0000e0af809c2800 \.231 cam_read_state\[gprA_9, 0xa\] ++ 740: 0003e0af809c3c00 \.232 cam_read_state\[gprA_9, 0xf\] ++ 748: 000920a9f0101700 \.233 cam_write\[0x0, gprB_5, 1\] ++ 750: 000da0a9f01a0300 \.234 cam_write\[0x0, n\$reg_0, 1\] ++ 758: 000e80a9f0190700 \.235 cam_write\[0x0, \*n\$index, 1\] ++ 760: 0004c4a9f0180300 \.236 cam_write\[0x0, \*l\$index2, 1\] ++ 768: 0008e4a9f0184300 \.237 cam_write\[0x0, \*l\$index2\+\+, 1\] ++ 770: 000dc4a9f0184700 \.238 cam_write\[0x0, \*l\$index2--, 1\] ++ 778: 000840a9f0b01704 \.239 cam_write\[0x4, gprB_5, 11\] ++ 780: 000be0a9f0f0170f \.240 cam_write\[0xf, gprB_5, 15\] ++ 788: 0008a0adb01c0000 \.241 cam_write_state\[0x0, 1\] ++ 790: 000d80adb0bc1000 \.242 cam_write_state\[0x4, 11\] ++ 798: 000de0adb0fc3c00 \.243 cam_write_state\[0xf, 15\] ++ 7a0: 0000c0fc142c000d \.244 local_csr_wr\[CRCRemainder, gprA_13\] ++ 7a8: 000d20a918060348 \.245 crc_le\[crc_ccitt, \$xfer_0, \$xfer_0\] ++ 7b0: 000000f0000c0300 \.246 nop ++ 7b8: 000d40a918160748 \.247 crc_le\[crc_ccitt, \$xfer_1, \$xfer_1\] ++ 7c0: 000000f0000c0300 \.248 nop ++ 7c8: 000d40a918260b48 \.249 crc_le\[crc_ccitt, \$xfer_2, \$xfer_2\] ++ 7d0: 000000f0000c0300 \.250 nop ++ 7d8: 000d20a918360f48 \.251 crc_le\[crc_ccitt, \$xfer_3, \$xfer_3\] ++ 7e0: 000000f0000c0300 \.252 nop ++ 7e8: 000000f0000c0300 \.253 nop ++ 7f0: 000000f0000c0300 \.254 nop ++ 7f8: 000000f0000c0300 \.255 nop ++ 800: 000000f0000c0300 \.256 nop ++ 808: 000f60fc140c0000 \.257 local_csr_rd\[CRCRemainder\] ++ 810: 000ce0f0000c000e \.258 immed\[gprA_14, 0x0\] ++ 818: 000940a918060340 \.259 crc_be\[crc_ccitt, \$xfer_0, \$xfer_0\] ++ 820: 000000f0000c0300 \.260 nop ++ 828: 000920a918461340 \.261 crc_be\[crc_ccitt, \$xfer_4, \$xfer_4\] ++ 830: 000000f0000c0300 \.262 nop ++ 838: 000060a900061340 \.263 crc_be\[crc_ccitt, gprA_0, \$xfer_4\] ++ 840: 000000f0000c0300 \.264 nop ++ 848: 000c60a900001340 \.265 crc_be\[crc_ccitt, gprA_0, gprB_4\] ++ 850: 000000f0000c0300 \.266 nop ++ 858: 000000f0000c0300 \.267 nop ++ 860: 000000f0000c0300 \.268 nop ++ 868: 000000f0000c0300 \.269 nop ++ 870: 000000f0000c0300 \.270 nop ++ 878: 000600a918260380 \.271 crc_be\[crc_32, \$xfer_2, \$xfer_0\] ++ 880: 000000f0000c0300 \.272 nop ++ 888: 0004c0a9183613a0 \.273 crc_be\[crc_iscsi, \$xfer_3, \$xfer_4\] ++ 890: 000000f0000c0300 \.274 nop ++ 898: 0004c0a9000613c0 \.275 crc_be\[crc_10, gprA_0, \$xfer_4\] ++ 8a0: 000000f0000c0300 \.276 nop ++ 8a8: 000960a9000013e0 \.277 crc_be\[crc_5, gprA_0, gprB_4\] ++ 8b0: 000000f0000c0300 \.278 nop ++ 8b8: 000ea0a918862700 \.279 crc_be\[--, \$xfer_8, \$xfer_9\] ++ 8c0: 000000f0000c0300 \.280 nop ++ 8c8: 000240a918760784 \.281 crc_be\[crc_32, \$xfer_7, \$xfer_1\], bytes_0_2 ++ 8d0: 000000f0000c0300 \.282 nop ++ 8d8: 0002a0a918760785 \.283 crc_be\[crc_32, \$xfer_7, \$xfer_1\], bytes_0_1 ++ 8e0: 000000f0000c0300 \.284 nop ++ 8e8: 000320a918760786 \.285 crc_be\[crc_32, \$xfer_7, \$xfer_1\], byte_0 ++ 8f0: 000000f0000c0300 \.286 nop ++ 8f8: 0000c0a918760781 \.287 crc_be\[crc_32, \$xfer_7, \$xfer_1\], bytes_1_3 ++ 900: 000000f0000c0300 \.288 nop ++ 908: 000140a918760782 \.289 crc_be\[crc_32, \$xfer_7, \$xfer_1\], bytes_2_3 ++ 910: 000000f0000c0300 \.290 nop ++ 918: 0001a0a918760783 \.291 crc_be\[crc_32, \$xfer_7, \$xfer_1\], byte_3 ++ 920: 000000f0000c0300 \.292 nop ++ 928: 000782a900160780 \.293 crc_be\[crc_32, gprA_1, \$xfer_1\], gpr_wrboth ++ 930: 000000f0000c0300 \.294 nop ++ 938: 000ae3a900160780 \.295 crc_be\[crc_32, gprA_1, \$xfer_1\], no_cc, gpr_wrboth ++ 940: 000000f0000c0300 \.296 nop ++ 948: 000b73a900560780 \.297 crc_be\[crc_32, gprA_5, \$xfer_1\], no_cc, gpr_wrboth, predicate_cc ++ 950: 000000f0000c0300 \.298 nop ++ 958: 000122a900560781 \.299 crc_be\[crc_32, gprA_5, \$xfer_1\], bytes_1_3, gpr_wrboth ++ 960: 000000f0000c0300 \.300 nop ++ 968: 000000f0000c0300 \.301 nop ++ 970: 000000f0000c0300 \.302 nop ++ 978: 000000f0000c0300 \.303 nop ++ 980: 000000f0000c0300 \.304 nop ++ 988: 000000f0000c0300 \.305 nop ++ 990: 0005a0e000080000 \.306 ctx_arb\[--\] ++ 998: 000600e000000001 \.307 ctx_arb\[voluntary\] ++ 9a0: 000220e000020000 \.308 ctx_arb\[bpt\] ++ 9a8: 000460e000000220 \.309 ctx_arb\[sig5, sig9\] ++ 9b0: 000d20e000200220 \.310 ctx_arb\[sig5, sig9\], defer\[2\] ++ 9b8: 000180a0300c0f00 \.311 alu\[--, --, B, 0x3\] ++ 9c0: 0007a0a0300c1f00 \.312 alu\[--, --, B, 0x7\] ++ 9c8: 0006a0e000010220 \.313 ctx_arb\[sig5, sig9\], any ++ 9d0: 000a60e077c40220 \.314 ctx_arb\[sig5, sig9\], br\[\.479\] ++ 9d8: 0006409010500701 \.315 dbl_shf\[gprB_5, gprA_1, gprB_1, >>1\] ++ 9e0: 000d4090a0500701 \.316 dbl_shf\[gprB_5, gprA_1, gprB_1, >>10\] ++ 9e8: 000c4091f0500701 \.317 dbl_shf\[gprB_5, gprA_1, gprB_1, >>31\] ++ 9f0: 000740a440000402 \.318 alu\[gprA_0, gprB_1, AND, gprA_2\] ++ 9f8: 0000c09000500701 \.319 dbl_shf\[gprB_5, gprA_1, gprB_1, >>indirect\] ++ a00: 000b219010500701 \.320 dbl_shf\[gprB_5, gprA_1, gprB_1, >>1\], no_cc ++ a08: 000cf19010500701 \.321 dbl_shf\[gprB_5, gprA_1, gprB_1, >>1\], no_cc, predicate_cc ++ a10: 0000d28010500701 \.322 dbl_shf\[gprA_5, gprA_1, gprB_1, >>1\], gpr_wrboth, predicate_cc ++ a18: 000200a700f03f00 \.323 ffs\[gprA_15, gprB_15\] ++ a20: 000fe0b740fc000f \.324 ffs\[gprB_15, gprA_15\] ++ a28: 000ec0b700f61300 \.325 ffs\[gprB_15, \$xfer_4\] ++ a30: 000660b700f88300 \.326 ffs\[gprB_15, \*l\$index1\] ++ a38: 0007e4b700f8c300 \.327 ffs\[gprB_15, \*l\$index3\+\+\] ++ a40: 0002c4b700f8c700 \.328 ffs\[gprB_15, \*l\$index3--\] ++ a48: 0004c4b700f8a700 \.329 ffs\[gprB_15, \*l\$index3\[9\]\] ++ a50: 000880a720000300 \.330 ffs\[\*l\$index0, gprB_0\] ++ a58: 000108a722090700 \.331 ffs\[\*l\$index3, \*n\$index\] ++ a60: 000128a723190f00 \.332 ffs\[\*l\$index3--, \*n\$index\+\+\] ++ a68: 0003c3a740fc000f \.333 ffs\[gprA_15, gprA_15\], no_cc, gpr_wrboth ++ a70: 000972a740fc000f \.334 ffs\[gprA_15, gprA_15\], gpr_wrboth, predicate_cc ++ a78: 000320f0000c0803 \.335 immed\[gprA_3, 0x2\] ++ a80: 000480e8004d4803 \.336 jump\[gprA_3, \.338\] ++ a88: 0006a0d854408038 \.337 br\[\.337\] ++ a90: 000460f000002701 \.338 immed\[gprB_9, 0x1\] ++ a98: 0006a0d854408038 \.339 br\[\.337\] ++ aa0: 0005e0f000002702 \.340 immed\[gprB_9, 0x2\] ++ aa8: 0006a0d854408038 \.341 br\[\.337\] ++ ab0: 000500f000002703 \.342 immed\[gprB_9, 0x3\] ++ ab8: 0006a0d854408038 \.343 br\[\.337\] ++ ac0: 000040c001000000 \.344 ld_field\[gprA_0, 0001, gprB_0\] ++ ac8: 0007e2c001000000 \.345 ld_field\[gprA_0, 0001, gprB_0\], gpr_wrboth ++ ad0: 000e40c401000000 \.346 ld_field\[gprA_0, 0001, gprB_0\], load_cc ++ ad8: 000790c001000000 \.347 ld_field\[gprA_0, 0001, gprB_0\], predicate_cc ++ ae0: 0005c0c005000000 \.348 ld_field\[gprA_0, 0101, gprB_0\] ++ ae8: 000080c005100000 \.349 ld_field_w_clr\[gprA_0, 0101, gprB_0\] ++ af0: 0002a2c001100000 \.350 ld_field_w_clr\[gprA_0, 0001, gprB_0\], gpr_wrboth ++ af8: 000b00c401100000 \.351 ld_field_w_clr\[gprA_0, 0001, gprB_0\], load_cc ++ b00: 0002d0c001100000 \.352 ld_field_w_clr\[gprA_0, 0001, gprB_0\], predicate_cc ++ b08: 000fc0c00f000000 \.353 ld_field\[gprA_0, 1111, gprB_0\] ++ b10: 0005e0c1fb000200 \.354 ld_field\[gprA_0, 1011, gprB_0, <<1\] ++ b18: 000460c01b000100 \.355 ld_field\[gprA_0, 1011, gprB_0, >>1\] ++ b20: 000e60c1fb000100 \.356 ld_field\[gprA_0, 1011, gprB_0, >>31\] ++ b28: 000bc0c09b000000 \.357 ld_field\[gprA_0, 1011, gprB_0, >>rot9\] ++ b30: 000e80c09b100000 \.358 ld_field_w_clr\[gprA_0, 1011, gprB_0, >>rot9\] ++ b38: 0001c0c17b000000 \.359 ld_field\[gprA_0, 1011, gprB_0, >>rot23\] ++ b40: 0002c0c41b000000 \.360 ld_field\[gprA_0, 1011, gprB_0, >>rot1\], load_cc ++ b48: 000780c41b100000 \.361 ld_field_w_clr\[gprA_0, 1011, gprB_0, >>rot1\], load_cc ++ b50: 000400f0001f7c01 \.362 immed\[gprA_1, 0x1df\] ++ b58: 000200f0001007df \.363 immed\[gprB_1, 0x1df\] ++ b60: 0005a2f0001007df \.364 immed\[gprB_1, 0x1df\], gpr_wrboth ++ b68: 0005d0f0001007df \.365 immed\[gprB_1, 0x1df\], predicate_cc ++ b70: 000020fc010c0000 \.366 local_csr_rd\[ALUOut\] ++ b78: 000e60f0000c000b \.367 immed\[gprA_11, 0x0\] ++ b80: 000ce0fc160c0000 \.368 local_csr_rd\[MiscControl\] ++ b88: 000e60f0000c000b \.369 immed\[gprA_11, 0x0\] ++ b90: 000ae0fc076c0b02 \.370 local_csr_wr\[XferIndex, 0x2\] ++ b98: 0008a0fc076c0003 \.371 local_csr_wr\[XferIndex, gprA_3\] ++ ba0: 000520fc07600f00 \.372 local_csr_wr\[XferIndex, gprB_3\] ++ ba8: 000f20fc01a00f00 \.373 local_csr_wr\[CtxEnables, gprB_3\] ++ bb0: 000480f800000c02 \.374 mul_step\[gprA_2, gprB_3\], start ++ bb8: 000880f980000c02 \.375 mul_step\[gprA_2, gprB_3\], 32x32_step1 ++ bc0: 000dc0f980100c02 \.376 mul_step\[gprA_2, gprB_3\], 32x32_step2 ++ bc8: 0001c0f980200c02 \.377 mul_step\[gprA_2, gprB_3\], 32x32_step3 ++ bd0: 000480f980300c02 \.378 mul_step\[gprA_2, gprB_3\], 32x32_step4 ++ bd8: 000940f9804c0002 \.379 mul_step\[gprA_2, --\], 32x32_last ++ be0: 000ce0f9805c0003 \.380 mul_step\[gprA_3, --\], 32x32_last2 ++ be8: 0001a0f800000802 \.381 mul_step\[gprA_2, gprB_2\], start ++ bf0: 000aa0f900000802 \.382 mul_step\[gprA_2, gprB_2\], 16x16_step1 ++ bf8: 000fe0f900100802 \.383 mul_step\[gprA_2, gprB_2\], 16x16_step2 ++ c00: 000f20f9004c0000 \.384 mul_step\[gprA_0, --\], 16x16_last ++ c08: 0001a0f800000802 \.385 mul_step\[gprA_2, gprB_2\], start ++ c10: 0006a0f880000802 \.386 mul_step\[gprA_2, gprB_2\], 24x8_step1 ++ c18: 000320f8804c0000 \.387 mul_step\[gprA_0, --\], 24x8_last ++ c20: 0001a0f800000802 \.388 mul_step\[gprA_2, gprB_2\], start ++ c28: 0006a0f880000802 \.389 mul_step\[gprA_2, gprB_2\], 24x8_step1 ++ c30: 0004f0f8804c0000 \.390 mul_step\[gprA_0, --\], 24x8_last, predicate_cc ++ c38: 0001a0f800000802 \.391 mul_step\[gprA_2, gprB_2\], start ++ c40: 0006a0f880000802 \.392 mul_step\[gprA_2, gprB_2\], 24x8_step1 ++ c48: 0009e3f8804c0000 \.393 mul_step\[gprA_0, --\], 24x8_last, no_cc, gpr_wrboth ++ c50: 000b80a330000000 \.394 pop_count1\[gprB_0\] ++ c58: 000c80a3b0000000 \.395 pop_count2\[gprB_0\] ++ c60: 000d80a180000000 \.396 pop_count3\[gprA_0, gprB_0\] ++ c68: 000b80a330000000 \.397 pop_count1\[gprB_0\] ++ c70: 000c80a3b0000000 \.398 pop_count2\[gprB_0\] ++ c78: 000743a180000000 \.399 pop_count3\[gprA_0, gprB_0\], no_cc, gpr_wrboth ++ c80: 0004a4a330088000 \.400 pop_count1\[\*l\$index3\] ++ c88: 0003a4a3b0088000 \.401 pop_count2\[\*l\$index3\] ++ c90: 0000e5a1a438c000 \.402 pop_count3\[\*n\$index\+\+, \*l\$index3\+\+\], no_cc ++ c98: 000b80a330000000 \.403 pop_count1\[gprB_0\] ++ ca0: 000c80a3b0000000 \.404 pop_count2\[gprB_0\] ++ ca8: 000731a180000000 \.405 pop_count3\[gprA_0, gprB_0\], no_cc, predicate_cc ++ cb0: 000480e8000c0000 \.406 rtn\[gprA_0\] ++ cb8: 000620e8000a0700 \.407 rtn\[n\$reg_1\] ++ cc0: 000600e800088300 \.408 rtn\[\*l\$index1\] ++ cc8: 000a64e800080300 \.409 rtn\[\*l\$index2\] ++ cd0: 000dc0e800200300 \.410 rtn\[gprB_0\], defer\[2\] ++ cd8: 0008a0a0300c0700 \.411 alu\[--, --, B, 0x1\] ++ ce0: 0004a0a0300c0b00 \.412 alu\[--, --, B, 0x2\] ++ ce8: 000000f0000c0300 \.413 nop ++ cf0: 000000f0000c0300 \.414 nop ++ cf8: 000000f0000c0300 \.415 nop ++ d00: 000000f0000c0300 \.416 nop ++ d08: 0003501842300c09 \.417 arm\[read, \$xfer_3, gprA_9, gprB_3, 2\], ctx_swap\[sig4\] ++ d10: 0005501842302403 \.418 arm\[read, \$xfer_3, gprA_3, gprB_9, 2\], ctx_swap\[sig4\] ++ d18: 0004801842300c09 \.419 arm\[read, \$xfer_3, gprA_9, <<8, gprB_3, 2\], ctx_swap\[sig4\] ++ d20: 000f241842302403 \.420 arm\[read, \$xfer_3, gprB_9, <<8, gprA_3, 2\], ctx_swap\[sig4\] ++ d28: 0004a0a0300c0b00 \.421 alu\[--, --, B, 0x2\] ++ d30: 0008861842302403 \.422 arm\[read, \$xfer_3, gprB_9, <<8, gprA_3, 2\], indirect_ref, ctx_swap\[sig4\] ++ d38: 0004a0a0300c0b00 \.423 alu\[--, --, B, 0x2\] ++ d40: 000e8618e2302703 \.424 arm\[read, \$xfer_3, gprB_9, <<8, gprA_3, 2\], indirect_ref, sig_done\[sig14\] ++ d48: 0007841842302503 \.425 arm\[read, \$xfer_3, gprB_9, <<8, gprA_3, 2\], ctx_swap\[sig4\], defer\[1\] ++ d50: 0008a0a0300c0700 \.426 alu\[--, --, B, 0x1\] ++ d58: 000f101843c00c09 \.427 arm\[read, \$xfer_28, gprA_9, gprB_3, 2\], ctx_swap\[sig4\] ++ d60: 000910184e800c09 \.428 arm\[read, \$xfer_8, gprA_9, gprB_3, 8\], ctx_swap\[sig4\] ++ d68: 000a106440800c09 \.429 cls\[add, \$xfer_8, gprA_9, gprB_3, 1\], ctx_swap\[sig4\] ++ d70: 0000f0664080a009 \.430 cls\[sub, \$xfer_8, gprA_9, 0x8, 1\], ctx_swap\[sig4\] ++ d78: 000160644284a009 \.431 cls\[add64, \$xfer_8, gprA_9, <<8, 0x8, 2\], ctx_swap\[sig4\] ++ d80: 000404664284a408 \.432 cls\[sub64, \$xfer_8, 0x9, <<8, gprA_8, 2\], ctx_swap\[sig4\] ++ d88: 0008a0a0300c0700 \.433 alu\[--, --, B, 0x1\] ++ d90: 00032c650340a708 \.434 cls\[add_imm, 0x14, 0x9, <<8, gprA_8, 2\] ++ d98: 0007506040880c09 \.435 cls\[swap/test_compare_write, \$xfer_8, gprA_9, gprB_3, 1\], ctx_swap\[sig4\] ++ da0: 00023c6500007f9a \.436 cls\[add_imm, 0x1f9a, --, 1\] ++ da8: 000038653c583f14 \.437 cls\[add_imm, 0xf14, 0xf16\] ++ db0: 000b54640013c30f \.438 cls\[add, \$xfer_1, 0xf00f, 1\] ++ db8: 0002901c10a08000 \.439 ct\[xpb_read, \$xfer_10, gprA_0, 0x0, 1\], ctx_swap\[sig1\] ++ dc0: 0007501e10a48000 \.440 ct\[reflect_read_sig_init, \$xfer_10, gprA_0, 0x0, 1\], ctx_swap\[sig1\] ++ dc8: 000a501c10a48000 \.441 ct\[ring_get, \$xfer_10, gprA_0, 0x0, 1\], ctx_swap\[sig1\] ++ dd0: 000000f0000c0300 \.442 nop ++ dd8: 000cc0474a80a009 \.443 mem\[add64, \$xfer_8, gprA_9, <<8, 0x8, 6\], ctx_swap\[sig4\] ++ de0: 000d40404280a009 \.444 mem\[read, \$xfer_8, gprA_9, <<8, 0x8, 2\], ctx_swap\[sig4\] ++ de8: 000c405c4280a009 \.445 mem\[read32, \$xfer_8, gprA_9, <<8, 0x8, 2\], ctx_swap\[sig4\] ++ df0: 000ea0554280a009 \.446 mem\[ctm\.pe_dma_to_memory_indirect/emem\.get/imem\.lb_bucket_read_local, \$xfer_8, gprA_9, <<8, 0x8, 2\], ctx_swap\[sig4\] ++ df8: 0009204c408ca309 \.447 mem\[lock128/lock384, \$xfer_8, gprA_9, <<8, 0x8, 1\], sig_done\[sig4\] ++ e00: 000f20e000000030 \.448 ctx_arb\[sig4, sig5\] ++ e08: 0000a04c488ca309 \.449 mem\[lock256/lock512, \$xfer_8, gprA_9, <<8, 0x8, 5\], sig_done\[sig4\] ++ e10: 000f20e000000030 \.450 ctx_arb\[sig4, sig5\] ++ e18: 000ae04d4084a009 \.451 mem\[microq128_pop, \$xfer_8, gprA_9, <<8, 0x8, 1\], ctx_swap\[sig4\] ++ e20: 0002204d4080a009 \.452 mem\[microq128_get, \$xfer_8, gprA_9, <<8, 0x8, 1\], ctx_swap\[sig4\] ++ e28: 000ba04d4880a009 \.453 mem\[microq256_get, \$xfer_8, gprA_9, <<8, 0x8, 5\], ctx_swap\[sig4\] ++ e30: 0003805700028309 \.454 mem\[ctm\.pe_dma_from_memory_buffer/emem\.fast_journal/imem\.lb_push_stats_local, \$xfer_0, gprA_9, <<8, 0x40, 1\] ++ e38: 0005e04e4000a309 \.455 mem\[queue128_lock, \$xfer_0, gprA_9, <<8, 0x8, 1\], sig_done\[sig4\] ++ e40: 000f20e000000030 \.456 ctx_arb\[sig4, sig5\] ++ e48: 0001a04e0004a309 \.457 mem\[queue128_unlock, \$xfer_0, gprA_9, <<8, 0x8, 1\] ++ e50: 000c604e4800a309 \.458 mem\[queue256_lock, \$xfer_0, gprA_9, <<8, 0x8, 5\], sig_done\[sig4\] ++ e58: 000f20e000000030 \.459 ctx_arb\[sig4, sig5\] ++ e60: 0008204e0804a309 \.460 mem\[queue256_unlock, \$xfer_0, gprA_9, <<8, 0x8, 5\] ++ e68: 0008a05000001309 \.461 mem\[ctm\.packet_wait_packet_status/emem\.rd_qdesc/imem\.stats_log, \$xfer_0, gprA_9, <<8, gprB_4, 1\] ++ e70: 000b840092200c02 \.462 ila\[read, \$xfer_2, gprB_3, <<8, gprA_2, 2\], ctx_swap\[sig9\] ++ e78: 0005440182240f02 \.463 ila\[write_check_error, \$xfer_2, gprB_3, <<8, gprA_2, 2\], sig_done\[sig8\] ++ e80: 000d60e000000300 \.464 ctx_arb\[sig8, sig9\] ++ e88: 0007800410600000 \.465 nbi\[read, \$xfer_6, gprA_0, <<8, gprB_0, 1\], ctx_swap\[sig1\] ++ e90: 0002600c62000000 \.466 pcie\[read, \$xfer_0, gprA_0, <<8, gprB_0, 2\], ctx_swap\[sig6\] ++ e98: 0004c40d62000000 \.467 pcie\[write, \$xfer_0, gprB_0, <<8, gprA_0, 2\], ctx_swap\[sig6\] ++ ea0: 000d601462000000 \.468 crypto\[read, \$xfer_0, gprA_0, <<8, gprB_0, 2\], ctx_swap\[sig6\] ++ ea8: 0006601562000000 \.469 crypto\[write, \$xfer_0, gprA_0, <<8, gprB_0, 2\], ctx_swap\[sig6\] ++ eb0: 0000601662000000 \.470 crypto\[write_fifo, \$xfer_0, gprA_0, <<8, gprB_0, 2\], ctx_swap\[sig6\] ++ eb8: 000d840d60000050 \.471 pcie\[write, \$xfer_0, gprB_0, <<8, \*l\$index0, 1\], ctx_swap\[sig6\] ++ ec0: 0009e40d60000058 \.472 pcie\[write, \$xfer_0, gprB_0, <<8, \*l\$index1, 1\], ctx_swap\[sig6\] ++ ec8: 0009040d60000059 \.473 pcie\[write, \$xfer_0, gprB_0, <<8, \*l\$index1\[1\], 1\], ctx_swap\[sig6\] ++ ed0: 000000f0000c0300 \.474 nop ++ ed8: 000000f0000c0300 \.475 nop ++ ee0: 000000f0000c0300 \.476 nop ++ ee8: 000000f0000c0300 \.477 nop ++ ef0: 000000f0000c0300 \.478 nop ++ ef8: 000060a900301340 \.479 crc_be\[crc_ccitt, gprA_3, gprB_4\] ++ f00: 000000f0000c0300 \.480 nop ++ f08: 000e20b9403d0004 \.481 crc_be\[crc_ccitt, gprB_3, gprA_4\] ++ f10: 000000f0000c0300 \.482 nop ++ f18: 000400a900301348 \.483 crc_le\[crc_ccitt, gprA_3, gprB_4\] ++ f20: 000000f0000c0300 \.484 nop ++ f28: 000400b9403d2004 \.485 crc_le\[crc_ccitt, gprB_3, gprA_4\] ++ f30: 000000f0000c0300 \.486 nop ++ f38: 0002e0b900301348 \.487 crc_le\[crc_ccitt, gprB_3, gprB_4\] ++ f40: 000000f0000c0300 \.488 nop ++ f48: 0002e0a9403d2004 \.489 crc_le\[crc_ccitt, gprA_3, gprA_4\] ++ f50: 000000f0000c0300 \.490 nop ++ f58: 000220e000020000 \.491 ctx_arb\[bpt\] ++ f60: 000420e000010000 \.492 ctx_arb\[kill\] ++ ++Disassembly of section \.text\.i33\.me9: ++ ++0000000000000000 <\.text\.i33\.me9>: ++ 0: 000540f0012cd000 \.0 immed\[gprA_0, 0x1234\] ++ 8: 0002c0f0012cd280 \.1 immed\[n\$reg_0, 0x1234\] ++ 10: 000220f0012cd281 \.2 immed\[n\$reg_1, 0x1234\] ++ 18: 000660f0012cd200 \.3 immed\[\*l\$index0, 0x1234\] ++ 20: 0007c0f0012cd220 \.4 immed\[\*l\$index1, 0x1234\] ++ 28: 000fa0f0012cd230 \.5 immed\[\*l\$index1\+\+, 0x1234\] ++ 30: 000f40f0012cd231 \.6 immed\[\*l\$index1--, 0x1234\] ++ 38: 0008c8f0012cd200 \.7 immed\[\*l\$index2, 0x1234\] ++ 40: 0000a8f0012cd210 \.8 immed\[\*l\$index2\+\+, 0x1234\] ++ 48: 000048f0012cd211 \.9 immed\[\*l\$index2--, 0x1234\] ++ 50: 000968f0012cd220 \.10 immed\[\*l\$index3, 0x1234\] ++ 58: 0007e0f0012cd203 \.11 immed\[\*l\$index0\[3\], 0x1234\] ++ 60: 000540f0012cd225 \.12 immed\[\*l\$index1\[5\], 0x1234\] ++ 68: 000b28f0012cd207 \.13 immed\[\*l\$index2\[7\], 0x1234\] ++ 70: 000de8f0012cd229 \.14 immed\[\*l\$index3\[9\], 0x1234\] ++ 78: 000000f00ff003ff \.15 immed\[gprB_0, 0xffff\] ++ 80: 000d60f220000bff \.16 immed_b1\[gprB_2, 0xff\] ++ 88: 000f60f6200007ff \.17 immed_b3\[gprB_1, 0xff\] ++ 90: 000080f080000f00 \.18 immed\[gprB_3, 0xffffffff\] ++ 98: 000100f086600f77 \.19 immed\[gprB_3, 0xffff9988\] ++ a0: 000940f0012cd180 \.20 immed\[\$xfer_0, 0x1234\] ++ a8: 000a00f0043c8581 \.21 immed\[\$xfer_1, 0x4321\] ++ b0: 000b40f0056de19e \.22 immed\[\$xfer_30, 0x5678\] ++ b8: 0007c0f0400e8401 \.23 immed_w0\[gprA_1, 0xa1\] ++ c0: 000440f4400e8802 \.24 immed_w1\[gprA_2, 0xa2\] ++ c8: 000d00f4000e8c03 \.25 immed\[gprA_3, 0xa3, <<16\] ++ d0: 000520f001200334 \.26 immed\[gprB_0, 0x1234\] ++ d8: 000fa0f0400007b1 \.27 immed_w0\[gprB_1, 0xb1\] ++ e0: 000c20f440000bb2 \.28 immed_w1\[gprB_2, 0xb2\] ++ e8: 000560f400000fb3 \.29 immed\[gprB_3, 0xb3, <<16\] ++ f0: 000660f200000fb3 \.30 immed\[gprB_3, 0xb3, <<8\] ++ f8: 0001b0f200000fb3 \.31 immed\[gprB_3, 0xb3, <<8\], predicate_cc ++ 100: 0001c2f200000fb3 \.32 immed\[gprB_3, 0xb3, <<8\], gpr_wrboth ++ 108: 000ba0a0300c2f00 \.33 alu\[--, --, B, 0xb\] ++ 110: 0005a081f200da00 \.34 alu_shf\[--, --, B, 0x16, <<1\] ++ 118: 000be081d2018600 \.35 alu_shf\[--, --, B, 0x21, <<3\] ++ 120: 000240801201b200 \.36 alu_shf\[--, --, B, 0x2c, <<31\] ++ 128: 000fa081f800da00 \.37 alu_shf\[\$xfer_0, --, B, 0x16, <<1\] ++ 130: 0009e081f840da00 \.38 alu_shf\[\$xfer_4, --, B, 0x16, <<1\] ++ 138: 0009a081f980da00 \.39 alu_shf\[\$xfer_24, --, B, 0x16, <<1\] ++ 140: 0003e081f9f0da00 \.40 alu_shf\[\$xfer_31, --, B, 0x16, <<1\] ++ 148: 0004a0a0280c2f00 \.41 alu\[n\$reg_0, --, B, 0xb\] ++ 150: 0001e0a0281c2f00 \.42 alu\[n\$reg_1, --, B, 0xb\] ++ 158: 000880a0a00c2400 \.43 alu\[\*l\$index0, gprA_0, \+, 0x9\] ++ 160: 000100a0a43c2400 \.44 alu\[\*n\$index\+\+, gprA_0, \+, 0x9\] ++ 168: 000b208bc500a600 \.45 alu_shf\[\*l\$index0, gprA_0, OR, 0x9, <<4\] ++ 170: 000b00a0a20c2400 \.46 alu\[\*l\$index1, gprA_0, \+, 0x9\] ++ 178: 000740a0a30c2400 \.47 alu\[\*l\$index1\+\+, gprA_0, \+, 0x9\] ++ 180: 000200a0a31c2400 \.48 alu\[\*l\$index1--, gprA_0, \+, 0x9\] ++ 188: 000628a0a00c2400 \.49 alu\[\*l\$index2, gprA_0, \+, 0x9\] ++ 190: 000988aa210c2400 \.50 alu\[\*l\$index2\+\+, gprA_0, OR, 0x9\] ++ 198: 000f28a0a11c2400 \.51 alu\[\*l\$index2--, gprA_0, \+, 0x9\] ++ 1a0: 0005a8a0a20c2400 \.52 alu\[\*l\$index3, gprA_0, \+, 0x9\] ++ 1a8: 000480a0a03c2400 \.53 alu\[\*l\$index0\[3\], gprA_0, \+, 0x9\] ++ 1b0: 000800a0a25c2400 \.54 alu\[\*l\$index1\[5\], gprA_0, \+, 0x9\] ++ 1b8: 000c68a0a07c2400 \.55 alu\[\*l\$index2\[7\], gprA_0, \+, 0x9\] ++ 1c0: 000aa8a0a29c2400 \.56 alu\[\*l\$index3\[9\], gprA_0, \+, 0x9\] ++ 1c8: 000cc4b0c008a400 \.57 alu\[gprB_0, \*l\$index3\[9\], \+, gprA_0\] ++ 1d0: 000fe4b0c008c000 \.58 alu\[gprB_0, \*l\$index3\+\+, \+, gprA_0\] ++ 1d8: 000ac4b0c008c400 \.59 alu\[gprB_0, \*l\$index3--, \+, gprA_0\] ++ 1e0: 000bc4b080000229 \.60 alu\[gprB_0, \*l\$index3\[9\], \+, gprB_0\] ++ 1e8: 000724b080000230 \.61 alu\[gprB_0, \*l\$index3\+\+, \+, gprB_0\] ++ 1f0: 0007c4b080000231 \.62 alu\[gprB_0, \*l\$index3--, \+, gprB_0\] ++ 1f8: 000664b080000211 \.63 alu\[gprB_0, \*l\$index2--, \+, gprB_0\] ++ 200: 000a60b080000231 \.64 alu\[gprB_0, \*l\$index1--, \+, gprB_0\] ++ 208: 000bc0b080000211 \.65 alu\[gprB_0, \*l\$index0--, \+, gprB_0\] ++ 210: 000340b080000200 \.66 alu\[gprB_0, \*l\$index0, \+, gprB_0\] ++ 218: 000ee4b080000200 \.67 alu\[gprB_0, \*l\$index2, \+, gprB_0\] ++ 220: 000100b080000241 \.68 alu\[gprB_0, \*n\$index, \+, gprB_0\] ++ 228: 0004809bf0000241 \.69 alu_shf\[gprB_0, \*n\$index, OR, gprB_0, <<1\] ++ 230: 000f20a0001fff00 \.70 alu\[gprA_1, --, B, 0xff\] ++ 238: 0005c0b0002fff00 \.71 alu\[gprB_2, --, B, 0xff\] ++ 240: 000940a0000d6f00 \.72 alu\[gprA_0, --, B, 0x5b\] ++ 248: 000440a2000d6f00 \.73 alu\[gprA_0, --, ~B, 0x5b\] ++ 250: 000de081f032f200 \.74 alu_shf\[gprA_3, --, B, 0x5c, <<1\] ++ 258: 000de091d012f600 \.75 alu_shf\[gprB_1, --, B, 0x5d, <<3\] ++ 260: 000d60901022fa00 \.76 alu_shf\[gprB_2, --, B, 0x5e, <<31\] ++ 268: 000e40a0c0000402 \.77 alu\[gprA_0, gprB_1, \+, gprA_2\] ++ 270: 000340a2c0000402 \.78 alu\[gprA_0, gprB_1, \+16, gprA_2\] ++ 278: 000040a4c0000402 \.79 alu\[gprA_0, gprB_1, \+8, gprA_2\] ++ 280: 0007a0a8c0000402 \.80 alu\[gprA_0, gprB_1, \+carry, gprA_2\] ++ 288: 000d40a6c0000402 \.81 alu\[gprA_0, gprB_1, -carry, gprA_2\] ++ 290: 000aa0aac0000402 \.82 alu\[gprA_0, gprB_1, -, gprA_2\] ++ 298: 0009a0acc0000402 \.83 alu\[gprA_0, gprB_1, B-A, gprA_2\] ++ 2a0: 000da0aa40000402 \.84 alu\[gprA_0, gprB_1, OR, gprA_2\] ++ 2a8: 000740a440000402 \.85 alu\[gprA_0, gprB_1, AND, gprA_2\] ++ 2b0: 000a40a640000402 \.86 alu\[gprA_0, gprB_1, ~AND, gprA_2\] ++ 2b8: 0000a0a840000402 \.87 alu\[gprA_0, gprB_1, AND~, gprA_2\] ++ 2c0: 000ea0ac40000402 \.88 alu\[gprA_0, gprB_1, XOR, gprA_2\] ++ 2c8: 000321a0c0000402 \.89 alu\[gprA_0, gprB_1, \+, gprA_2\], no_cc ++ 2d0: 000990a0c0000402 \.90 alu\[gprA_0, gprB_1, \+, gprA_2\], predicate_cc ++ 2d8: 0009e2a0c0000402 \.91 alu\[gprA_0, gprB_1, \+, gprA_2\], gpr_wrboth ++ 2e0: 000353a0c0000402 \.92 alu\[gprA_0, gprB_1, \+, gprA_2\], no_cc, gpr_wrboth, predicate_cc ++ 2e8: 000d418b70080602 \.93 alu_shf\[gprA_0, gprB_1, OR, gprA_2, <<9\], no_cc ++ 2f0: 0006708a90080502 \.94 alu_shf\[gprA_0, gprB_1, OR, gprA_2, >>9\], predicate_cc ++ 2f8: 000ea28a90080402 \.95 alu_shf\[gprA_0, gprB_1, OR, gprA_2, >>rot9\], gpr_wrboth ++ 300: 000e138b70080402 \.96 alu_shf\[gprA_0, gprB_1, OR, gprA_2, >>rot23\], no_cc, gpr_wrboth, predicate_cc ++ 308: 000ba08a00080602 \.97 alu_shf\[gprA_0, gprB_1, OR, gprA_2, <>indirect\] ++ 318: 000ba0a0300c2f00 \.99 alu\[--, --, B, 0xb\] ++ 320: 000ae09d40380101 \.100 asr\[gprB_3, gprA_1, >>20\] ++ 328: 000ba0a0300c2f00 \.101 alu\[--, --, B, 0xb\] ++ 330: 000ea09d40310500 \.102 asr\[gprB_3, \*n\$index, >>20\] ++ 338: 000ba0a0300c2f00 \.103 alu\[--, --, B, 0xb\] ++ 340: 0007a09d40314100 \.104 asr\[gprB_3, \*l\$index0, >>20\] ++ 348: 000ba0a0300c2f00 \.105 alu\[--, --, B, 0xb\] ++ 350: 0000249d40316100 \.106 asr\[gprB_3, \*l\$index3, >>20\] ++ 358: 000ba0a0300c2f00 \.107 alu\[--, --, B, 0xb\] ++ 360: 000a049d40314100 \.108 asr\[gprB_3, \*l\$index2, >>20\] ++ 368: 000ba0a0300c2f00 \.109 alu\[--, --, B, 0xb\] ++ 370: 0004a08d45010d00 \.110 asr\[\*l\$index0, \*n\$index\+\+, >>20\] ++ 378: 000ba0a0300c2f00 \.111 alu\[--, --, B, 0xb\] ++ 380: 000ee08d45810d00 \.112 asr\[\*l\$index1, \*n\$index\+\+, >>20\] ++ 388: 000ba0a0300c2f00 \.113 alu\[--, --, B, 0xb\] ++ 390: 000a088d45010d00 \.114 asr\[\*l\$index2, \*n\$index\+\+, >>20\] ++ 398: 000ba0a0300c2f00 \.115 alu\[--, --, B, 0xb\] ++ 3a0: 0007819d40380101 \.116 asr\[gprB_3, gprA_1, >>20\], no_cc ++ 3a8: 000ba0a0300c2f00 \.117 alu\[--, --, B, 0xb\] ++ 3b0: 000d309d40380101 \.118 asr\[gprB_3, gprA_1, >>20\], predicate_cc ++ 3b8: 000ba0a0300c2f00 \.119 alu\[--, --, B, 0xb\] ++ 3c0: 000ba28d40380101 \.120 asr\[gprA_3, gprA_1, >>20\], gpr_wrboth ++ 3c8: 0008c0d818c08120 \.121 beq\[\.99\] ++ 3d0: 000d00d877c08120 \.122 beq\[\.479\] ++ 3d8: 000440d877e08120 \.123 beq\[\.479\], defer\[2\] ++ 3e0: 000000f0000c0300 \.124 nop ++ 3e8: 000000f0000c0300 \.125 nop ++ 3f0: 000540d877c08021 \.126 bne\[\.479\] ++ 3f8: 0004c0d877c08022 \.127 bmi\[\.479\] ++ 400: 000420d877c08023 \.128 bpl\[\.479\] ++ 408: 0007c0d877c08024 \.129 bcs\[\.479\] ++ 410: 0007c0d877c08024 \.130 bcs\[\.479\] ++ 418: 000720d877c08025 \.131 bcc\[\.479\] ++ 420: 000720d877c08025 \.132 bcc\[\.479\] ++ 428: 0006a0d877c08026 \.133 bvs\[\.479\] ++ 430: 000640d877c08027 \.134 bvc\[\.479\] ++ 438: 0001c0d877c08028 \.135 bge\[\.479\] ++ 440: 000120d877c08029 \.136 blt\[\.479\] ++ 448: 000040d877c0802b \.137 bgt\[\.479\] ++ 450: 0000a0d877c0802a \.138 ble\[\.479\] ++ 458: 000c60d818c08038 \.139 br\[\.99\] ++ 460: 000920d818d08038 \.140 br\[\.99\], defer\[1\] ++ 468: 000000f0000c0300 \.141 nop ++ 470: 000bc0d077c09000 \.142 br_bclr\[gprA_0, 3, \.479\] ++ 478: 000980d077c0e004 \.143 br_bclr\[gprA_4, 23, \.479\] ++ 480: 0002a0d077c0082c \.144 br_bclr\[gprB_2, 11, \.479\] ++ 488: 000300d077c02423 \.145 br_bclr\[gprB_9, 2, \.479\] ++ 490: 000260d077c02421 \.146 br_bclr\[gprB_9, 0, \.479\] ++ 498: 000280d077c02420 \.147 br_bclr\[gprB_9, 31, \.479\] ++ 4a0: 000f00d077f02423 \.148 br_bclr\[gprB_9, 2, \.479\], defer\[3\] ++ 4a8: 000000f0000c0300 \.149 nop ++ 4b0: 000000f0000c0300 \.150 nop ++ 4b8: 000000f0000c0300 \.151 nop ++ 4c0: 000680d077c42c2b \.152 br_bset\[gprB_11, 10, \.479\] ++ 4c8: 0006e0d077c4ac0b \.153 br_bset\[gprA_11, 10, \.479\] ++ 4d0: 0002a0c877d81020 \.154 br=byte\[gprB_4, 0, 0x0, \.479\], defer\[1\] ++ 4d8: 000000f0000c0300 \.155 nop ++ 4e0: 000a60c877c81520 \.156 br=byte\[gprB_5, 1, 0x0, \.479\] ++ 4e8: 0001e0c877c81620 \.157 br=byte\[gprB_5, 2, 0x0, \.479\] ++ 4f0: 0001a4c877c94220 \.158 br=byte\[\*l\$index2, 2, 0x0, \.479\] ++ 4f8: 000620c877c96220 \.159 br=byte\[\*l\$index1, 2, 0x0, \.479\] ++ 500: 000540c877c81b20 \.160 br=byte\[gprB_6, 3, 0x0, \.479\] ++ 508: 0000c0c877cc16ff \.161 br=byte\[gprB_5, 2, 0xff, \.479\] ++ 510: 000420c877c816a2 \.162 br=byte\[gprB_5, 2, 0x42, \.479\] ++ 518: 000380c877c416ff \.163 br!=byte\[gprB_5, 2, 0xff, \.479\] ++ 520: 0002a0c877c01620 \.164 br!=byte\[gprB_5, 2, 0x0, \.479\] ++ 528: 000c20d877c00236 \.165 br_cls_state\[cls_ring0_status, \.479\] ++ 530: 0001a0d877e20236 \.166 br_cls_state\[cls_ring8_status, \.479\], defer\[2\] ++ 538: 000000f0000c0300 \.167 nop ++ 540: 000000f0000c0300 \.168 nop ++ 548: 000be0d877c38236 \.169 br_cls_state\[cls_ring14_status, \.479\] ++ 550: 0007c0d877c3c236 \.170 br_cls_state\[cls_ring15_status, \.479\] ++ 558: 000720d877c3c237 \.171 br_!cls_state\[cls_ring15_status, \.479\] ++ 560: 000cc0d877c00237 \.172 br_!cls_state\[cls_ring0_status, \.479\] ++ 568: 000c00d877c00030 \.173 br=ctx\[0, \.479\] ++ 570: 000dc0d877c08030 \.174 br=ctx\[2, \.479\] ++ 578: 000f00d877c18030 \.175 br=ctx\[6, \.479\] ++ 580: 000a40d877d18030 \.176 br=ctx\[6, \.479\], defer\[1\] ++ 588: 000000f0000c0300 \.177 nop ++ 590: 000d40d877c00234 \.178 br_inp_state\[nn_empty, \.479\] ++ 598: 000160d877c04234 \.179 br_inp_state\[nn_full, \.479\] ++ 5a0: 000c80d877c08234 \.180 br_inp_state\[ctm_ring0_status, \.479\] ++ 5a8: 000100d877e28234 \.181 br_inp_state\[ctm_ring8_status, \.479\], defer\[2\] ++ 5b0: 000000f0000c0300 \.182 nop ++ 5b8: 000000f0000c0300 \.183 nop ++ 5c0: 000a80d877c38234 \.184 br_inp_state\[ctm_ring12_status, \.479\] ++ 5c8: 0006a0d877c3c234 \.185 br_inp_state\[ctm_ring13_status, \.479\] ++ 5d0: 000640d877c3c235 \.186 br_!inp_state\[ctm_ring13_status, \.479\] ++ 5d8: 000c60d877c08235 \.187 br_!inp_state\[ctm_ring0_status, \.479\] ++ 5e0: 000260d877c04232 \.188 br_signal\[1, \.479\] ++ 5e8: 000f80d877c08232 \.189 br_signal\[2, \.479\] ++ 5f0: 0005a0d877c3c232 \.190 br_signal\[15, \.479\] ++ 5f8: 000540d877c3c233 \.191 br_!signal\[15, \.479\] ++ 600: 000b60d877f2c232 \.192 br_signal\[11, \.479\], defer\[3\] ++ 608: 000000f0000c0300 \.193 nop ++ 610: 000000f0000c0300 \.194 nop ++ 618: 000000f0000c0300 \.195 nop ++ 620: 000e40a0c0000402 \.196 alu\[gprA_0, gprB_1, \+, gprA_2\] ++ 628: 0004408e02081200 \.197 byte_align_le\[--, gprB_4\] ++ 630: 0008c08e00981200 \.198 byte_align_le\[gprA_9, gprB_4\] ++ 638: 0004c08e00a81200 \.199 byte_align_le\[gprA_10, gprB_4\] ++ 640: 0001808e00b81200 \.200 byte_align_le\[gprA_11, gprB_4\] ++ 648: 000e40a0c0000402 \.201 alu\[gprA_0, gprB_1, \+, gprA_2\] ++ 650: 000c808e02001100 \.202 byte_align_be\[--, gprB_4\] ++ 658: 0000008e00901100 \.203 byte_align_be\[gprA_9, gprB_4\] ++ 660: 000c008e00a01100 \.204 byte_align_be\[gprA_10, gprB_4\] ++ 668: 0009408e00b01100 \.205 byte_align_be\[gprA_11, gprB_4\] ++ 670: 000d80a0300c0300 \.206 alu\[--, --, B, 0x0\] ++ 678: 000400a5b00c0000 \.207 cam_clear ++ 680: 000360bb80900007 \.208 cam_lookup\[gprB_9, gprA_7\] ++ 688: 0003a0bb80900200 \.209 cam_lookup\[gprB_9, \*l\$index0\] ++ 690: 000e04bb80900200 \.210 cam_lookup\[gprB_9, \*l\$index2\] ++ 698: 000f84bb80900203 \.211 cam_lookup\[gprB_9, \*l\$index2\[3\]\] ++ 6a0: 000bc0bb80900210 \.212 cam_lookup\[gprB_9, \*l\$index0\+\+\] ++ 6a8: 000280aba0000241 \.213 cam_lookup\[\*l\$index0, \*n\$index\] ++ 6b0: 000ec0aba1000241 \.214 cam_lookup\[\*l\$index0\+\+, \*n\$index\] ++ 6b8: 000288aba3000243 \.215 cam_lookup\[\*l\$index3\+\+, \*n\$index\+\+\] ++ 6c0: 000aa0aba0200243 \.216 cam_lookup\[\*l\$index0\[2\], \*n\$index\+\+\] ++ 6c8: 000060bb80901407 \.217 cam_lookup\[gprB_9, gprA_7\], lm_addr0\[1\] ++ 6d0: 000060bb80902807 \.218 cam_lookup\[gprB_9, gprA_7\], lm_addr1\[2\] ++ 6d8: 000660bb80907407 \.219 cam_lookup\[gprB_9, gprA_7\], lm_addr2\[3\] ++ 6e0: 000660bb80904807 \.220 cam_lookup\[gprB_9, gprA_7\], lm_addr3\[0\] ++ 6e8: 000222ab80900007 \.221 cam_lookup\[gprA_9, gprA_7\], gpr_wrboth ++ 6f0: 0004b0bb80900007 \.222 cam_lookup\[gprB_9, gprA_7\], predicate_cc ++ 6f8: 000a00a7809c0000 \.223 cam_read_tag\[gprA_9, 0x0\] ++ 700: 000da2a7809c0000 \.224 cam_read_tag\[gprA_9, 0x0\], gpr_wrboth ++ 708: 000dd0a7809c0000 \.225 cam_read_tag\[gprA_9, 0x0\], predicate_cc ++ 710: 000900a7809c2800 \.226 cam_read_tag\[gprA_9, 0xa\] ++ 718: 000a00a7809c3c00 \.227 cam_read_tag\[gprA_9, 0xf\] ++ 720: 0003e0af809c0000 \.228 cam_read_state\[gprA_9, 0x0\] ++ 728: 000442af809c0000 \.229 cam_read_state\[gprA_9, 0x0\], gpr_wrboth ++ 730: 000392af809c0000 \.230 cam_read_state\[gprA_9, 0x0\], gpr_wrboth, predicate_cc ++ 738: 0000e0af809c2800 \.231 cam_read_state\[gprA_9, 0xa\] ++ 740: 0003e0af809c3c00 \.232 cam_read_state\[gprA_9, 0xf\] ++ 748: 000920a9f0101700 \.233 cam_write\[0x0, gprB_5, 1\] ++ 750: 000da0a9f01a0300 \.234 cam_write\[0x0, n\$reg_0, 1\] ++ 758: 000e80a9f0190700 \.235 cam_write\[0x0, \*n\$index, 1\] ++ 760: 0004c4a9f0180300 \.236 cam_write\[0x0, \*l\$index2, 1\] ++ 768: 0008e4a9f0184300 \.237 cam_write\[0x0, \*l\$index2\+\+, 1\] ++ 770: 000dc4a9f0184700 \.238 cam_write\[0x0, \*l\$index2--, 1\] ++ 778: 000840a9f0b01704 \.239 cam_write\[0x4, gprB_5, 11\] ++ 780: 000be0a9f0f0170f \.240 cam_write\[0xf, gprB_5, 15\] ++ 788: 0008a0adb01c0000 \.241 cam_write_state\[0x0, 1\] ++ 790: 000d80adb0bc1000 \.242 cam_write_state\[0x4, 11\] ++ 798: 000de0adb0fc3c00 \.243 cam_write_state\[0xf, 15\] ++ 7a0: 0000c0fc142c000d \.244 local_csr_wr\[CRCRemainder, gprA_13\] ++ 7a8: 000d20a918060348 \.245 crc_le\[crc_ccitt, \$xfer_0, \$xfer_0\] ++ 7b0: 000000f0000c0300 \.246 nop ++ 7b8: 000d40a918160748 \.247 crc_le\[crc_ccitt, \$xfer_1, \$xfer_1\] ++ 7c0: 000000f0000c0300 \.248 nop ++ 7c8: 000d40a918260b48 \.249 crc_le\[crc_ccitt, \$xfer_2, \$xfer_2\] ++ 7d0: 000000f0000c0300 \.250 nop ++ 7d8: 000d20a918360f48 \.251 crc_le\[crc_ccitt, \$xfer_3, \$xfer_3\] ++ 7e0: 000000f0000c0300 \.252 nop ++ 7e8: 000000f0000c0300 \.253 nop ++ 7f0: 000000f0000c0300 \.254 nop ++ 7f8: 000000f0000c0300 \.255 nop ++ 800: 000000f0000c0300 \.256 nop ++ 808: 000f60fc140c0000 \.257 local_csr_rd\[CRCRemainder\] ++ 810: 000ce0f0000c000e \.258 immed\[gprA_14, 0x0\] ++ 818: 000940a918060340 \.259 crc_be\[crc_ccitt, \$xfer_0, \$xfer_0\] ++ 820: 000000f0000c0300 \.260 nop ++ 828: 000920a918461340 \.261 crc_be\[crc_ccitt, \$xfer_4, \$xfer_4\] ++ 830: 000000f0000c0300 \.262 nop ++ 838: 000060a900061340 \.263 crc_be\[crc_ccitt, gprA_0, \$xfer_4\] ++ 840: 000000f0000c0300 \.264 nop ++ 848: 000c60a900001340 \.265 crc_be\[crc_ccitt, gprA_0, gprB_4\] ++ 850: 000000f0000c0300 \.266 nop ++ 858: 000000f0000c0300 \.267 nop ++ 860: 000000f0000c0300 \.268 nop ++ 868: 000000f0000c0300 \.269 nop ++ 870: 000000f0000c0300 \.270 nop ++ 878: 000600a918260380 \.271 crc_be\[crc_32, \$xfer_2, \$xfer_0\] ++ 880: 000000f0000c0300 \.272 nop ++ 888: 0004c0a9183613a0 \.273 crc_be\[crc_iscsi, \$xfer_3, \$xfer_4\] ++ 890: 000000f0000c0300 \.274 nop ++ 898: 0004c0a9000613c0 \.275 crc_be\[crc_10, gprA_0, \$xfer_4\] ++ 8a0: 000000f0000c0300 \.276 nop ++ 8a8: 000960a9000013e0 \.277 crc_be\[crc_5, gprA_0, gprB_4\] ++ 8b0: 000000f0000c0300 \.278 nop ++ 8b8: 000ea0a918862700 \.279 crc_be\[--, \$xfer_8, \$xfer_9\] ++ 8c0: 000000f0000c0300 \.280 nop ++ 8c8: 000240a918760784 \.281 crc_be\[crc_32, \$xfer_7, \$xfer_1\], bytes_0_2 ++ 8d0: 000000f0000c0300 \.282 nop ++ 8d8: 0002a0a918760785 \.283 crc_be\[crc_32, \$xfer_7, \$xfer_1\], bytes_0_1 ++ 8e0: 000000f0000c0300 \.284 nop ++ 8e8: 000320a918760786 \.285 crc_be\[crc_32, \$xfer_7, \$xfer_1\], byte_0 ++ 8f0: 000000f0000c0300 \.286 nop ++ 8f8: 0000c0a918760781 \.287 crc_be\[crc_32, \$xfer_7, \$xfer_1\], bytes_1_3 ++ 900: 000000f0000c0300 \.288 nop ++ 908: 000140a918760782 \.289 crc_be\[crc_32, \$xfer_7, \$xfer_1\], bytes_2_3 ++ 910: 000000f0000c0300 \.290 nop ++ 918: 0001a0a918760783 \.291 crc_be\[crc_32, \$xfer_7, \$xfer_1\], byte_3 ++ 920: 000000f0000c0300 \.292 nop ++ 928: 000782a900160780 \.293 crc_be\[crc_32, gprA_1, \$xfer_1\], gpr_wrboth ++ 930: 000000f0000c0300 \.294 nop ++ 938: 000ae3a900160780 \.295 crc_be\[crc_32, gprA_1, \$xfer_1\], no_cc, gpr_wrboth ++ 940: 000000f0000c0300 \.296 nop ++ 948: 000b73a900560780 \.297 crc_be\[crc_32, gprA_5, \$xfer_1\], no_cc, gpr_wrboth, predicate_cc ++ 950: 000000f0000c0300 \.298 nop ++ 958: 000122a900560781 \.299 crc_be\[crc_32, gprA_5, \$xfer_1\], bytes_1_3, gpr_wrboth ++ 960: 000000f0000c0300 \.300 nop ++ 968: 000000f0000c0300 \.301 nop ++ 970: 000000f0000c0300 \.302 nop ++ 978: 000000f0000c0300 \.303 nop ++ 980: 000000f0000c0300 \.304 nop ++ 988: 000000f0000c0300 \.305 nop ++ 990: 0005a0e000080000 \.306 ctx_arb\[--\] ++ 998: 000600e000000001 \.307 ctx_arb\[voluntary\] ++ 9a0: 000220e000020000 \.308 ctx_arb\[bpt\] ++ 9a8: 000460e000000220 \.309 ctx_arb\[sig5, sig9\] ++ 9b0: 000d20e000200220 \.310 ctx_arb\[sig5, sig9\], defer\[2\] ++ 9b8: 000180a0300c0f00 \.311 alu\[--, --, B, 0x3\] ++ 9c0: 0007a0a0300c1f00 \.312 alu\[--, --, B, 0x7\] ++ 9c8: 0006a0e000010220 \.313 ctx_arb\[sig5, sig9\], any ++ 9d0: 000a60e077c40220 \.314 ctx_arb\[sig5, sig9\], br\[\.479\] ++ 9d8: 0006409010500701 \.315 dbl_shf\[gprB_5, gprA_1, gprB_1, >>1\] ++ 9e0: 000d4090a0500701 \.316 dbl_shf\[gprB_5, gprA_1, gprB_1, >>10\] ++ 9e8: 000c4091f0500701 \.317 dbl_shf\[gprB_5, gprA_1, gprB_1, >>31\] ++ 9f0: 000740a440000402 \.318 alu\[gprA_0, gprB_1, AND, gprA_2\] ++ 9f8: 0000c09000500701 \.319 dbl_shf\[gprB_5, gprA_1, gprB_1, >>indirect\] ++ a00: 000b219010500701 \.320 dbl_shf\[gprB_5, gprA_1, gprB_1, >>1\], no_cc ++ a08: 000cf19010500701 \.321 dbl_shf\[gprB_5, gprA_1, gprB_1, >>1\], no_cc, predicate_cc ++ a10: 0000d28010500701 \.322 dbl_shf\[gprA_5, gprA_1, gprB_1, >>1\], gpr_wrboth, predicate_cc ++ a18: 000200a700f03f00 \.323 ffs\[gprA_15, gprB_15\] ++ a20: 000fe0b740fc000f \.324 ffs\[gprB_15, gprA_15\] ++ a28: 000ec0b700f61300 \.325 ffs\[gprB_15, \$xfer_4\] ++ a30: 000660b700f88300 \.326 ffs\[gprB_15, \*l\$index1\] ++ a38: 0007e4b700f8c300 \.327 ffs\[gprB_15, \*l\$index3\+\+\] ++ a40: 0002c4b700f8c700 \.328 ffs\[gprB_15, \*l\$index3--\] ++ a48: 0004c4b700f8a700 \.329 ffs\[gprB_15, \*l\$index3\[9\]\] ++ a50: 000880a720000300 \.330 ffs\[\*l\$index0, gprB_0\] ++ a58: 000108a722090700 \.331 ffs\[\*l\$index3, \*n\$index\] ++ a60: 000128a723190f00 \.332 ffs\[\*l\$index3--, \*n\$index\+\+\] ++ a68: 0003c3a740fc000f \.333 ffs\[gprA_15, gprA_15\], no_cc, gpr_wrboth ++ a70: 000972a740fc000f \.334 ffs\[gprA_15, gprA_15\], gpr_wrboth, predicate_cc ++ a78: 000320f0000c0803 \.335 immed\[gprA_3, 0x2\] ++ a80: 000480e8004d4803 \.336 jump\[gprA_3, \.338\] ++ a88: 0006a0d854408038 \.337 br\[\.337\] ++ a90: 000460f000002701 \.338 immed\[gprB_9, 0x1\] ++ a98: 0006a0d854408038 \.339 br\[\.337\] ++ aa0: 0005e0f000002702 \.340 immed\[gprB_9, 0x2\] ++ aa8: 0006a0d854408038 \.341 br\[\.337\] ++ ab0: 000500f000002703 \.342 immed\[gprB_9, 0x3\] ++ ab8: 0006a0d854408038 \.343 br\[\.337\] ++ ac0: 000040c001000000 \.344 ld_field\[gprA_0, 0001, gprB_0\] ++ ac8: 0007e2c001000000 \.345 ld_field\[gprA_0, 0001, gprB_0\], gpr_wrboth ++ ad0: 000e40c401000000 \.346 ld_field\[gprA_0, 0001, gprB_0\], load_cc ++ ad8: 000790c001000000 \.347 ld_field\[gprA_0, 0001, gprB_0\], predicate_cc ++ ae0: 0005c0c005000000 \.348 ld_field\[gprA_0, 0101, gprB_0\] ++ ae8: 000080c005100000 \.349 ld_field_w_clr\[gprA_0, 0101, gprB_0\] ++ af0: 0002a2c001100000 \.350 ld_field_w_clr\[gprA_0, 0001, gprB_0\], gpr_wrboth ++ af8: 000b00c401100000 \.351 ld_field_w_clr\[gprA_0, 0001, gprB_0\], load_cc ++ b00: 0002d0c001100000 \.352 ld_field_w_clr\[gprA_0, 0001, gprB_0\], predicate_cc ++ b08: 000fc0c00f000000 \.353 ld_field\[gprA_0, 1111, gprB_0\] ++ b10: 0005e0c1fb000200 \.354 ld_field\[gprA_0, 1011, gprB_0, <<1\] ++ b18: 000460c01b000100 \.355 ld_field\[gprA_0, 1011, gprB_0, >>1\] ++ b20: 000e60c1fb000100 \.356 ld_field\[gprA_0, 1011, gprB_0, >>31\] ++ b28: 000bc0c09b000000 \.357 ld_field\[gprA_0, 1011, gprB_0, >>rot9\] ++ b30: 000e80c09b100000 \.358 ld_field_w_clr\[gprA_0, 1011, gprB_0, >>rot9\] ++ b38: 0001c0c17b000000 \.359 ld_field\[gprA_0, 1011, gprB_0, >>rot23\] ++ b40: 0002c0c41b000000 \.360 ld_field\[gprA_0, 1011, gprB_0, >>rot1\], load_cc ++ b48: 000780c41b100000 \.361 ld_field_w_clr\[gprA_0, 1011, gprB_0, >>rot1\], load_cc ++ b50: 000400f0001f7c01 \.362 immed\[gprA_1, 0x1df\] ++ b58: 000200f0001007df \.363 immed\[gprB_1, 0x1df\] ++ b60: 0005a2f0001007df \.364 immed\[gprB_1, 0x1df\], gpr_wrboth ++ b68: 0005d0f0001007df \.365 immed\[gprB_1, 0x1df\], predicate_cc ++ b70: 000020fc010c0000 \.366 local_csr_rd\[ALUOut\] ++ b78: 000e60f0000c000b \.367 immed\[gprA_11, 0x0\] ++ b80: 000ce0fc160c0000 \.368 local_csr_rd\[MiscControl\] ++ b88: 000e60f0000c000b \.369 immed\[gprA_11, 0x0\] ++ b90: 000ae0fc076c0b02 \.370 local_csr_wr\[XferIndex, 0x2\] ++ b98: 0008a0fc076c0003 \.371 local_csr_wr\[XferIndex, gprA_3\] ++ ba0: 000520fc07600f00 \.372 local_csr_wr\[XferIndex, gprB_3\] ++ ba8: 000f20fc01a00f00 \.373 local_csr_wr\[CtxEnables, gprB_3\] ++ bb0: 000480f800000c02 \.374 mul_step\[gprA_2, gprB_3\], start ++ bb8: 000880f980000c02 \.375 mul_step\[gprA_2, gprB_3\], 32x32_step1 ++ bc0: 000dc0f980100c02 \.376 mul_step\[gprA_2, gprB_3\], 32x32_step2 ++ bc8: 0001c0f980200c02 \.377 mul_step\[gprA_2, gprB_3\], 32x32_step3 ++ bd0: 000480f980300c02 \.378 mul_step\[gprA_2, gprB_3\], 32x32_step4 ++ bd8: 000940f9804c0002 \.379 mul_step\[gprA_2, --\], 32x32_last ++ be0: 000ce0f9805c0003 \.380 mul_step\[gprA_3, --\], 32x32_last2 ++ be8: 0001a0f800000802 \.381 mul_step\[gprA_2, gprB_2\], start ++ bf0: 000aa0f900000802 \.382 mul_step\[gprA_2, gprB_2\], 16x16_step1 ++ bf8: 000fe0f900100802 \.383 mul_step\[gprA_2, gprB_2\], 16x16_step2 ++ c00: 000f20f9004c0000 \.384 mul_step\[gprA_0, --\], 16x16_last ++ c08: 0001a0f800000802 \.385 mul_step\[gprA_2, gprB_2\], start ++ c10: 0006a0f880000802 \.386 mul_step\[gprA_2, gprB_2\], 24x8_step1 ++ c18: 000320f8804c0000 \.387 mul_step\[gprA_0, --\], 24x8_last ++ c20: 0001a0f800000802 \.388 mul_step\[gprA_2, gprB_2\], start ++ c28: 0006a0f880000802 \.389 mul_step\[gprA_2, gprB_2\], 24x8_step1 ++ c30: 0004f0f8804c0000 \.390 mul_step\[gprA_0, --\], 24x8_last, predicate_cc ++ c38: 0001a0f800000802 \.391 mul_step\[gprA_2, gprB_2\], start ++ c40: 0006a0f880000802 \.392 mul_step\[gprA_2, gprB_2\], 24x8_step1 ++ c48: 0009e3f8804c0000 \.393 mul_step\[gprA_0, --\], 24x8_last, no_cc, gpr_wrboth ++ c50: 000b80a330000000 \.394 pop_count1\[gprB_0\] ++ c58: 000c80a3b0000000 \.395 pop_count2\[gprB_0\] ++ c60: 000d80a180000000 \.396 pop_count3\[gprA_0, gprB_0\] ++ c68: 000b80a330000000 \.397 pop_count1\[gprB_0\] ++ c70: 000c80a3b0000000 \.398 pop_count2\[gprB_0\] ++ c78: 000743a180000000 \.399 pop_count3\[gprA_0, gprB_0\], no_cc, gpr_wrboth ++ c80: 0004a4a330088000 \.400 pop_count1\[\*l\$index3\] ++ c88: 0003a4a3b0088000 \.401 pop_count2\[\*l\$index3\] ++ c90: 0000e5a1a438c000 \.402 pop_count3\[\*n\$index\+\+, \*l\$index3\+\+\], no_cc ++ c98: 000b80a330000000 \.403 pop_count1\[gprB_0\] ++ ca0: 000c80a3b0000000 \.404 pop_count2\[gprB_0\] ++ ca8: 000731a180000000 \.405 pop_count3\[gprA_0, gprB_0\], no_cc, predicate_cc ++ cb0: 000480e8000c0000 \.406 rtn\[gprA_0\] ++ cb8: 000620e8000a0700 \.407 rtn\[n\$reg_1\] ++ cc0: 000600e800088300 \.408 rtn\[\*l\$index1\] ++ cc8: 000a64e800080300 \.409 rtn\[\*l\$index2\] ++ cd0: 000dc0e800200300 \.410 rtn\[gprB_0\], defer\[2\] ++ cd8: 0008a0a0300c0700 \.411 alu\[--, --, B, 0x1\] ++ ce0: 0004a0a0300c0b00 \.412 alu\[--, --, B, 0x2\] ++ ce8: 000000f0000c0300 \.413 nop ++ cf0: 000000f0000c0300 \.414 nop ++ cf8: 000000f0000c0300 \.415 nop ++ d00: 000000f0000c0300 \.416 nop ++ d08: 0003501842300c09 \.417 arm\[read, \$xfer_3, gprA_9, gprB_3, 2\], ctx_swap\[sig4\] ++ d10: 0005501842302403 \.418 arm\[read, \$xfer_3, gprA_3, gprB_9, 2\], ctx_swap\[sig4\] ++ d18: 0004801842300c09 \.419 arm\[read, \$xfer_3, gprA_9, <<8, gprB_3, 2\], ctx_swap\[sig4\] ++ d20: 000f241842302403 \.420 arm\[read, \$xfer_3, gprB_9, <<8, gprA_3, 2\], ctx_swap\[sig4\] ++ d28: 0004a0a0300c0b00 \.421 alu\[--, --, B, 0x2\] ++ d30: 0008861842302403 \.422 arm\[read, \$xfer_3, gprB_9, <<8, gprA_3, 2\], indirect_ref, ctx_swap\[sig4\] ++ d38: 0004a0a0300c0b00 \.423 alu\[--, --, B, 0x2\] ++ d40: 000e8618e2302703 \.424 arm\[read, \$xfer_3, gprB_9, <<8, gprA_3, 2\], indirect_ref, sig_done\[sig14\] ++ d48: 0007841842302503 \.425 arm\[read, \$xfer_3, gprB_9, <<8, gprA_3, 2\], ctx_swap\[sig4\], defer\[1\] ++ d50: 0008a0a0300c0700 \.426 alu\[--, --, B, 0x1\] ++ d58: 000f101843c00c09 \.427 arm\[read, \$xfer_28, gprA_9, gprB_3, 2\], ctx_swap\[sig4\] ++ d60: 000910184e800c09 \.428 arm\[read, \$xfer_8, gprA_9, gprB_3, 8\], ctx_swap\[sig4\] ++ d68: 000a106440800c09 \.429 cls\[add, \$xfer_8, gprA_9, gprB_3, 1\], ctx_swap\[sig4\] ++ d70: 0000f0664080a009 \.430 cls\[sub, \$xfer_8, gprA_9, 0x8, 1\], ctx_swap\[sig4\] ++ d78: 000160644284a009 \.431 cls\[add64, \$xfer_8, gprA_9, <<8, 0x8, 2\], ctx_swap\[sig4\] ++ d80: 000404664284a408 \.432 cls\[sub64, \$xfer_8, 0x9, <<8, gprA_8, 2\], ctx_swap\[sig4\] ++ d88: 0008a0a0300c0700 \.433 alu\[--, --, B, 0x1\] ++ d90: 00032c650340a708 \.434 cls\[add_imm, 0x14, 0x9, <<8, gprA_8, 2\] ++ d98: 0007506040880c09 \.435 cls\[swap/test_compare_write, \$xfer_8, gprA_9, gprB_3, 1\], ctx_swap\[sig4\] ++ da0: 00023c6500007f9a \.436 cls\[add_imm, 0x1f9a, --, 1\] ++ da8: 000038653c583f14 \.437 cls\[add_imm, 0xf14, 0xf16\] ++ db0: 000b54640013c30f \.438 cls\[add, \$xfer_1, 0xf00f, 1\] ++ db8: 0002901c10a08000 \.439 ct\[xpb_read, \$xfer_10, gprA_0, 0x0, 1\], ctx_swap\[sig1\] ++ dc0: 0007501e10a48000 \.440 ct\[reflect_read_sig_init, \$xfer_10, gprA_0, 0x0, 1\], ctx_swap\[sig1\] ++ dc8: 000a501c10a48000 \.441 ct\[ring_get, \$xfer_10, gprA_0, 0x0, 1\], ctx_swap\[sig1\] ++ dd0: 000000f0000c0300 \.442 nop ++ dd8: 000cc0474a80a009 \.443 mem\[add64, \$xfer_8, gprA_9, <<8, 0x8, 6\], ctx_swap\[sig4\] ++ de0: 000d40404280a009 \.444 mem\[read, \$xfer_8, gprA_9, <<8, 0x8, 2\], ctx_swap\[sig4\] ++ de8: 000c405c4280a009 \.445 mem\[read32, \$xfer_8, gprA_9, <<8, 0x8, 2\], ctx_swap\[sig4\] ++ df0: 000ea0554280a009 \.446 mem\[ctm\.pe_dma_to_memory_indirect/emem\.get/imem\.lb_bucket_read_local, \$xfer_8, gprA_9, <<8, 0x8, 2\], ctx_swap\[sig4\] ++ df8: 0009204c408ca309 \.447 mem\[lock128/lock384, \$xfer_8, gprA_9, <<8, 0x8, 1\], sig_done\[sig4\] ++ e00: 000f20e000000030 \.448 ctx_arb\[sig4, sig5\] ++ e08: 0000a04c488ca309 \.449 mem\[lock256/lock512, \$xfer_8, gprA_9, <<8, 0x8, 5\], sig_done\[sig4\] ++ e10: 000f20e000000030 \.450 ctx_arb\[sig4, sig5\] ++ e18: 000ae04d4084a009 \.451 mem\[microq128_pop, \$xfer_8, gprA_9, <<8, 0x8, 1\], ctx_swap\[sig4\] ++ e20: 0002204d4080a009 \.452 mem\[microq128_get, \$xfer_8, gprA_9, <<8, 0x8, 1\], ctx_swap\[sig4\] ++ e28: 000ba04d4880a009 \.453 mem\[microq256_get, \$xfer_8, gprA_9, <<8, 0x8, 5\], ctx_swap\[sig4\] ++ e30: 0003805700028309 \.454 mem\[ctm\.pe_dma_from_memory_buffer/emem\.fast_journal/imem\.lb_push_stats_local, \$xfer_0, gprA_9, <<8, 0x40, 1\] ++ e38: 0005e04e4000a309 \.455 mem\[queue128_lock, \$xfer_0, gprA_9, <<8, 0x8, 1\], sig_done\[sig4\] ++ e40: 000f20e000000030 \.456 ctx_arb\[sig4, sig5\] ++ e48: 0001a04e0004a309 \.457 mem\[queue128_unlock, \$xfer_0, gprA_9, <<8, 0x8, 1\] ++ e50: 000c604e4800a309 \.458 mem\[queue256_lock, \$xfer_0, gprA_9, <<8, 0x8, 5\], sig_done\[sig4\] ++ e58: 000f20e000000030 \.459 ctx_arb\[sig4, sig5\] ++ e60: 0008204e0804a309 \.460 mem\[queue256_unlock, \$xfer_0, gprA_9, <<8, 0x8, 5\] ++ e68: 0008a05000001309 \.461 mem\[ctm\.packet_wait_packet_status/emem\.rd_qdesc/imem\.stats_log, \$xfer_0, gprA_9, <<8, gprB_4, 1\] ++ e70: 000b840092200c02 \.462 ila\[read, \$xfer_2, gprB_3, <<8, gprA_2, 2\], ctx_swap\[sig9\] ++ e78: 0005440182240f02 \.463 ila\[write_check_error, \$xfer_2, gprB_3, <<8, gprA_2, 2\], sig_done\[sig8\] ++ e80: 000d60e000000300 \.464 ctx_arb\[sig8, sig9\] ++ e88: 0007800410600000 \.465 nbi\[read, \$xfer_6, gprA_0, <<8, gprB_0, 1\], ctx_swap\[sig1\] ++ e90: 0002600c62000000 \.466 pcie\[read, \$xfer_0, gprA_0, <<8, gprB_0, 2\], ctx_swap\[sig6\] ++ e98: 0004c40d62000000 \.467 pcie\[write, \$xfer_0, gprB_0, <<8, gprA_0, 2\], ctx_swap\[sig6\] ++ ea0: 000d601462000000 \.468 crypto\[read, \$xfer_0, gprA_0, <<8, gprB_0, 2\], ctx_swap\[sig6\] ++ ea8: 0006601562000000 \.469 crypto\[write, \$xfer_0, gprA_0, <<8, gprB_0, 2\], ctx_swap\[sig6\] ++ eb0: 0000601662000000 \.470 crypto\[write_fifo, \$xfer_0, gprA_0, <<8, gprB_0, 2\], ctx_swap\[sig6\] ++ eb8: 000d840d60000050 \.471 pcie\[write, \$xfer_0, gprB_0, <<8, \*l\$index0, 1\], ctx_swap\[sig6\] ++ ec0: 0009e40d60000058 \.472 pcie\[write, \$xfer_0, gprB_0, <<8, \*l\$index1, 1\], ctx_swap\[sig6\] ++ ec8: 0009040d60000059 \.473 pcie\[write, \$xfer_0, gprB_0, <<8, \*l\$index1\[1\], 1\], ctx_swap\[sig6\] ++ ed0: 000000f0000c0300 \.474 nop ++ ed8: 000000f0000c0300 \.475 nop ++ ee0: 000000f0000c0300 \.476 nop ++ ee8: 000000f0000c0300 \.477 nop ++ ef0: 000000f0000c0300 \.478 nop ++ ef8: 000060a900301340 \.479 crc_be\[crc_ccitt, gprA_3, gprB_4\] ++ f00: 000000f0000c0300 \.480 nop ++ f08: 000e20b9403d0004 \.481 crc_be\[crc_ccitt, gprB_3, gprA_4\] ++ f10: 000000f0000c0300 \.482 nop ++ f18: 000400a900301348 \.483 crc_le\[crc_ccitt, gprA_3, gprB_4\] ++ f20: 000000f0000c0300 \.484 nop ++ f28: 000400b9403d2004 \.485 crc_le\[crc_ccitt, gprB_3, gprA_4\] ++ f30: 000000f0000c0300 \.486 nop ++ f38: 0002e0b900301348 \.487 crc_le\[crc_ccitt, gprB_3, gprB_4\] ++ f40: 000000f0000c0300 \.488 nop ++ f48: 0002e0a9403d2004 \.489 crc_le\[crc_ccitt, gprA_3, gprA_4\] ++ f50: 000000f0000c0300 \.490 nop ++ f58: 000220e000020000 \.491 ctx_arb\[bpt\] ++ f60: 000420e000010000 \.492 ctx_arb\[kill\] +--- /dev/null 2019-03-07 09:27:55.425999321 +0000 ++++ binutils-2.30/binutils/testsuite/binutils-all/nfp/test2_ctx8.d 2019-03-07 14:44:05.716268317 +0000 +@@ -0,0 +1,16 @@ ++ ++.*: file format elf64-nfp ++ ++ ++Disassembly of section \.text\.i32\.me0: ++ ++0000000000000000 <\.text\.i32\.me0>: ++ 0: 000d80a0300c0300 \.0 alu\[--, --, B, 0x0\] ++ 8: 0008a0a0300c0700 \.1 alu\[--, --, B, 0x1\] ++ 10: 0004a0a0300c0b00 \.2 alu\[--, --, B, 0x2\] ++ 18: 000180a0300c0f00 \.3 alu\[--, --, B, 0x3\] ++ 20: 0004a0a018cc1300 \.4 alu\[\$xfer_12, --, B, 0x4\] ++ 28: 0001c0a019fc1700 \.5 alu\[\$xfer_15, --, B, 0x5\] ++ 30: 000400a0b00c198c \.6 alu\[--, \$xfer_12, \+, 0x6\] ++ 38: 0008c0a0b00c1d9f \.7 alu\[--, \$xfer_15, \+, 0x7\] ++ 40: 000220e000020000 \.8 ctx_arb\[bpt\] +--- /dev/null 2019-03-07 09:27:55.425999321 +0000 ++++ binutils-2.30/binutils/testsuite/binutils-all/nfp/test2_no-pc_ctx4.d 2019-03-07 14:44:05.716268317 +0000 +@@ -0,0 +1,16 @@ ++ ++.*: file format elf64-nfp ++ ++ ++Disassembly of section \.text\.i32\.me0: ++ ++0000000000000000 <\.text\.i32\.me0>: ++ 0: 000d80a0300c0300 alu\[--, --, B, 0x0\] ++ 8: 0008a0a0300c0700 alu\[--, --, B, 0x1\] ++ 10: 0004a0a0300c0b00 alu\[--, --, B, 0x2\] ++ 18: 000180a0300c0f00 alu\[--, --, B, 0x3\] ++ 20: 0004a0a018cc1300 alu\[\$xfer_12, --, B, 0x4\] ++ 28: 0001c0a019fc1700 alu\[\$xfer_31, --, B, 0x5\] ++ 30: 000400a0b00c198c alu\[--, \$xfer_12, \+, 0x6\] ++ 38: 0008c0a0b00c1d9f alu\[--, \$xfer_31, \+, 0x7\] ++ 40: 000220e000020000 ctx_arb\[bpt\] +--- /dev/null 2019-03-07 09:27:55.425999321 +0000 ++++ binutils-2.30/include/elf/nfp.h 2019-03-07 14:44:05.716268317 +0000 +@@ -0,0 +1,292 @@ ++/* NFP ELF support for BFD. ++ Copyright (C) 2017-2018 Free Software Foundation, Inc. ++ Contributed by Francois H. Theron ++ ++ This file is part of BFD, the Binary File Descriptor library. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software Foundation, ++ Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ ++ ++#ifndef _ELF_NFP_H ++#define _ELF_NFP_H ++ ++#include "bfd.h" ++#include "elf/common.h" ++#include "elf/reloc-macros.h" ++#include "bfd_stdint.h" ++ ++#ifdef __cplusplus ++extern "C" ++{ ++#endif ++ ++#define ET_NFP_PARTIAL_REL (ET_LOPROC + ET_REL) ++#define ET_NFP_PARTIAL_EXEC (ET_LOPROC + ET_EXEC) ++ ++/* NFP e_flags - chip family ++ Valid values for FAMILY are: ++ 0x3200 - NFP-32xx ++ 0x6000 - NFP-6xxx/NFP-4xxx. */ ++#define EF_NFP_MACH(ef_nfp) (((ef_nfp) >> 8) & 0xFFFF) ++#define EF_NFP_SET_MACH(nfp_fam) (((nfp_fam) & 0xFFFF) << 8) ++ ++#define E_NFP_MACH_3200 0x3200 ++#define E_NFP_MACH_6000 0x6000 ++ ++#define NFP_3200_CPPTGT_MSF0 1 ++#define NFP_3200_CPPTGT_QDR 2 ++#define NFP_3200_CPPTGT_MSF1 3 ++#define NFP_3200_CPPTGT_HASH 4 ++#define NFP_3200_CPPTGT_MU 7 ++#define NFP_3200_CPPTGT_GS 8 ++#define NFP_3200_CPPTGT_PCIE 9 ++#define NFP_3200_CPPTGT_ARM 10 ++#define NFP_3200_CPPTGT_CRYPTO 12 ++#define NFP_3200_CPPTGT_CAP 13 ++#define NFP_3200_CPPTGT_CT 14 ++#define NFP_3200_CPPTGT_CLS 15 ++ ++#define NFP_6000_CPPTGT_NBI 1 ++#define NFP_6000_CPPTGT_VQDR 2 ++#define NFP_6000_CPPTGT_ILA 6 ++#define NFP_6000_CPPTGT_MU 7 ++#define NFP_6000_CPPTGT_PCIE 9 ++#define NFP_6000_CPPTGT_ARM 10 ++#define NFP_6000_CPPTGT_CRYPTO 12 ++#define NFP_6000_CPPTGT_CTXPB 14 ++#define NFP_6000_CPPTGT_CLS 15 ++ ++/* NFP Section types ++ MECONFIG - NFP-32xx only, ME CSR configurations ++ INITREG - A generic register initialisation section (chip or ME CSRs/GPRs) ++ UDEBUG - Legacy-style debug data section. */ ++#define SHT_NFP_MECONFIG (SHT_LOPROC + 1) ++#define SHT_NFP_INITREG (SHT_LOPROC + 2) ++#define SHT_NFP_UDEBUG SHT_LOUSER ++ ++/* NFP SECTION flags ++ ELF-64 sh_flags is 64-bit, but there is no info on what the upper 32 bits ++ are expected to be used for, it is not marked reserved either. ++ We'll use them for NFP-specific flags since we don't use ELF-32. ++ ++ INIT - Sections that are loaded and executed before the final text ++ microcode. Non-code INIT sections are loaded first, then other ++ memory secions, then INIT2 sections, then INIT-code sections. ++ INIT2 - Sections that are loaded before INIT-code sections, used for ++ transient configuration before executing INIT-code section ++ microcode. ++ SCS - The number of additional ME codestores being shared with the group's ++ base ME of the section, e.g. 0 for no SCS, 1 for dual and 3 for ++ quad. If this is 0 it is possible that stagger-style SCS codestore ++ sections are being used. For stagger-style each section is simply ++ loaded directly to the ME it is assigned to. If these flags are ++ used, virtual address space loading will be used - one large section ++ loaded to the group's base ME will be packed across shared MEs by ++ hardware. This is not available on all ME versions. ++ ++ NFP_ELF_SHF_GET_SCS (val) returns the number of additional codestores ++ being shared with the group's base ME, e.g. 0 for no SCS, ++ 1 for dual SCS, 3 for quad SCS. */ ++ ++#define SHF_NFP_INIT 0x80000000 ++#define SHF_NFP_INIT2 0x40000000 ++#define SHF_NFP_SCS(shf) (((shf) >> 32) & 0xFF) ++#define SHF_NFP_SET_SCS(v) (((BFD_HOST_U_64_BIT)((v) & 0xFF)) << 32) ++ ++/* NFP Section Info ++ For PROGBITS and NOBITS sections: ++ MEMTYPE - the memory type ++ DOMAIN - The island ID and ME number where the data will be loaded. ++ For NFP-32xx, this is an island number or linear ME number. ++ For NFP-6xxx, DOMAIN<15:8> == island ID, DOMAIN<7:0> is 0 based ++ ME number (if applicable). ++ For INITREG sections: ++ ISLAND - island ID (if it's a ME target, ME numbers are in the ++ section data) ++ CPPTGT - CPP Target ID ++ CPPACTRD - CPP Read Action ++ CPPTOKRD - CPP Read Token ++ CPPACTWR - CPP Write Action ++ CPPTOKWR - CPP Write Token ++ ORDER - Controls the order in which the loader processes sections with ++ the same info fields. */ ++ ++#define SHI_NFP_DOMAIN(shi) (((shi) >> 16) & 0xFFFF) ++#define SHI_NFP_MEMTYPE(shi) ( (shi) & 0xFFFF) ++#define SHI_NFP_SET_DOMAIN(v) (((v) & 0xFFFF) << 16) ++#define SHI_NFP_SET_MEMTYPE(v) ( (v) & 0xFFFF) ++ ++#define SHI_NFP_IREG_ISLAND(shi) (((shi) >> 26) & 0x3F) ++#define SHI_NFP_IREG_CPPTGT(shi) (((shi) >> 22) & 0xF) ++#define SHI_NFP_IREG_CPPACTRD(shi) (((shi) >> 17) & 0x1F) ++#define SHI_NFP_IREG_CPPTOKRD(shi) (((shi) >> 15) & 0x3) ++#define SHI_NFP_IREG_CPPACTWR(shi) (((shi) >> 10) & 0x1F) ++#define SHI_NFP_IREG_CPPTOKWR(shi) (((shi) >> 8) & 0x3) ++#define SHI_NFP_IREG_ORDER(shi) ( (shi) & 0xFF) ++#define SHI_NFP_SET_IREG_ISLAND(v) (((v) & 0x3F) << 26) ++#define SHI_NFP_SET_IREG_CPPTGT(v) (((v) & 0xF) << 22) ++#define SHI_NFP_SET_IREG_CPPACTRD(v) (((v) & 0x1F) << 17) ++#define SHI_NFP_SET_IREG_CPPTOKRD(v) (((v) & 0x3) << 15) ++#define SHI_NFP_SET_IREG_CPPACTWR(v) (((v) & 0x1F) << 10) ++#define SHI_NFP_SET_IREG_CPPTOKWR(v) (((v) & 0x3) << 8) ++#define SHI_NFP_SET_IREG_ORDER(v) ( (v) & 0xFF) ++ ++/* CtXpb/reflect_read_sig_init/reflect_write_sig_init ++ identifies Init-CSR sections for ME CSRs. */ ++#define SHI_NFP_6000_IS_IREG_MECSR(shi) ( \ ++ SHI_NFP_IREG_CPPTGT (shi) == NFP_6000_CPPTGT_CTXPB \ ++ && SHI_NFP_IREG_CPPACTRD (shi) == 2 \ ++ && SHI_NFP_IREG_CPPTOKRD (shi) == 1 \ ++ && SHI_NFP_IREG_CPPACTWR (shi) == 3 \ ++ && SHI_NFP_IREG_CPPTOKWR (shi) == 1 \ ++) ++ ++/* Transient INITREG sections will be validated against the target ++ but will not be kept - validate, write or read and discard. ++ They will still be handled last (in order). */ ++#define SHI_NFP_IREG_ORDER_TRANSIENT 0xFF ++ ++/* Below are some extra macros to translate SHI fields in more specific ++ contexts. ++ ++ For NFP-32xx, DOMAIN is set to a global linear ME number (0 to 39). ++ An NFP-32xx has 8 MEs per island and up to 5 islands. */ ++ ++#define SHI_NFP_3200_ISLAND(shi) ((SHI_NFP_DOMAIN (shi) >> 3) & 0x7) ++#define SHI_NFP_3200_MENUM(shi) ( SHI_NFP_DOMAIN (shi) & 0x7) ++#define SHI_NFP_SET_3200_ISLAND(v) SHI_NFP_SET_DOMAIN (((v) & 0x7) << 3) ++#define SHI_NFP_SET_3200_MENUM(v) SHI_NFP_SET_DOMAIN ( (v) & 0x7) ++ ++#define SHI_NFP_ISLAND(shi) ((SHI_NFP_DOMAIN (shi) >> 8) & 0xFF) ++#define SHI_NFP_MENUM(shi) ( SHI_NFP_DOMAIN (shi) & 0xFF) ++#define SHI_NFP_SET_ISLAND(shi) SHI_NFP_SET_DOMAIN (((shi) & 0xFF) << 8) ++#define SHI_NFP_SET_MENUM(shi) SHI_NFP_SET_DOMAIN ( (shi) & 0xFF) ++ ++#define SHI_NFP_MEMTYPE_NONE 0 ++#define SHI_NFP_MEMTYPE_USTORE 1 ++#define SHI_NFP_MEMTYPE_LMEM 2 ++#define SHI_NFP_MEMTYPE_CLS 3 ++#define SHI_NFP_MEMTYPE_DRAM 4 ++#define SHI_NFP_MEMTYPE_MU 4 ++#define SHI_NFP_MEMTYPE_SRAM 5 ++#define SHI_NFP_MEMTYPE_GS 6 ++#define SHI_NFP_MEMTYPE_PPC_LMEM 7 ++#define SHI_NFP_MEMTYPE_PPC_SMEM 8 ++#define SHI_NFP_MEMTYPE_EMU_CACHE 9 ++ ++/* VTP_FORCE is for use by the NFP Linker+Loader only. */ ++#define NFP_IREG_VTP_FORCE 0 ++#define NFP_IREG_VTP_CONST 1 ++#define NFP_IREG_VTP_REQUIRED 2 ++#define NFP_IREG_VTP_VOLATILE_INIT 3 ++#define NFP_IREG_VTP_VOLATILE_NOINIT 4 ++#define NFP_IREG_VTP_INVALID 5 ++ ++/* Init-CSR entry w0 fields: ++ NLW - Not Last Word ++ CTX - ME context number (if applicable) ++ VTP - Value type ++ COH - CPP Offset High 8 bits. */ ++#define NFP_IREG_ENTRY_WO_NLW(w0) (((w0) >> 31) & 0x1) ++#define NFP_IREG_ENTRY_WO_CTX(w0) (((w0) >> 28) & 0x7) ++#define NFP_IREG_ENTRY_WO_VTP(w0) (((w0) >> 25) & 0x7) ++#define NFP_IREG_ENTRY_WO_COH(w0) (((w0) >> 0) & 0xFF) ++ ++typedef struct ++{ ++ uint32_t w0; ++ uint32_t cpp_offset_lo; ++ uint32_t val; ++ uint32_t mask; ++} Elf_Nfp_InitRegEntry; ++ ++typedef struct ++{ ++ uint32_t ctx_enables; ++ uint32_t entry; ++ uint32_t misc_control; ++ uint32_t reserved; ++} Elf_Nfp_MeConfig; ++ ++/* Relocations. */ ++START_RELOC_NUMBERS (elf_nfp3200_reloc_type) ++ RELOC_NUMBER (R_NFP3200_NOTYPE, 0) ++ RELOC_NUMBER (R_NFP3200_W32LE, 1) ++ RELOC_NUMBER (R_NFP3200_SRC8_A, 2) ++ RELOC_NUMBER (R_NFP3200_SRC8_B, 3) ++ RELOC_NUMBER (R_NFP3200_IMMED8_I, 4) ++ RELOC_NUMBER (R_NFP3200_SC, 5) ++ RELOC_NUMBER (R_NFP3200_IMMED_LO16_I_A, 6) ++ RELOC_NUMBER (R_NFP3200_IMMED_LO16_I_B, 7) ++ RELOC_NUMBER (R_NFP3200_SRC7_B, 8) ++ RELOC_NUMBER (R_NFP3200_SRC7_A, 9) ++ RELOC_NUMBER (R_NFP3200_SRC8_I_B, 10) ++ RELOC_NUMBER (R_NFP3200_SRC8_I_A, 11) ++ RELOC_NUMBER (R_NFP3200_IMMED_HI16_I_A, 12) ++ RELOC_NUMBER (R_NFP3200_IMMED_HI16_I_B, 13) ++ RELOC_NUMBER (R_NFP3200_RSVD_0, 14) ++ RELOC_NUMBER (R_NFP3200_RSVD_1, 15) ++ RELOC_NUMBER (R_NFP3200_RSVD_2, 16) ++ RELOC_NUMBER (R_NFP3200_RSVD_3, 17) ++ RELOC_NUMBER (R_NFP3200_RSVD_4, 18) ++ RELOC_NUMBER (R_NFP3200_RSVD_5, 19) ++ RELOC_NUMBER (R_NFP3200_RSVD_6, 20) ++ RELOC_NUMBER (R_NFP3200_W64LE, 21) ++ RELOC_NUMBER (R_NFP3200_W32BE, 22) ++ RELOC_NUMBER (R_NFP3200_W64BE, 23) ++ RELOC_NUMBER (R_NFP3200_W32LE_AND, 24) ++ RELOC_NUMBER (R_NFP3200_W32BE_AND, 25) ++ RELOC_NUMBER (R_NFP3200_W32LE_OR, 26) ++ RELOC_NUMBER (R_NFP3200_W32BE_OR, 27) ++ RELOC_NUMBER (R_NFP3200_W64LE_AND, 28) ++ RELOC_NUMBER (R_NFP3200_W64BE_AND, 29) ++ RELOC_NUMBER (R_NFP3200_W64LE_OR, 30) ++ RELOC_NUMBER (R_NFP3200_W64BE_OR, 31) ++END_RELOC_NUMBERS (R_NFP3200_MAX) ++ ++START_RELOC_NUMBERS (elf_nfp_reloc_type) ++ RELOC_NUMBER (R_NFP_NOTYPE, 0) ++ RELOC_NUMBER (R_NFP_W32LE, 1) ++ RELOC_NUMBER (R_NFP_SRC8_A, 2) ++ RELOC_NUMBER (R_NFP_SRC8_B, 3) ++ RELOC_NUMBER (R_NFP_IMMED8_I, 4) ++ RELOC_NUMBER (R_NFP_SC, 5) ++ RELOC_NUMBER (R_NFP_IMMED_LO16_I_A, 6) ++ RELOC_NUMBER (R_NFP_IMMED_LO16_I_B, 7) ++ RELOC_NUMBER (R_NFP_SRC7_B, 8) ++ RELOC_NUMBER (R_NFP_SRC7_A, 9) ++ RELOC_NUMBER (R_NFP_SRC8_I_B, 10) ++ RELOC_NUMBER (R_NFP_SRC8_I_A, 11) ++ RELOC_NUMBER (R_NFP_IMMED_HI16_I_A, 12) ++ RELOC_NUMBER (R_NFP_IMMED_HI16_I_B, 13) ++ RELOC_NUMBER (R_NFP_W64LE, 14) ++ RELOC_NUMBER (R_NFP_SH_INFO, 15) ++ RELOC_NUMBER (R_NFP_W32BE, 16) ++ RELOC_NUMBER (R_NFP_W64BE, 17) ++ RELOC_NUMBER (R_NFP_W32_29_24, 18) ++ RELOC_NUMBER (R_NFP_W32LE_AND, 19) ++ RELOC_NUMBER (R_NFP_W32BE_AND, 20) ++ RELOC_NUMBER (R_NFP_W32LE_OR, 21) ++ RELOC_NUMBER (R_NFP_W32BE_OR, 22) ++ RELOC_NUMBER (R_NFP_W64LE_AND, 23) ++ RELOC_NUMBER (R_NFP_W64BE_AND, 24) ++ RELOC_NUMBER (R_NFP_W64LE_OR, 25) ++ RELOC_NUMBER (R_NFP_W64BE_OR, 26) ++END_RELOC_NUMBERS (R_NFP_MAX) ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif /* _ELF_NFP_H */ +--- /dev/null 2019-03-07 09:27:55.425999321 +0000 ++++ binutils-2.30/include/opcode/nfp.h 2019-03-07 14:50:55.251991587 +0000 +@@ -0,0 +1,175 @@ ++/* nfp.h. NFP opcode list. ++ Copyright (C) 2017-2019 Free Software Foundation, Inc. ++ Contributed by Francois H. Theron ++ ++ This file is part of the GNU opcodes library. ++ ++ GDB, GAS, and the GNU binutils are free software; you can redistribute ++ them and/or modify them under the terms of the GNU General Public ++ License as published by the Free Software Foundation; either version 3, ++ or (at your option) any later version. ++ ++ GDB, GAS, and the GNU binutils are distributed in the hope that they ++ will be useful, but WITHOUT ANY WARRANTY; without even the implied ++ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ the GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this file; see the file COPYING3. If not, write to the Free ++ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, ++ MA 02110-1301, USA. */ ++ ++#ifndef _NFP_H_ ++#define _NFP_H_ ++ ++#include "bfd.h" ++#include "bfd_stdint.h" ++#include "elf/nfp.h" ++ ++#ifdef __cplusplus ++extern "C" ++{ ++#endif ++ ++/* We use ME versions for most of this rather than NFP family and revision ++ numbers. The version numbers are currently 2.7 and 2.8 and to avoid long ++ names with many underscores we'll just use 27 and 28 until some feature ++ number makes it necessary to do something different. */ ++ ++#define NFP_ME27_INSTR_MASK_CMD ((uint64_t) 0x008000000000) ++#define NFP_ME27_INSTR_CMD ((uint64_t) 0x000000000000) ++#define NFP_ME27_INSTR_IS_CMD(instr) \ ++ ((instr & NFP_ME27_INSTR_MASK_CMD) == NFP_ME27_INSTR_CMD) ++ ++#define NFP_ME27_INSTR_MASK_ALU_SHF ((uint64_t) 0x1ee000000000) ++#define NFP_ME27_INSTR_ALU_SHF ((uint64_t) 0x008000000000) ++#define NFP_ME27_INSTR_IS_ALU_SHF(instr) \ ++ ((instr & NFP_ME27_INSTR_MASK_ALU_SHF) == NFP_ME27_INSTR_ALU_SHF) ++ ++#define NFP_ME27_INSTR_MASK_ALU ((uint64_t) 0x1ee000000000) ++#define NFP_ME27_INSTR_ALU ((uint64_t) 0x00a000000000) ++#define NFP_ME27_INSTR_IS_ALU(instr) \ ++ ((instr & NFP_ME27_INSTR_MASK_ALU) == NFP_ME27_INSTR_ALU) ++ ++#define NFP_ME27_INSTR_MASK_IMMED ((uint64_t) 0x1ff900000000) ++#define NFP_ME27_INSTR_IMMED ((uint64_t) 0x00f000000000) ++#define NFP_ME27_INSTR_IS_IMMED(instr) \ ++ ((instr & NFP_ME27_INSTR_MASK_IMMED) == NFP_ME27_INSTR_IMMED) ++ ++#define NFP_ME27_INSTR_MASK_LD_FIELD ((uint64_t) 0x1ffa00e00000) ++#define NFP_ME27_INSTR_LD_FIELD ((uint64_t) 0x00c000000000) ++#define NFP_ME27_INSTR_IS_LD_FIELD(instr) \ ++ ((instr & NFP_ME27_INSTR_MASK_LD_FIELD) == NFP_ME27_INSTR_LD_FIELD) ++ ++#define NFP_ME27_INSTR_MASK_CTX_ARB ((uint64_t) 0x00f800000000) ++#define NFP_ME27_INSTR_CTX_ARB ((uint64_t) 0x00e000000000) ++#define NFP_ME27_INSTR_IS_CTX_ARB(instr) \ ++ ((instr & NFP_ME27_INSTR_MASK_CTX_ARB) == NFP_ME27_INSTR_CTX_ARB) ++ ++#define NFP_ME27_INSTR_MASK_LOCAL_CSR ((uint64_t) 0x1ffe00100000) ++#define NFP_ME27_INSTR_LOCAL_CSR ((uint64_t) 0x00fc00000000) ++#define NFP_ME27_INSTR_IS_LOCAL_CSR(instr) \ ++ ((instr & NFP_ME27_INSTR_MASK_LOCAL_CSR) == NFP_ME27_INSTR_LOCAL_CSR) ++ ++#define NFP_ME27_INSTR_MASK_BRANCH ((uint64_t) 0x00f8000c3ce0) ++#define NFP_ME27_INSTR_BRANCH ((uint64_t) 0x00d800000020) ++#define NFP_ME27_INSTR_IS_BRANCH(instr) \ ++ ((instr & NFP_ME27_INSTR_MASK_BRANCH) == NFP_ME27_INSTR_BRANCH) ++ ++#define NFP_ME27_INSTR_MASK_BR_BYTE ((uint64_t) 0x00f800000000) ++#define NFP_ME27_INSTR_BR_BYTE ((uint64_t) 0x00c800000000) ++#define NFP_ME27_INSTR_IS_BR_BYTE(instr) \ ++ ((instr & NFP_ME27_INSTR_MASK_BR_BYTE) == NFP_ME27_INSTR_BR_BYTE) ++ ++#define NFP_ME27_INSTR_MASK_BR_BIT ((uint64_t) 0x00f800080300) ++#define NFP_ME27_INSTR_BR_BIT ((uint64_t) 0x00d000000000) ++#define NFP_ME27_INSTR_IS_BR_BIT(instr) \ ++ ((instr & NFP_ME27_INSTR_MASK_BR_BIT) == NFP_ME27_INSTR_BR_BIT) ++ ++#define NFP_ME27_INSTR_MASK_BR_ALU ((uint64_t) 0x1fff80000000) ++#define NFP_ME27_INSTR_BR_ALU ((uint64_t) 0x00e800000000) ++#define NFP_ME27_INSTR_IS_BR_ALU(instr) \ ++ ((instr & NFP_ME27_INSTR_MASK_BR_ALU) == NFP_ME27_INSTR_BR_ALU) ++ ++#define NFP_ME27_INSTR_MASK_MULT ((uint64_t) 0x1efe3f000000) ++#define NFP_ME27_INSTR_MULT ((uint64_t) 0x00f800000000) ++#define NFP_ME27_INSTR_IS_MULT(instr) \ ++ ((instr & NFP_ME27_INSTR_MASK_MULT) == NFP_ME27_INSTR_MULT) ++ ++ ++#define NFP_ME28_INSTR_MASK_CMD ((uint64_t) 0x008000000000) ++#define NFP_ME28_INSTR_CMD ((uint64_t) 0x000000000000) ++#define NFP_ME28_INSTR_IS_CMD(instr) \ ++ ((instr & NFP_ME28_INSTR_MASK_CMD) == NFP_ME28_INSTR_CMD) ++ ++#define NFP_ME28_INSTR_MASK_ALU_SHF ((uint64_t) 0x00e000000000) ++#define NFP_ME28_INSTR_ALU_SHF ((uint64_t) 0x008000000000) ++#define NFP_ME28_INSTR_IS_ALU_SHF(instr) \ ++ ((instr & NFP_ME28_INSTR_MASK_ALU_SHF) == NFP_ME28_INSTR_ALU_SHF) ++ ++#define NFP_ME28_INSTR_MASK_ALU ((uint64_t) 0x00e000000000) ++#define NFP_ME28_INSTR_ALU ((uint64_t) 0x00a000000000) ++#define NFP_ME28_INSTR_IS_ALU(instr) \ ++ ((instr & NFP_ME28_INSTR_MASK_ALU) == NFP_ME28_INSTR_ALU) ++ ++#define NFP_ME28_INSTR_MASK_IMMED ((uint64_t) 0x01f900000000) ++#define NFP_ME28_INSTR_IMMED ((uint64_t) 0x00f000000000) ++#define NFP_ME28_INSTR_IS_IMMED(instr) \ ++ ((instr & NFP_ME28_INSTR_MASK_IMMED) == NFP_ME28_INSTR_IMMED) ++ ++#define NFP_ME28_INSTR_MASK_LD_FIELD ((uint64_t) 0x01fa00e00000) ++#define NFP_ME28_INSTR_LD_FIELD ((uint64_t) 0x00c000000000) ++#define NFP_ME28_INSTR_IS_LD_FIELD(instr) \ ++ ((instr & NFP_ME28_INSTR_MASK_LD_FIELD) == NFP_ME28_INSTR_LD_FIELD) ++ ++#define NFP_ME28_INSTR_MASK_CTX_ARB ((uint64_t) 0x00f800000000) ++#define NFP_ME28_INSTR_CTX_ARB ((uint64_t) 0x00e000000000) ++#define NFP_ME28_INSTR_IS_CTX_ARB(instr) \ ++ ((instr & NFP_ME28_INSTR_MASK_CTX_ARB) == NFP_ME28_INSTR_CTX_ARB) ++ ++#define NFP_ME28_INSTR_MASK_LOCAL_CSR ((uint64_t) 0x01fe00100000) ++#define NFP_ME28_INSTR_LOCAL_CSR ((uint64_t) 0x00fc00000000) ++#define NFP_ME28_INSTR_IS_LOCAL_CSR(instr) \ ++ ((instr & NFP_ME28_INSTR_MASK_LOCAL_CSR) == NFP_ME28_INSTR_LOCAL_CSR) ++ ++#define NFP_ME28_INSTR_MASK_BRANCH ((uint64_t) 0x00f8000c3ce0) ++#define NFP_ME28_INSTR_BRANCH ((uint64_t) 0x00d800000020) ++#define NFP_ME28_INSTR_IS_BRANCH(instr) \ ++ ((instr & NFP_ME28_INSTR_MASK_BRANCH) == NFP_ME28_INSTR_BRANCH) ++ ++#define NFP_ME28_INSTR_MASK_BR_BYTE ((uint64_t) 0x00f800000000) ++#define NFP_ME28_INSTR_BR_BYTE ((uint64_t) 0x00c800000000) ++#define NFP_ME28_INSTR_IS_BR_BYTE(instr) \ ++ ((instr & NFP_ME28_INSTR_MASK_BR_BYTE) == NFP_ME28_INSTR_BR_BYTE) ++ ++#define NFP_ME28_INSTR_MASK_BR_BIT ((uint64_t) 0x00f800080300) ++#define NFP_ME28_INSTR_BR_BIT ((uint64_t) 0x00d000000000) ++#define NFP_ME28_INSTR_IS_BR_BIT(instr) \ ++ ((instr & NFP_ME28_INSTR_MASK_BR_BIT) == NFP_ME28_INSTR_BR_BIT) ++ ++#define NFP_ME28_INSTR_MASK_BR_ALU ((uint64_t) 0x00ff80000000) ++#define NFP_ME28_INSTR_BR_ALU ((uint64_t) 0x00e800000000) ++#define NFP_ME28_INSTR_IS_BR_ALU(instr) \ ++ ((instr & NFP_ME28_INSTR_MASK_BR_ALU) == NFP_ME28_INSTR_BR_ALU) ++ ++#define NFP_ME28_INSTR_MASK_MULT ((uint64_t) 0x00fe3f000000) ++#define NFP_ME28_INSTR_MULT ((uint64_t) 0x00f800000000) ++#define NFP_ME28_INSTR_IS_MULT(instr) \ ++ ((instr & NFP_ME28_INSTR_MASK_MULT) == NFP_ME28_INSTR_MULT) ++ ++typedef struct ++{ ++ int cpp_target; ++ int cpp_action; ++ int cpp_token; ++ unsigned int len_fixed; ++ unsigned int len_mask; ++ const char *mnemonic; ++} ++nfp_cmd_mnemonic; ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif /* _NFP_H_ */ +--- /dev/null 2019-03-07 09:27:55.425999321 +0000 ++++ binutils-2.30/opcodes/nfp-dis.c 2019-03-07 15:04:02.282705484 +0000 +@@ -0,0 +1,2982 @@ ++/* Print NFP instructions for objdump. ++ Copyright (C) 2017-2019 Free Software Foundation, Inc. ++ Contributed by Francois H. Theron ++ ++ This file is part of the GNU opcodes library. ++ ++ This library is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3, or (at your option) ++ any later version. ++ ++ It is distributed in the hope that it will be useful, but WITHOUT ++ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ++ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public ++ License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, ++ MA 02110-1301, USA. */ ++ ++/* There will be many magic numbers here that are based on hardware. ++ Making #define macros for each encoded bit field will probably reduce ++ readability far more than the simple numbers will, so we make sure that ++ the context of the magic numbers make it clear what they are used for. */ ++ ++#include "sysdep.h" ++#include ++#include "disassemble.h" ++#include "libiberty.h" ++#include "elf/nfp.h" ++#include "opcode/nfp.h" ++#include "opintl.h" ++#include "elf-bfd.h" ++#include "bfd.h" ++#include "bfd_stdint.h" ++ ++#define _NFP_ERR_STOP -1 ++#define _NFP_ERR_CONT -8 ++ ++#define _BTST(v, b) (((v) >> b) & 1) ++#define _BF(v, msb, lsb) (((v) >> (lsb)) & \ ++ ((1U << ((msb) - (lsb) + 1)) - 1)) ++#define _BFS(v, msb, lsb, lshift) (_BF(v, msb, lsb) << (lshift)) ++ ++#define _NFP_ME27_28_CSR_CTX_ENABLES 0x18 ++#define _NFP_ME27_28_CSR_MISC_CONTROL 0x160 ++ ++typedef struct ++{ ++ unsigned char ctx4_mode:1; ++ unsigned char addr_3rdparty32:1; ++ unsigned char scs_cnt:2; ++ unsigned char _future:4; ++} ++nfp_priv_mecfg; ++ ++typedef struct ++{ ++ unsigned char show_pc; ++ unsigned char ctx_mode; ++} ++nfp_opts; ++ ++/* mecfgs[island][menum][is-text] */ ++typedef struct ++{ ++ nfp_priv_mecfg mecfgs[64][12][2]; ++} ++nfp_priv_data; ++ ++static const char *nfp_mealu_shf_op[8] = ++{ ++ /* 0b000 (0) */ "B", ++ /* 0b001 (1) */ "~B", ++ /* 0b010 (2) */ "AND", ++ /* 0b011 (3) */ "~AND", ++ /* 0b100 (4) */ "AND~", ++ /* 0b101 (5) */ "OR", ++ /* 0b110 (6) */ "asr", ++ /* 0b111 (7) */ "byte_align" ++}; ++ ++static const char *nfp_me27_28_alu_op[32] = ++{ ++ /* 0b00000 (0) */ "B", ++ /* 0b00001 (1) */ "+", ++ NULL, ++ /* 0b00011 (3) */ "pop_count3", ++ /* 0b00100 (4) */ "~B", ++ /* 0b00101 (5) */ "+16", ++ /* 0b00110 (6) */ "pop_count1", ++ /* 0b00111 (7) */ "pop_count2", ++ /* 0b01000 (8) */ "AND", ++ /* 0b01001 (9) */ "+8", ++ NULL, ++ /* 0b01011 (11) */ "cam_clear", ++ /* 0b01100 (12) */ "~AND", ++ /* 0b01101 (13) */ "-carry", ++ /* 0b01110 (14) */ "ffs", ++ /* 0b01111 (15) */ "cam_read_tag", ++ /* 0b10000 (16) */ "AND~", ++ /* 0b10001 (17) */ "+carry", ++ /* 0b10010 (18) */ "CRC", ++ /* 0b10011 (19) */ "cam_write", ++ /* 0b10100 (20) */ "OR", ++ /* 0b10101 (21) */ "-", ++ NULL, ++ /* 0b10111 (23) */ "cam_lookup", ++ /* 0b11000 (24) */ "XOR", ++ /* 0b11001 (25) */ "B-A", ++ NULL, ++ /* 0b11011 (27) */ "cam_write_state", ++ NULL, ++ NULL, ++ NULL, ++ /* 0b11111 (31) */ "cam_read_state" ++}; ++ ++static const char *nfp_me27_28_crc_op[8] = ++{ ++ /* 0b000 (0) */ "--", ++ NULL, ++ /* 0b010 (2) */ "crc_ccitt", ++ NULL, ++ /* 0b100 (4) */ "crc_32", ++ /* 0b101 (5) */ "crc_iscsi", ++ /* 0b110 (6) */ "crc_10", ++ /* 0b111 (7) */ "crc_5" ++}; ++ ++static const char *nfp_me27_28_crc_bytes[8] = ++{ ++ /* 0b000 (0) */ "bytes_0_3", ++ /* 0b001 (1) */ "bytes_1_3", ++ /* 0b010 (2) */ "bytes_2_3", ++ /* 0b011 (3) */ "byte_3", ++ /* 0b100 (4) */ "bytes_0_2", ++ /* 0b101 (5) */ "bytes_0_1", ++ /* 0b110 (6) */ "byte_0" ++}; ++ ++static const char *nfp_me27_28_mecsrs[] = ++{ ++ /* 0x000 (0) */ "UstorAddr", ++ /* 0x004 (1) */ "UstorDataLwr", ++ /* 0x008 (2) */ "UstorDataUpr", ++ /* 0x00c (3) */ "UstorErrStat", ++ /* 0x010 (4) */ "ALUOut", ++ /* 0x014 (5) */ "CtxArbCtrl", ++ /* 0x018 (6) */ "CtxEnables", ++ /* 0x01c (7) */ "CondCodeEn", ++ /* 0x020 (8) */ "CSRCtxPtr", ++ /* 0x024 (9) */ "PcBreakpoint0", ++ /* 0x028 (10) */ "PcBreakpoint1", ++ /* 0x02c (11) */ "PcBreakpointStatus", ++ /* 0x030 (12) */ "RegErrStatus", ++ /* 0x034 (13) */ "LMErrStatus", ++ /* 0x038 (14) */ "LMeccErrorMask", ++ NULL, ++ /* 0x040 (16) */ "IndCtxStatus", ++ /* 0x044 (17) */ "ActCtxStatus", ++ /* 0x048 (18) */ "IndCtxSglEvt", ++ /* 0x04c (19) */ "ActCtxSglEvt", ++ /* 0x050 (20) */ "IndCtxWkpEvt", ++ /* 0x054 (21) */ "ActCtxWkpEvt", ++ /* 0x058 (22) */ "IndCtxFtrCnt", ++ /* 0x05c (23) */ "ActCtxFtrCnt", ++ /* 0x060 (24) */ "IndLMAddr0", ++ /* 0x064 (25) */ "ActLMAddr0", ++ /* 0x068 (26) */ "IndLMAddr1", ++ /* 0x06c (27) */ "ActLMAddr1", ++ /* 0x070 (28) */ "ByteIndex", ++ /* 0x074 (29) */ "XferIndex", ++ /* 0x078 (30) */ "IndFtrCntSgl", ++ /* 0x07c (31) */ "ActFtrCntSgl", ++ /* 0x080 (32) */ "NNPut", ++ /* 0x084 (33) */ "NNGet", ++ NULL, ++ NULL, ++ /* 0x090 (36) */ "IndLMAddr2", ++ /* 0x094 (37) */ "ActLMAddr2", ++ /* 0x098 (38) */ "IndLMAddr3", ++ /* 0x09c (39) */ "ActLMAddr3", ++ /* 0x0a0 (40) */ "IndLMAddr2BytIdx", ++ /* 0x0a4 (41) */ "ActLMAddr2BytIdx", ++ /* 0x0a8 (42) */ "IndLMAddr3BytIdx", ++ /* 0x0ac (43) */ "ActLMAddr3BytIdx", ++ /* 0x0b0 (44) */ "IndPredCC", ++ NULL, ++ NULL, ++ NULL, ++ /* 0x0c0 (48) */ "TimestampLow", ++ /* 0x0c4 (49) */ "TimestampHgh", ++ NULL, ++ NULL, ++ NULL, ++ NULL, ++ NULL, ++ NULL, ++ /* 0x0e0 (56) */ "IndLMAddr0BytIdx", ++ /* 0x0e4 (57) */ "ActLMAddr0BytIdx", ++ /* 0x0e8 (58) */ "IndLMAddr1BytIdx", ++ /* 0x0ec (59) */ "ActLMAddr1BytIdx", ++ NULL, ++ /* 0x0f4 (61) */ "XfrAndBytIdx", ++ NULL, ++ NULL, ++ /* 0x100 (64) */ "NxtNghbrSgl", ++ /* 0x104 (65) */ "PrvNghbrSgl", ++ /* 0x108 (66) */ "SameMESignal", ++ NULL, ++ NULL, ++ NULL, ++ NULL, ++ NULL, ++ NULL, ++ NULL, ++ NULL, ++ NULL, ++ NULL, ++ NULL, ++ NULL, ++ NULL, ++ /* 0x140 (80) */ "CRCRemainder", ++ /* 0x144 (81) */ "ProfileCnt", ++ /* 0x148 (82) */ "PseudoRndNum", ++ NULL, ++ NULL, ++ NULL, ++ NULL, ++ NULL, ++ /* 0x160 (88) */ "MiscControl", ++ /* 0x164 (89) */ "PcBreakpoint0Mask", ++ /* 0x168 (90) */ "PcBreakpoint1Mask", ++ NULL, ++ /* 0x170 (92) */ "Mailbox0", ++ /* 0x174 (93) */ "Mailbox1", ++ /* 0x178 (94) */ "Mailbox2", ++ /* 0x17c (95) */ "Mailbox3", ++ NULL, ++ NULL, ++ NULL, ++ NULL, ++ /* 0x190 (100) */ "CmdIndirectRef0" ++}; ++ ++const char *nfp_me27_28_br_ops[32] = ++{ ++ /* 0b00000 (0) */ "beq", ++ /* 0b00001 (1) */ "bne", ++ /* 0b00010 (2) */ "bmi", ++ /* 0b00011 (3) */ "bpl", ++ /* 0b00100 (4) */ "bcs", ++ /* 0b00101 (5) */ "bcc", ++ /* 0b00110 (6) */ "bvs", ++ /* 0b00111 (7) */ "bvc", ++ /* 0b01000 (8) */ "bge", ++ /* 0b01001 (9) */ "blt", ++ /* 0b01010 (10) */ "ble", ++ /* 0b01011 (11) */ "bgt", ++ /* (12) */ NULL, ++ /* (13) */ NULL, ++ /* (14) */ NULL, ++ /* (15) */ NULL, ++ /* 0b10000 (16) */ "br=ctx", ++ /* 0b10001 (17) */ "br!=ctx", ++ /* 0b10010 (18) */ "br_signal", ++ /* 0b10011 (19) */ "br_!signal", ++ /* 0b10100 (20) */ "br_inp_state", ++ /* 0b10101 (21) */ "br_!inp_state", ++ /* 0b10110 (22) */ "br_cls_state", ++ /* 0b10111 (23) */ "br_!cls_state", ++ /* 0b11000 (24) */ "br", ++ /* (25) */ NULL, ++ /* (26) */ NULL, ++ /* (27) */ NULL, ++ /* (28) */ NULL, ++ /* (29) */ NULL, ++ /* (30) */ NULL, ++ /* (31) */ NULL ++}; ++ ++static const char *nfp_me27_br_inpstates[16] = ++{ ++ /* 0 */ "nn_empty", ++ /* 1 */ "nn_full", ++ /* 2 */ "scr_ring0_status", ++ /* 3 */ "scr_ring1_status", ++ /* 4 */ "scr_ring2_status", ++ /* 5 */ "scr_ring3_status", ++ /* 6 */ "scr_ring4_status", ++ /* 7 */ "scr_ring5_status", ++ /* 8 */ "scr_ring6_status", ++ /* 9 */ "scr_ring7_status", ++ /* 10 */ "scr_ring8_status", ++ /* 11 */ "scr_ring9_status", ++ /* 12 */ "scr_ring10_status", ++ /* 13 */ "scr_ring11_status", ++ /* 14 */ "fci_not_empty", ++ /* 15 */ "fci_full" ++}; ++ ++static const char *nfp_me28_br_inpstates[16] = ++{ ++ /* 0 */ "nn_empty", ++ /* 1 */ "nn_full", ++ /* 2 */ "ctm_ring0_status", ++ /* 3 */ "ctm_ring1_status", ++ /* 4 */ "ctm_ring2_status", ++ /* 5 */ "ctm_ring3_status", ++ /* 6 */ "ctm_ring4_status", ++ /* 7 */ "ctm_ring5_status", ++ /* 8 */ "ctm_ring6_status", ++ /* 9 */ "ctm_ring7_status", ++ /* 10 */ "ctm_ring8_status", ++ /* 11 */ "ctm_ring9_status", ++ /* 12 */ "ctm_ring10_status", ++ /* 13 */ "ctm_ring11_status", ++ /* 14 */ "ctm_ring12_status", ++ /* 15 */ "ctm_ring13_status" ++}; ++ ++static const char *nfp_me27_28_mult_steps[8] = ++{ ++ /* 0 */ "step1", ++ /* 1 */ "step2", ++ /* 2 */ "step3", ++ /* 3 */ "step4", ++ /* 4 */ "last", ++ /* 5 */ "last2", ++ NULL, ++ NULL ++}; ++ ++static const char *nfp_me27_28_mult_types[4] = ++{ ++ "start", ++ "24x8", ++ "16x16", ++ "32x32" ++}; ++ ++/* The cmd_mnemonics arrays are sorted here in its definition so that we can ++ use bsearch () on the first three fields. There can be multiple matches ++ and we assume that bsearch can return any of them, so we manually step ++ back to the first one. */ ++ ++static const nfp_cmd_mnemonic nfp_me27_mnemonics[] = ++{ ++ {NFP_3200_CPPTGT_MSF0, 0, 0, 0, 0, "read"}, ++ {NFP_3200_CPPTGT_MSF0, 0, 2, 0, 0, "read64"}, ++ {NFP_3200_CPPTGT_MSF0, 1, 0, 0, 0, "write"}, ++ {NFP_3200_CPPTGT_MSF0, 1, 1, 0, 0, "fast_wr"}, ++ {NFP_3200_CPPTGT_MSF0, 1, 2, 0, 0, "write64"}, ++ {NFP_3200_CPPTGT_QDR, 0, 0, 0, 0, "read"}, ++ {NFP_3200_CPPTGT_QDR, 1, 0, 0, 0, "write"}, ++ {NFP_3200_CPPTGT_QDR, 2, 0, 0, 0, "write_atomic"}, ++ {NFP_3200_CPPTGT_QDR, 2, 1, 0, 0, "swap"}, ++ {NFP_3200_CPPTGT_QDR, 3, 0, 0, 0, "set"}, ++ {NFP_3200_CPPTGT_QDR, 3, 1, 0, 0, "test_and_set"}, ++ {NFP_3200_CPPTGT_QDR, 4, 0, 0, 0, "clr"}, ++ {NFP_3200_CPPTGT_QDR, 4, 1, 0, 0, "test_and_clr"}, ++ {NFP_3200_CPPTGT_QDR, 5, 0, 0, 0, "add"}, ++ {NFP_3200_CPPTGT_QDR, 5, 1, 0, 0, "test_and_add"}, ++ {NFP_3200_CPPTGT_QDR, 6, 0, 0, 0, "read_queue"}, ++ {NFP_3200_CPPTGT_QDR, 6, 1, 0, 0, "read_queue_ring"}, ++ {NFP_3200_CPPTGT_QDR, 6, 2, 0, 0, "write_queue"}, ++ {NFP_3200_CPPTGT_QDR, 6, 3, 0, 0, "write_queue_ring"}, ++ {NFP_3200_CPPTGT_QDR, 7, 0, 0, 0, "incr"}, ++ {NFP_3200_CPPTGT_QDR, 7, 1, 0, 0, "test_and_incr"}, ++ {NFP_3200_CPPTGT_QDR, 8, 0, 0, 0, "decr"}, ++ {NFP_3200_CPPTGT_QDR, 8, 1, 0, 0, "test_and_decr"}, ++ {NFP_3200_CPPTGT_QDR, 9, 0, 0, 0, "put"}, ++ {NFP_3200_CPPTGT_QDR, 9, 1, 0, 0, "get"}, ++ {NFP_3200_CPPTGT_QDR, 9, 2, 0, 0, "put_imm"}, ++ {NFP_3200_CPPTGT_QDR, 9, 3, 0, 0, "pop"}, ++ {NFP_3200_CPPTGT_QDR, 10, 0, 0, 0, "journal"}, ++ {NFP_3200_CPPTGT_QDR, 10, 1, 0, 0, "fast_journal"}, ++ {NFP_3200_CPPTGT_QDR, 11, 0, 0, 0, "dequeue"}, ++ {NFP_3200_CPPTGT_QDR, 12, 0, 0, 0, "enqueue"}, ++ {NFP_3200_CPPTGT_QDR, 12, 1, 0, 0, "enueue_tail"}, ++ {NFP_3200_CPPTGT_QDR, 12, 2, 0, 0, "nfp_enqueue"}, ++ {NFP_3200_CPPTGT_QDR, 12, 3, 0, 0, "nfp_enueue_tail"}, ++ {NFP_3200_CPPTGT_QDR, 13, 0, 0, 0, "csr_wr"}, ++ {NFP_3200_CPPTGT_QDR, 13, 1, 0, 0, "csr_rd"}, ++ {NFP_3200_CPPTGT_QDR, 14, 0, 0, 0, "wr_qdesc"}, ++ {NFP_3200_CPPTGT_QDR, 14, 1, 0, 0, "nfp_wr_qdesc"}, ++ {NFP_3200_CPPTGT_QDR, 14, 2, 0, 0, "wr_qdesc_count"}, ++ {NFP_3200_CPPTGT_QDR, 14, 3, 0, 0, "push_qdesc"}, ++ {NFP_3200_CPPTGT_QDR, 15, 0, 0, 0, "rd_qdesc_other"}, ++ {NFP_3200_CPPTGT_QDR, 15, 1, 0, 0, "rd_qdesc_tail"}, ++ {NFP_3200_CPPTGT_QDR, 15, 2, 0, 0, "rd_qdesc_head"}, ++ {NFP_3200_CPPTGT_QDR, 15, 3, 0, 0, "nfp_rd_qdesc"}, ++ {NFP_3200_CPPTGT_MSF1, 0, 0, 0, 0, "read"}, ++ {NFP_3200_CPPTGT_MSF1, 0, 2, 0, 0, "read64"}, ++ {NFP_3200_CPPTGT_MSF1, 1, 0, 0, 0, "write"}, ++ {NFP_3200_CPPTGT_MSF1, 1, 1, 0, 0, "fast_wr"}, ++ {NFP_3200_CPPTGT_MSF1, 1, 2, 0, 0, "write64"}, ++ {NFP_3200_CPPTGT_HASH, 0, 0, 0, 0, "hash_48"}, ++ {NFP_3200_CPPTGT_HASH, 0, 1, 0, 0, "hash_64"}, ++ {NFP_3200_CPPTGT_HASH, 0, 2, 0, 0, "hash_128"}, ++ {NFP_3200_CPPTGT_MU, 0, 0, 0, 0, "read"}, ++ {NFP_3200_CPPTGT_MU, 0, 1, 0, 0, "read_le"}, ++ {NFP_3200_CPPTGT_MU, 0, 2, 0, 0, "read_swap"}, ++ {NFP_3200_CPPTGT_MU, 0, 3, 0, 0, "read_swap_le"}, ++ {NFP_3200_CPPTGT_MU, 1, 0, 0, 0, "write"}, ++ {NFP_3200_CPPTGT_MU, 1, 1, 0, 0, "write_le"}, ++ {NFP_3200_CPPTGT_MU, 1, 2, 0, 0, "write_swap"}, ++ {NFP_3200_CPPTGT_MU, 1, 3, 0, 0, "write_swap_le"}, ++ {NFP_3200_CPPTGT_MU, 2, 0, 0, 0, "write8"}, ++ {NFP_3200_CPPTGT_MU, 2, 1, 0, 0, "write8_le"}, ++ {NFP_3200_CPPTGT_MU, 2, 2, 0, 0, "write8_swap"}, ++ {NFP_3200_CPPTGT_MU, 2, 3, 0, 0, "write8_swap_le"}, ++ {NFP_3200_CPPTGT_MU, 3, 0, 0, 0, "read_atomic"}, ++ {NFP_3200_CPPTGT_MU, 3, 1, 0, 0, "read8"}, ++ {NFP_3200_CPPTGT_MU, 3, 2, 0, 0, "compare_write"}, ++ {NFP_3200_CPPTGT_MU, 3, 3, 0, 0, "test_and_compare_write"}, ++ {NFP_3200_CPPTGT_MU, 4, 0, 0, 0, "write_atomic"}, ++ {NFP_3200_CPPTGT_MU, 4, 1, 0, 0, "swap"}, ++ {NFP_3200_CPPTGT_MU, 4, 2, 0, 0, "write_atomic_imm"}, ++ {NFP_3200_CPPTGT_MU, 4, 3, 0, 0, "swap_imm"}, ++ {NFP_3200_CPPTGT_MU, 5, 0, 0, 0, "set"}, ++ {NFP_3200_CPPTGT_MU, 5, 1, 0, 0, "test_and_set"}, ++ {NFP_3200_CPPTGT_MU, 5, 2, 0, 0, "set_imm"}, ++ {NFP_3200_CPPTGT_MU, 5, 3, 0, 0, "test_and_set_imm"}, ++ {NFP_3200_CPPTGT_MU, 6, 0, 0, 0, "clr"}, ++ {NFP_3200_CPPTGT_MU, 6, 1, 0, 0, "test_and_clr"}, ++ {NFP_3200_CPPTGT_MU, 6, 2, 0, 0, "clr_imm"}, ++ {NFP_3200_CPPTGT_MU, 6, 3, 0, 0, "test_and_clr_imm"}, ++ {NFP_3200_CPPTGT_MU, 7, 0, 0, 4, "add"}, ++ {NFP_3200_CPPTGT_MU, 7, 0, 4, 4, "add64"}, ++ {NFP_3200_CPPTGT_MU, 7, 1, 0, 4, "test_and_add"}, ++ {NFP_3200_CPPTGT_MU, 7, 1, 4, 4, "test_and_add64"}, ++ {NFP_3200_CPPTGT_MU, 7, 2, 0, 4, "add_imm"}, ++ {NFP_3200_CPPTGT_MU, 7, 2, 4, 4, "add64_imm"}, ++ {NFP_3200_CPPTGT_MU, 7, 3, 0, 4, "test_and_add_imm"}, ++ {NFP_3200_CPPTGT_MU, 7, 3, 4, 4, "test_and_add64_imm"}, ++ {NFP_3200_CPPTGT_MU, 8, 0, 0, 4, "add_sat"}, ++ {NFP_3200_CPPTGT_MU, 8, 0, 4, 4, "add64_sat"}, ++ {NFP_3200_CPPTGT_MU, 8, 1, 0, 4, "test_and_add_sat"}, ++ {NFP_3200_CPPTGT_MU, 8, 1, 4, 4, "test_and_add64_sat"}, ++ {NFP_3200_CPPTGT_MU, 8, 2, 0, 4, "add_imm_sat"}, ++ {NFP_3200_CPPTGT_MU, 8, 2, 4, 4, "add_imm_sat"}, ++ {NFP_3200_CPPTGT_MU, 8, 3, 0, 0, "test_and_add_sat_imm"}, ++ {NFP_3200_CPPTGT_MU, 9, 0, 0, 4, "sub"}, ++ {NFP_3200_CPPTGT_MU, 9, 0, 4, 4, "sub64"}, ++ {NFP_3200_CPPTGT_MU, 9, 1, 0, 4, "test_and_sub"}, ++ {NFP_3200_CPPTGT_MU, 9, 1, 4, 4, "test_and_sub64"}, ++ {NFP_3200_CPPTGT_MU, 9, 2, 0, 4, "sub_imm"}, ++ {NFP_3200_CPPTGT_MU, 9, 2, 4, 4, "sub64_imm"}, ++ {NFP_3200_CPPTGT_MU, 9, 3, 0, 0, "tes_and_sub_imm"}, ++ {NFP_3200_CPPTGT_MU, 10, 0, 0, 4, "sub_sat"}, ++ {NFP_3200_CPPTGT_MU, 10, 0, 4, 4, "sub64_sat"}, ++ {NFP_3200_CPPTGT_MU, 10, 1, 0, 4, "test_and_sub_sat"}, ++ {NFP_3200_CPPTGT_MU, 10, 1, 4, 4, "test_and_sub64_sat"}, ++ {NFP_3200_CPPTGT_MU, 10, 2, 0, 4, "sub_imm_sat"}, ++ {NFP_3200_CPPTGT_MU, 10, 2, 4, 4, "sub64_imm_sat"}, ++ {NFP_3200_CPPTGT_MU, 10, 3, 0, 0, "test_and_sub_sat_imm"}, ++ {NFP_3200_CPPTGT_MU, 11, 0, 0, 0, "release_ticket"}, ++ {NFP_3200_CPPTGT_MU, 11, 1, 0, 0, "release_ticket_ind"}, ++ {NFP_3200_CPPTGT_MU, 12, 0, 0, 0, "cam_lookup"}, ++ {NFP_3200_CPPTGT_MU, 12, 1, 0, 0, "cam_lookup_add"}, ++ {NFP_3200_CPPTGT_MU, 12, 2, 0, 0, "tcam_lookup"}, ++ {NFP_3200_CPPTGT_MU, 12, 3, 0, 3, "lock"}, ++ {NFP_3200_CPPTGT_MU, 12, 3, 2, 3, "cam_lookup_add_inc"}, ++ {NFP_3200_CPPTGT_MU, 13, 0, 0, 4, "microq128_get"}, ++ {NFP_3200_CPPTGT_MU, 13, 0, 4, 4, "microq256_get"}, ++ {NFP_3200_CPPTGT_MU, 13, 1, 0, 4, "microq128_pop"}, ++ {NFP_3200_CPPTGT_MU, 13, 1, 4, 4, "microq256_pop"}, ++ {NFP_3200_CPPTGT_MU, 13, 2, 0, 4, "microq128_put"}, ++ {NFP_3200_CPPTGT_MU, 13, 2, 4, 4, "microq256_put"}, ++ {NFP_3200_CPPTGT_MU, 14, 0, 0, 4, "queue128_lock"}, ++ {NFP_3200_CPPTGT_MU, 14, 0, 4, 4, "queue256_lock"}, ++ {NFP_3200_CPPTGT_MU, 14, 1, 0, 4, "queue128_unlock"}, ++ {NFP_3200_CPPTGT_MU, 14, 1, 4, 4, "queue256_unlock"}, ++ {NFP_3200_CPPTGT_MU, 15, 0, 0, 0, "xor"}, ++ {NFP_3200_CPPTGT_MU, 15, 1, 0, 0, "test_and_xor"}, ++ {NFP_3200_CPPTGT_MU, 15, 2, 0, 0, "xor_imm"}, ++ {NFP_3200_CPPTGT_MU, 15, 3, 0, 0, "test_and_xor_imm"}, ++ {NFP_3200_CPPTGT_MU, 16, 0, 0, 0, "rd_qdesc"}, ++ {NFP_3200_CPPTGT_MU, 16, 1, 0, 0, "wr_qdesc"}, ++ {NFP_3200_CPPTGT_MU, 16, 2, 0, 0, "push_qdesc"}, ++ {NFP_3200_CPPTGT_MU, 16, 3, 0, 0, "tag_writeback"}, ++ {NFP_3200_CPPTGT_MU, 17, 0, 0, 0, "enqueue"}, ++ {NFP_3200_CPPTGT_MU, 17, 1, 0, 0, "enqueue_tail"}, ++ {NFP_3200_CPPTGT_MU, 17, 2, 0, 0, "dequeue"}, ++ {NFP_3200_CPPTGT_MU, 18, 0, 0, 0, "read_queue"}, ++ {NFP_3200_CPPTGT_MU, 18, 1, 0, 0, "read_queue_ring"}, ++ {NFP_3200_CPPTGT_MU, 18, 2, 0, 0, "write_queue"}, ++ {NFP_3200_CPPTGT_MU, 18, 3, 0, 0, "write_queue_ring"}, ++ {NFP_3200_CPPTGT_MU, 19, 0, 0, 0, "add_tail"}, ++ {NFP_3200_CPPTGT_MU, 19, 1, 0, 0, "qadd_thread"}, ++ {NFP_3200_CPPTGT_MU, 19, 2, 0, 0, "qadd_work"}, ++ {NFP_3200_CPPTGT_MU, 19, 3, 0, 0, "qadd_work_imm"}, ++ {NFP_3200_CPPTGT_MU, 20, 0, 0, 0, "put"}, ++ {NFP_3200_CPPTGT_MU, 20, 1, 0, 0, "put_tag"}, ++ {NFP_3200_CPPTGT_MU, 20, 2, 0, 0, "journal"}, ++ {NFP_3200_CPPTGT_MU, 20, 3, 0, 0, "journal_tag"}, ++ {NFP_3200_CPPTGT_MU, 21, 0, 0, 0, "get"}, ++ {NFP_3200_CPPTGT_MU, 21, 1, 0, 0, "get_eop"}, ++ {NFP_3200_CPPTGT_MU, 21, 2, 0, 0, "get_safe"}, ++ {NFP_3200_CPPTGT_MU, 21, 3, 0, 0, "get_tag_safe"}, ++ {NFP_3200_CPPTGT_MU, 22, 0, 0, 0, "pop"}, ++ {NFP_3200_CPPTGT_MU, 22, 1, 0, 0, "pop_eop"}, ++ {NFP_3200_CPPTGT_MU, 22, 2, 0, 0, "pop_safe"}, ++ {NFP_3200_CPPTGT_MU, 22, 3, 0, 0, "pop_tag_safe"}, ++ {NFP_3200_CPPTGT_MU, 23, 0, 0, 0, "fast_journal"}, ++ {NFP_3200_CPPTGT_MU, 23, 1, 0, 0, "fast_journal_sig"}, ++ {NFP_3200_CPPTGT_GS, 0, 0, 0, 0, "read"}, ++ {NFP_3200_CPPTGT_GS, 1, 0, 0, 0, "write"}, ++ {NFP_3200_CPPTGT_GS, 2, 0, 0, 0, "write_atomic"}, ++ {NFP_3200_CPPTGT_GS, 2, 1, 0, 0, "swap"}, ++ {NFP_3200_CPPTGT_GS, 3, 0, 0, 0, "set"}, ++ {NFP_3200_CPPTGT_GS, 3, 1, 0, 0, "test_and_set"}, ++ {NFP_3200_CPPTGT_GS, 4, 0, 0, 0, "clr"}, ++ {NFP_3200_CPPTGT_GS, 4, 1, 0, 0, "test_and_clr"}, ++ {NFP_3200_CPPTGT_GS, 5, 0, 0, 0, "add"}, ++ {NFP_3200_CPPTGT_GS, 5, 1, 0, 0, "test_and_add"}, ++ {NFP_3200_CPPTGT_GS, 6, 0, 0, 0, "sub"}, ++ {NFP_3200_CPPTGT_GS, 6, 1, 0, 0, "test_and_sub"}, ++ {NFP_3200_CPPTGT_GS, 7, 0, 0, 0, "inc"}, ++ {NFP_3200_CPPTGT_GS, 7, 1, 0, 0, "test_and_inc"}, ++ {NFP_3200_CPPTGT_GS, 8, 0, 0, 0, "dec"}, ++ {NFP_3200_CPPTGT_GS, 8, 1, 0, 0, "test_and_dec"}, ++ {NFP_3200_CPPTGT_GS, 9, 0, 0, 0, "get"}, ++ {NFP_3200_CPPTGT_GS, 10, 0, 0, 0, "put"}, ++ {NFP_3200_CPPTGT_PCIE, 0, 0, 0, 0, "read"}, ++ {NFP_3200_CPPTGT_PCIE, 1, 0, 0, 0, "write"}, ++ {NFP_3200_CPPTGT_PCIE, 2, 0, 0, 0, "read_internal"}, ++ {NFP_3200_CPPTGT_PCIE, 3, 0, 0, 0, "write_internal"}, ++ {NFP_3200_CPPTGT_ARM, 0, 0, 0, 0, "read"}, ++ {NFP_3200_CPPTGT_ARM, 1, 0, 0, 0, "write"}, ++ {NFP_3200_CPPTGT_CRYPTO, 0, 0, 0, 0, "read"}, ++ {NFP_3200_CPPTGT_CRYPTO, 1, 0, 0, 0, "write"}, ++ {NFP_3200_CPPTGT_CRYPTO, 2, 0, 0, 0, "write_fifo"}, ++ {NFP_3200_CPPTGT_CAP, 0, 0, 0, 0, "read_enum"}, ++ {NFP_3200_CPPTGT_CAP, 0, 1, 0, 0, "read"}, ++ {NFP_3200_CPPTGT_CAP, 0, 2, 0, 0, "read_reflect"}, ++ {NFP_3200_CPPTGT_CAP, 1, 0, 0, 0, "write_enum"}, ++ {NFP_3200_CPPTGT_CAP, 1, 1, 0, 0, "write"}, ++ {NFP_3200_CPPTGT_CAP, 1, 2, 0, 0, "write_reflect"}, ++ {NFP_3200_CPPTGT_CAP, 2, 0, 0, 0, "fast_wr_alu"}, ++ {NFP_3200_CPPTGT_CAP, 3, 0, 0, 0, "fast_wr"}, ++ {NFP_3200_CPPTGT_CT, 1, 0, 0, 0, "write"}, ++ {NFP_3200_CPPTGT_CLS, 0, 0, 0, 0, "read_be"}, ++ {NFP_3200_CPPTGT_CLS, 0, 1, 0, 0, "read_le"}, ++ {NFP_3200_CPPTGT_CLS, 0, 2, 0, 0, "test_and_compare_write"}, ++ {NFP_3200_CPPTGT_CLS, 0, 3, 0, 0, "xor"}, ++ {NFP_3200_CPPTGT_CLS, 1, 0, 0, 0, "write_be"}, ++ {NFP_3200_CPPTGT_CLS, 1, 1, 0, 0, "write_le"}, ++ {NFP_3200_CPPTGT_CLS, 1, 2, 0, 0, "write8_be"}, ++ {NFP_3200_CPPTGT_CLS, 1, 3, 0, 0, "write8_le"}, ++ {NFP_3200_CPPTGT_CLS, 2, 0, 0, 0, "set"}, ++ {NFP_3200_CPPTGT_CLS, 2, 1, 0, 0, "clr"}, ++ {NFP_3200_CPPTGT_CLS, 2, 2, 0, 0, "test_and_set"}, ++ {NFP_3200_CPPTGT_CLS, 2, 3, 0, 0, "test_and_clr"}, ++ {NFP_3200_CPPTGT_CLS, 3, 0, 0, 0, "set_imm"}, ++ {NFP_3200_CPPTGT_CLS, 3, 1, 0, 0, "clr_imm"}, ++ {NFP_3200_CPPTGT_CLS, 3, 2, 0, 0, "test_and_set_imm"}, ++ {NFP_3200_CPPTGT_CLS, 3, 3, 0, 0, "test_and_clr_imm"}, ++ {NFP_3200_CPPTGT_CLS, 4, 0, 0, 0, "add"}, ++ {NFP_3200_CPPTGT_CLS, 4, 1, 0, 0, "add64"}, ++ {NFP_3200_CPPTGT_CLS, 4, 2, 0, 0, "add_sat"}, ++ {NFP_3200_CPPTGT_CLS, 4, 3, 0, 0, "test_and_add_sat"}, ++ {NFP_3200_CPPTGT_CLS, 5, 0, 0, 0, "add_imm"}, ++ {NFP_3200_CPPTGT_CLS, 5, 1, 0, 0, "add64_imm"}, ++ {NFP_3200_CPPTGT_CLS, 5, 2, 0, 0, "add_imm_sat"}, ++ {NFP_3200_CPPTGT_CLS, 5, 3, 0, 0, "test_and_add_imm_sat"}, ++ {NFP_3200_CPPTGT_CLS, 6, 0, 0, 0, "sub"}, ++ {NFP_3200_CPPTGT_CLS, 6, 1, 0, 0, "sub64"}, ++ {NFP_3200_CPPTGT_CLS, 6, 2, 0, 0, "sub_sat"}, ++ {NFP_3200_CPPTGT_CLS, 6, 3, 0, 0, "test_and_sub_sat"}, ++ {NFP_3200_CPPTGT_CLS, 7, 0, 0, 0, "sub_imm"}, ++ {NFP_3200_CPPTGT_CLS, 7, 1, 0, 0, "sub64_imm"}, ++ {NFP_3200_CPPTGT_CLS, 7, 2, 0, 0, "sub_imm_sat"}, ++ {NFP_3200_CPPTGT_CLS, 7, 3, 0, 0, "test_and_sub_imm_sat"}, ++ {NFP_3200_CPPTGT_CLS, 8, 0, 0, 0, "queue_lock"}, ++ {NFP_3200_CPPTGT_CLS, 8, 1, 0, 0, "queue_unlock"}, ++ {NFP_3200_CPPTGT_CLS, 8, 2, 0, 0, "hash_mask"}, ++ {NFP_3200_CPPTGT_CLS, 8, 3, 0, 0, "hash_mask_clear"}, ++ {NFP_3200_CPPTGT_CLS, 9, 0, 0, 0, "get"}, ++ {NFP_3200_CPPTGT_CLS, 9, 1, 0, 0, "pop"}, ++ {NFP_3200_CPPTGT_CLS, 9, 2, 0, 0, "get_safe"}, ++ {NFP_3200_CPPTGT_CLS, 9, 3, 0, 0, "pop_safe"}, ++ {NFP_3200_CPPTGT_CLS, 10, 0, 0, 0, "put"}, ++ {NFP_3200_CPPTGT_CLS, 10, 1, 0, 0, "put_offset"}, ++ {NFP_3200_CPPTGT_CLS, 10, 2, 0, 0, "journal"}, ++ {NFP_3200_CPPTGT_CLS, 10, 3, 0, 0, "add_tail"}, ++ {NFP_3200_CPPTGT_CLS, 11, 0, 0, 0, "cam_lookup32"}, ++ {NFP_3200_CPPTGT_CLS, 11, 1, 0, 0, "cam_lookup32_add"}, ++ {NFP_3200_CPPTGT_CLS, 11, 2, 0, 0, "cam_lookup24"}, ++ {NFP_3200_CPPTGT_CLS, 11, 3, 0, 0, "cam_lookup24_add"}, ++ {NFP_3200_CPPTGT_CLS, 12, 0, 0, 0, "cam_lookup8"}, ++ {NFP_3200_CPPTGT_CLS, 12, 1, 0, 0, "cam_lookup8_add"}, ++ {NFP_3200_CPPTGT_CLS, 12, 2, 0, 0, "cam_lookup16"}, ++ {NFP_3200_CPPTGT_CLS, 12, 3, 0, 0, "cam_lookup16_add"}, ++ {NFP_3200_CPPTGT_CLS, 13, 0, 0, 0, "tcam_lookup32"}, ++ {NFP_3200_CPPTGT_CLS, 13, 1, 0, 0, "tcam_lookup24"}, ++ {NFP_3200_CPPTGT_CLS, 13, 2, 0, 0, "tcam_lookup16"}, ++ {NFP_3200_CPPTGT_CLS, 13, 3, 0, 0, "tcam_lookup8"}, ++ {NFP_3200_CPPTGT_CLS, 14, 0, 0, 0, "reflect_from_sig_src"}, ++ {NFP_3200_CPPTGT_CLS, 14, 1, 0, 0, "reflect_from_sig_dst"}, ++ {NFP_3200_CPPTGT_CLS, 14, 2, 0, 0, "reflect_from_sig_both"}, ++ {NFP_3200_CPPTGT_CLS, 15, 0, 0, 0, "reflect_to_sig_src"}, ++ {NFP_3200_CPPTGT_CLS, 15, 1, 0, 0, "reflect_to_sig_dst"}, ++ {NFP_3200_CPPTGT_CLS, 15, 2, 0, 0, "reflect_to_sig_both"} ++}; ++ ++static const nfp_cmd_mnemonic nfp_me28_mnemonics[] = ++{ ++ {NFP_6000_CPPTGT_NBI, 0, 0, 0, 0, "read"}, ++ {NFP_6000_CPPTGT_NBI, 1, 0, 0, 0, "write"}, ++ {NFP_6000_CPPTGT_NBI, 3, 0, 0, 0, "packet_ready_drop"}, ++ {NFP_6000_CPPTGT_NBI, 3, 1, 0, 0, "packet_ready_unicast"}, ++ {NFP_6000_CPPTGT_NBI, 3, 2, 0, 0, "packet_ready_multicast_dont_free"}, ++ {NFP_6000_CPPTGT_NBI, 3, 3, 0, 0, "packet_ready_multicast_free_on_last"}, ++ {NFP_6000_CPPTGT_ILA, 0, 0, 0, 0, "read"}, ++ {NFP_6000_CPPTGT_ILA, 0, 1, 0, 0, "read_check_error"}, ++ {NFP_6000_CPPTGT_ILA, 1, 0, 0, 0, "write"}, ++ {NFP_6000_CPPTGT_ILA, 1, 1, 0, 0, "write_check_error"}, ++ {NFP_6000_CPPTGT_ILA, 2, 0, 0, 0, "read_int"}, ++ {NFP_6000_CPPTGT_ILA, 3, 0, 0, 7, "write_int"}, ++ {NFP_6000_CPPTGT_ILA, 3, 0, 3, 7, "write_dma"}, ++ {NFP_6000_CPPTGT_MU, 0, 0, 0, 0, "read"}, ++ {NFP_6000_CPPTGT_MU, 0, 1, 0, 0, "read_le"}, ++ {NFP_6000_CPPTGT_MU, 0, 2, 0, 0, "read_swap"}, ++ {NFP_6000_CPPTGT_MU, 0, 3, 0, 0, "read_swap_le"}, ++ {NFP_6000_CPPTGT_MU, 1, 0, 0, 0, "write"}, ++ {NFP_6000_CPPTGT_MU, 1, 1, 0, 0, "write_le"}, ++ {NFP_6000_CPPTGT_MU, 1, 2, 0, 0, "write_swap"}, ++ {NFP_6000_CPPTGT_MU, 1, 3, 0, 0, "write_swap_le"}, ++ {NFP_6000_CPPTGT_MU, 2, 0, 0, 0, "write8"}, ++ {NFP_6000_CPPTGT_MU, 2, 1, 0, 0, "write8_le"}, ++ {NFP_6000_CPPTGT_MU, 2, 2, 0, 0, "write8_swap"}, ++ {NFP_6000_CPPTGT_MU, 2, 3, 0, 0, "write8_swap_le"}, ++ {NFP_6000_CPPTGT_MU, 3, 0, 0, 0, "atomic_read"}, ++ {NFP_6000_CPPTGT_MU, 3, 1, 0, 0, "read8"}, ++ {NFP_6000_CPPTGT_MU, 3, 2, 0, 0, ++ "compare_write_or_incr/mask_compare_write"}, ++ {NFP_6000_CPPTGT_MU, 3, 3, 0, 0, ++ "test_compare_write_or_incr/test_mask_compare_write"}, ++ {NFP_6000_CPPTGT_MU, 4, 0, 0, 0, "atomic_write"}, ++ {NFP_6000_CPPTGT_MU, 4, 1, 0, 0, "swap"}, ++ {NFP_6000_CPPTGT_MU, 4, 2, 0, 0, "atomic_write_imm"}, ++ {NFP_6000_CPPTGT_MU, 4, 3, 0, 0, "swap_imm"}, ++ {NFP_6000_CPPTGT_MU, 5, 0, 0, 0, "set"}, ++ {NFP_6000_CPPTGT_MU, 5, 1, 0, 0, "test_set"}, ++ {NFP_6000_CPPTGT_MU, 5, 2, 0, 0, "set_imm"}, ++ {NFP_6000_CPPTGT_MU, 5, 3, 0, 0, "test_set_imm"}, ++ {NFP_6000_CPPTGT_MU, 6, 0, 0, 0, "clr"}, ++ {NFP_6000_CPPTGT_MU, 6, 1, 0, 0, "test_clr"}, ++ {NFP_6000_CPPTGT_MU, 6, 2, 0, 0, "clr_imm"}, ++ {NFP_6000_CPPTGT_MU, 6, 3, 0, 0, "test_clr_imm"}, ++ {NFP_6000_CPPTGT_MU, 7, 0, 0, 4, "add"}, ++ {NFP_6000_CPPTGT_MU, 7, 0, 4, 4, "add64"}, ++ {NFP_6000_CPPTGT_MU, 7, 1, 0, 4, "test_add"}, ++ {NFP_6000_CPPTGT_MU, 7, 1, 4, 4, "test_add64"}, ++ {NFP_6000_CPPTGT_MU, 7, 2, 0, 4, "add_imm"}, ++ {NFP_6000_CPPTGT_MU, 7, 2, 4, 4, "add64_imm"}, ++ {NFP_6000_CPPTGT_MU, 7, 3, 0, 4, "test_add_imm"}, ++ {NFP_6000_CPPTGT_MU, 7, 3, 4, 4, "test_add64_imm"}, ++ {NFP_6000_CPPTGT_MU, 8, 0, 0, 4, "addsat"}, ++ {NFP_6000_CPPTGT_MU, 8, 0, 4, 4, "addsat64"}, ++ {NFP_6000_CPPTGT_MU, 8, 1, 0, 4, "test_addsat"}, ++ {NFP_6000_CPPTGT_MU, 8, 1, 4, 4, "test_addsat64"}, ++ {NFP_6000_CPPTGT_MU, 8, 2, 0, 4, "addsat_imm"}, ++ {NFP_6000_CPPTGT_MU, 8, 2, 4, 4, "addsat64_imm"}, ++ {NFP_6000_CPPTGT_MU, 8, 3, 0, 4, "test_addsat_imm"}, ++ {NFP_6000_CPPTGT_MU, 8, 3, 4, 4, "test_addsat64_imm"}, ++ {NFP_6000_CPPTGT_MU, 9, 0, 0, 4, "sub"}, ++ {NFP_6000_CPPTGT_MU, 9, 0, 4, 4, "sub64"}, ++ {NFP_6000_CPPTGT_MU, 9, 1, 0, 4, "test_sub"}, ++ {NFP_6000_CPPTGT_MU, 9, 1, 4, 4, "test_sub64"}, ++ {NFP_6000_CPPTGT_MU, 9, 2, 0, 4, "sub_imm"}, ++ {NFP_6000_CPPTGT_MU, 9, 2, 4, 4, "sub64_imm"}, ++ {NFP_6000_CPPTGT_MU, 9, 3, 0, 4, "test_sub_imm"}, ++ {NFP_6000_CPPTGT_MU, 9, 3, 4, 4, "test_sub64_imm"}, ++ {NFP_6000_CPPTGT_MU, 10, 0, 0, 4, "subsat"}, ++ {NFP_6000_CPPTGT_MU, 10, 0, 4, 4, "subsat64"}, ++ {NFP_6000_CPPTGT_MU, 10, 1, 0, 4, "test_subsat"}, ++ {NFP_6000_CPPTGT_MU, 10, 1, 4, 4, "test_subsat64"}, ++ {NFP_6000_CPPTGT_MU, 10, 2, 0, 4, "subsat_imm"}, ++ {NFP_6000_CPPTGT_MU, 10, 2, 4, 4, "subsat64_imm"}, ++ {NFP_6000_CPPTGT_MU, 10, 3, 0, 4, "test_subsat_imm"}, ++ {NFP_6000_CPPTGT_MU, 10, 3, 4, 4, "test_subsat64_imm"}, ++ {NFP_6000_CPPTGT_MU, 11, 0, 0, 0, "ticket_release"}, ++ {NFP_6000_CPPTGT_MU, 11, 1, 0, 0, "ticket_release_ind"}, ++ {NFP_6000_CPPTGT_MU, 12, 0, 0, 7, "cam128_lookup8/cam384_lookup8"}, ++ {NFP_6000_CPPTGT_MU, 12, 0, 1, 7, "cam128_lookup16/cam384_lookup16"}, ++ {NFP_6000_CPPTGT_MU, 12, 0, 2, 7, "cam128_lookup24/cam384_lookup24"}, ++ {NFP_6000_CPPTGT_MU, 12, 0, 3, 7, "cam128_lookup32/cam384_lookup32"}, ++ {NFP_6000_CPPTGT_MU, 12, 0, 4, 7, "cam256_lookup8/cam512_lookup8"}, ++ {NFP_6000_CPPTGT_MU, 12, 0, 5, 7, "cam256_lookup16/cam512_lookup16"}, ++ {NFP_6000_CPPTGT_MU, 12, 0, 6, 7, "cam256_lookup24/cam512_lookup24"}, ++ {NFP_6000_CPPTGT_MU, 12, 0, 7, 7, "cam256_lookup32/cam512_lookup32"}, ++ {NFP_6000_CPPTGT_MU, 12, 1, 0, 7, ++ "cam128_lookup8_add/cam384_lookup8_add"}, ++ {NFP_6000_CPPTGT_MU, 12, 1, 1, 7, ++ "cam128_lookup16_add/cam384_lookup16_add"}, ++ {NFP_6000_CPPTGT_MU, 12, 1, 2, 7, ++ "cam128_lookup24_add/cam384_lookup24_add"}, ++ {NFP_6000_CPPTGT_MU, 12, 1, 3, 7, ++ "cam128_lookup32_add/cam384_lookup32_add"}, ++ {NFP_6000_CPPTGT_MU, 12, 1, 4, 7, ++ "cam256_lookup8_add/cam512_lookup8_add"}, ++ {NFP_6000_CPPTGT_MU, 12, 1, 5, 7, ++ "cam256_lookup16_add/cam512_lookup16_add"}, ++ {NFP_6000_CPPTGT_MU, 12, 1, 6, 7, ++ "cam256_lookup24_add/cam512_lookup24_add"}, ++ {NFP_6000_CPPTGT_MU, 12, 1, 7, 7, ++ "cam256_lookup32_add/cam512_lookup32_add"}, ++ {NFP_6000_CPPTGT_MU, 12, 2, 0, 7, "tcam128_lookup8/tcam384_lookup8"}, ++ {NFP_6000_CPPTGT_MU, 12, 2, 1, 7, "tcam128_lookup16/tcam384_lookup16"}, ++ {NFP_6000_CPPTGT_MU, 12, 2, 2, 7, "tcam128_lookup24/tcam384_lookup24"}, ++ {NFP_6000_CPPTGT_MU, 12, 2, 3, 7, "tcam128_lookup32/tcam384_lookup32"}, ++ {NFP_6000_CPPTGT_MU, 12, 2, 4, 7, "tcam256_lookup8/tcam512_lookup8"}, ++ {NFP_6000_CPPTGT_MU, 12, 2, 5, 7, "tcam256_lookup16/tcam512_lookup16"}, ++ {NFP_6000_CPPTGT_MU, 12, 2, 6, 7, "tcam256_lookup24/tcam512_lookup24"}, ++ {NFP_6000_CPPTGT_MU, 12, 2, 7, 7, "tcam256_lookup32/tcam512_lookup32"}, ++ {NFP_6000_CPPTGT_MU, 12, 3, 0, 7, "lock128/lock384"}, ++ {NFP_6000_CPPTGT_MU, 12, 3, 2, 7, ++ "cam128_lookup24_add_inc/cam384_lookup24_add_inc"}, ++ {NFP_6000_CPPTGT_MU, 12, 3, 4, 7, "lock256/lock512"}, ++ {NFP_6000_CPPTGT_MU, 12, 3, 6, 7, ++ "cam256_lookup24_add_inc/cam512_lookup24_add_inc"}, ++ {NFP_6000_CPPTGT_MU, 13, 0, 0, 7, "microq128_get"}, ++ {NFP_6000_CPPTGT_MU, 13, 0, 4, 7, "microq256_get"}, ++ {NFP_6000_CPPTGT_MU, 13, 1, 0, 7, "microq128_pop"}, ++ {NFP_6000_CPPTGT_MU, 13, 1, 4, 7, "microq256_pop"}, ++ {NFP_6000_CPPTGT_MU, 13, 2, 0, 7, "microq128_put"}, ++ {NFP_6000_CPPTGT_MU, 13, 2, 4, 7, "microq256_put"}, ++ {NFP_6000_CPPTGT_MU, 14, 0, 0, 7, "queue128_lock"}, ++ {NFP_6000_CPPTGT_MU, 14, 0, 4, 7, "queue256_lock"}, ++ {NFP_6000_CPPTGT_MU, 14, 1, 0, 7, "queue128_unlock"}, ++ {NFP_6000_CPPTGT_MU, 14, 1, 4, 7, "queue256_unlock"}, ++ {NFP_6000_CPPTGT_MU, 15, 0, 0, 0, "xor"}, ++ {NFP_6000_CPPTGT_MU, 15, 1, 0, 0, "test_xor"}, ++ {NFP_6000_CPPTGT_MU, 15, 2, 0, 0, "xor_imm"}, ++ {NFP_6000_CPPTGT_MU, 15, 3, 0, 0, "test_xor_imm"}, ++ {NFP_6000_CPPTGT_MU, 16, 0, 0, 0, ++ "ctm.packet_wait_packet_status/emem.rd_qdesc/imem.stats_log"}, ++ {NFP_6000_CPPTGT_MU, 16, 1, 0, 0, ++ "ctm.packet_read_packet_status/emem.wr_qdesc/imem.stats_log_sat"}, ++ {NFP_6000_CPPTGT_MU, 16, 2, 0, 0, ++ "emem.push_qdesc/imem.stats_log_event"}, ++ {NFP_6000_CPPTGT_MU, 16, 3, 0, 0, "imem.stats_log_sat_event"}, ++ {NFP_6000_CPPTGT_MU, 17, 0, 0, 0, ++ "ctm.packet_alloc/emem.enqueue/imem.stats_push"}, ++ {NFP_6000_CPPTGT_MU, 17, 1, 0, 0, ++ "ctm.packet_credit_get/emem.enqueue_tail/imem.stats_push_clear"}, ++ {NFP_6000_CPPTGT_MU, 17, 2, 0, 0, "ctm.packet_alloc_poll/emem.dequeue"}, ++ {NFP_6000_CPPTGT_MU, 17, 3, 0, 0, "ctm.packet_add_thread"}, ++ {NFP_6000_CPPTGT_MU, 18, 0, 0, 0, ++ "ctm.packet_free/emem.read_queue/imem.lb_write_desc"}, ++ {NFP_6000_CPPTGT_MU, 18, 1, 0, 0, ++ "ctm.packet_free_and_signal/emem.read_queue_ring/imem.lb_read_desc"}, ++ {NFP_6000_CPPTGT_MU, 18, 2, 0, 0, ++ "ctm.packet_free_and_return_pointer/emem.write_queue"}, ++ {NFP_6000_CPPTGT_MU, 18, 3, 0, 0, ++ "ctm.packet_return_pointer/emem.write_queue_ring"}, ++ {NFP_6000_CPPTGT_MU, 19, 0, 0, 0, ++ "ctm.packet_complete_drop/emem.add_tail/imem.lb_write_idtable"}, ++ {NFP_6000_CPPTGT_MU, 19, 1, 0, 0, ++ "ctm.packet_complete_unicast/emem.qadd_thread/imem.lb_read_idtable"}, ++ {NFP_6000_CPPTGT_MU, 19, 2, 0, 0, ++ "ctm.packet_complete_multicast/emem.qadd_work"}, ++ {NFP_6000_CPPTGT_MU, 19, 3, 0, 0, ++ "ctm.packet_complete_multicast_free/emem.qadd_work_imm"}, ++ {NFP_6000_CPPTGT_MU, 20, 0, 0, 0, ++ "ctm.pe_dma_to_memory_packet/emem.put/imem.lb_bucket_write_local"}, ++ {NFP_6000_CPPTGT_MU, 20, 1, 0, 0, ++ "ctm.pe_dma_to_memory_packet_swap/imem.lb_bucket_write_dcache"}, ++ {NFP_6000_CPPTGT_MU, 20, 2, 0, 0, ++ "ctm.pe_dma_to_memory_packet_free/emem.journal"}, ++ {NFP_6000_CPPTGT_MU, 20, 3, 0, 0, ++ "ctm.pe_dma_to_memory_packet_free_swap"}, ++ {NFP_6000_CPPTGT_MU, 21, 0, 0, 0, ++ "ctm.pe_dma_to_memory_indirect/emem.get/imem.lb_bucket_read_local"}, ++ {NFP_6000_CPPTGT_MU, 21, 1, 0, 0, ++ "ctm.pe_dma_to_memory_indirect_swap/emem.get_eop/" ++ "imem.lb_bucket_read_dcache"}, ++ {NFP_6000_CPPTGT_MU, 21, 2, 0, 0, ++ "ctm.pe_dma_to_memory_indirect_free/emem.get_freely"}, ++ {NFP_6000_CPPTGT_MU, 21, 3, 0, 0, ++ "ctm.pe_dma_to_memory_indirect_free_swap"}, ++ {NFP_6000_CPPTGT_MU, 22, 0, 0, 0, ++ "ctm.pe_dma_to_memory_buffer/emem.pop/imem.lb_lookup_bundleid"}, ++ {NFP_6000_CPPTGT_MU, 22, 1, 0, 0, ++ "ctm.pe_dma_to_memory_buffer_le/emem.pop_eop/imem.lb_lookup_dcache"}, ++ {NFP_6000_CPPTGT_MU, 22, 2, 0, 0, ++ "ctm.pe_dma_to_memory_buffer_swap/emem.pop_freely/imem.lb_lookup_idtable"}, ++ {NFP_6000_CPPTGT_MU, 22, 3, 0, 0, "ctm.pe_dma_to_memory_buffer_le_swap"}, ++ {NFP_6000_CPPTGT_MU, 23, 0, 0, 0, ++ "ctm.pe_dma_from_memory_buffer/emem.fast_journal/imem.lb_push_stats_local"}, ++ {NFP_6000_CPPTGT_MU, 23, 1, 0, 0, ++ "ctm.pe_dma_from_memory_buffer_le/emem.fast_journal_sig/" ++ "imem.lb_push_stats_dcache"}, ++ {NFP_6000_CPPTGT_MU, 23, 2, 0, 0, ++ "ctm.pe_dma_from_memory_buffer_swap/imem.lb_push_stats_local_clr"}, ++ {NFP_6000_CPPTGT_MU, 23, 3, 0, 0, ++ "ctm.pe_dma_from_memory_buffer_le_swap/imem.lb_push_stats_dcache_clr"}, ++ {NFP_6000_CPPTGT_MU, 26, 0, 0, 0, "emem.lookup/imem.lookup"}, ++ {NFP_6000_CPPTGT_MU, 28, 0, 0, 0, "read32"}, ++ {NFP_6000_CPPTGT_MU, 28, 1, 0, 0, "read32_le"}, ++ {NFP_6000_CPPTGT_MU, 28, 2, 0, 0, "read32_swap"}, ++ {NFP_6000_CPPTGT_MU, 28, 3, 0, 0, "read32_swap_le"}, ++ {NFP_6000_CPPTGT_MU, 29, 1, 0, 0, "cam_lookup_add_lock"}, ++ {NFP_6000_CPPTGT_MU, 29, 2, 0, 0, "cam_lookup_add_extend"}, ++ {NFP_6000_CPPTGT_MU, 29, 3, 0, 0, "cam_lookup_add_inc"}, ++ {NFP_6000_CPPTGT_MU, 30, 2, 0, 0, "meter"}, ++ {NFP_6000_CPPTGT_MU, 31, 0, 0, 0, "write32"}, ++ {NFP_6000_CPPTGT_MU, 31, 1, 0, 0, "write32_le"}, ++ {NFP_6000_CPPTGT_MU, 31, 2, 0, 0, "write32_swap"}, ++ {NFP_6000_CPPTGT_MU, 31, 3, 0, 0, "write32_swap_le"}, ++ {NFP_6000_CPPTGT_PCIE, 0, 0, 0, 0, "read"}, ++ {NFP_6000_CPPTGT_PCIE, 0, 1, 0, 0, "read_rid"}, ++ {NFP_6000_CPPTGT_PCIE, 1, 0, 0, 0, "write"}, ++ {NFP_6000_CPPTGT_PCIE, 1, 1, 0, 0, "write_rid"}, ++ {NFP_6000_CPPTGT_PCIE, 1, 2, 0, 0, "write_vdm"}, ++ {NFP_6000_CPPTGT_PCIE, 2, 0, 0, 0, "read_int"}, ++ {NFP_6000_CPPTGT_PCIE, 3, 0, 0, 0, "write_int"}, ++ {NFP_6000_CPPTGT_ARM, 0, 0, 0, 0, "read"}, ++ {NFP_6000_CPPTGT_ARM, 1, 0, 0, 0, "write"}, ++ {NFP_6000_CPPTGT_CRYPTO, 0, 0, 0, 0, "read"}, ++ {NFP_6000_CPPTGT_CRYPTO, 1, 0, 0, 0, "write"}, ++ {NFP_6000_CPPTGT_CRYPTO, 2, 0, 0, 0, "write_fifo"}, ++ {NFP_6000_CPPTGT_CTXPB, 0, 0, 0, 0, "xpb_read"}, ++ {NFP_6000_CPPTGT_CTXPB, 0, 1, 0, 0, "ring_get"}, ++ {NFP_6000_CPPTGT_CTXPB, 0, 2, 0, 0, "interthread_signal"}, ++ {NFP_6000_CPPTGT_CTXPB, 1, 0, 0, 0, "xpb_write"}, ++ {NFP_6000_CPPTGT_CTXPB, 1, 1, 0, 0, "ring_put"}, ++ {NFP_6000_CPPTGT_CTXPB, 1, 2, 0, 0, "ctnn_write"}, ++ {NFP_6000_CPPTGT_CTXPB, 2, 0, 0, 0, "reflect_read_none"}, ++ {NFP_6000_CPPTGT_CTXPB, 2, 1, 0, 0, "reflect_read_sig_init"}, ++ {NFP_6000_CPPTGT_CTXPB, 2, 2, 0, 0, "reflect_read_sig_remote"}, ++ {NFP_6000_CPPTGT_CTXPB, 2, 3, 0, 0, "reflect_read_sig_both"}, ++ {NFP_6000_CPPTGT_CTXPB, 3, 0, 0, 0, "reflect_write_none"}, ++ {NFP_6000_CPPTGT_CTXPB, 3, 1, 0, 0, "reflect_write_sig_init"}, ++ {NFP_6000_CPPTGT_CTXPB, 3, 2, 0, 0, "reflect_write_sig_remote"}, ++ {NFP_6000_CPPTGT_CTXPB, 3, 3, 0, 0, "reflect_write_sig_both"}, ++ {NFP_6000_CPPTGT_CLS, 0, 0, 0, 0, "read"}, ++ {NFP_6000_CPPTGT_CLS, 0, 1, 0, 0, "read_le"}, ++ {NFP_6000_CPPTGT_CLS, 0, 2, 0, 0, "swap/test_compare_write"}, ++ {NFP_6000_CPPTGT_CLS, 0, 3, 0, 0, "xor"}, ++ {NFP_6000_CPPTGT_CLS, 1, 0, 0, 0, "write"}, ++ {NFP_6000_CPPTGT_CLS, 1, 1, 0, 0, "write_le"}, ++ {NFP_6000_CPPTGT_CLS, 1, 2, 0, 0, "write8_be"}, ++ {NFP_6000_CPPTGT_CLS, 1, 3, 0, 0, "write8_le"}, ++ {NFP_6000_CPPTGT_CLS, 2, 0, 0, 0, "set"}, ++ {NFP_6000_CPPTGT_CLS, 2, 1, 0, 0, "clr"}, ++ {NFP_6000_CPPTGT_CLS, 2, 2, 0, 0, "test_set"}, ++ {NFP_6000_CPPTGT_CLS, 2, 3, 0, 0, "test_clr"}, ++ {NFP_6000_CPPTGT_CLS, 3, 0, 0, 0, "set_imm"}, ++ {NFP_6000_CPPTGT_CLS, 3, 1, 0, 0, "clr_imm"}, ++ {NFP_6000_CPPTGT_CLS, 3, 2, 0, 0, "test_set_imm"}, ++ {NFP_6000_CPPTGT_CLS, 3, 3, 0, 0, "test_clr_imm"}, ++ {NFP_6000_CPPTGT_CLS, 4, 0, 0, 0, "add"}, ++ {NFP_6000_CPPTGT_CLS, 4, 1, 0, 0, "add64"}, ++ {NFP_6000_CPPTGT_CLS, 4, 2, 0, 0, "addsat"}, ++ {NFP_6000_CPPTGT_CLS, 5, 0, 0, 0, "add_imm"}, ++ {NFP_6000_CPPTGT_CLS, 5, 1, 0, 0, "add64_imm"}, ++ {NFP_6000_CPPTGT_CLS, 5, 2, 0, 0, "addsat_imm"}, ++ {NFP_6000_CPPTGT_CLS, 6, 0, 0, 0, "sub"}, ++ {NFP_6000_CPPTGT_CLS, 6, 1, 0, 0, "sub64"}, ++ {NFP_6000_CPPTGT_CLS, 6, 2, 0, 0, "subsat"}, ++ {NFP_6000_CPPTGT_CLS, 7, 0, 0, 0, "sub_imm"}, ++ {NFP_6000_CPPTGT_CLS, 7, 1, 0, 0, "sub64_imm"}, ++ {NFP_6000_CPPTGT_CLS, 7, 2, 0, 0, "subsat_imm"}, ++ {NFP_6000_CPPTGT_CLS, 8, 0, 0, 0, "queue_lock"}, ++ {NFP_6000_CPPTGT_CLS, 8, 1, 0, 0, "queue_unlock"}, ++ {NFP_6000_CPPTGT_CLS, 8, 2, 0, 0, "hash_mask"}, ++ {NFP_6000_CPPTGT_CLS, 8, 3, 0, 0, "hash_mask_clear"}, ++ {NFP_6000_CPPTGT_CLS, 9, 0, 0, 0, "get"}, ++ {NFP_6000_CPPTGT_CLS, 9, 1, 0, 0, "pop"}, ++ {NFP_6000_CPPTGT_CLS, 9, 2, 0, 0, "get_safe"}, ++ {NFP_6000_CPPTGT_CLS, 9, 3, 0, 0, "pop_safe"}, ++ {NFP_6000_CPPTGT_CLS, 10, 0, 0, 0, "ring_put"}, ++ {NFP_6000_CPPTGT_CLS, 10, 2, 0, 0, "ring_journal"}, ++ {NFP_6000_CPPTGT_CLS, 11, 0, 0, 0, "cam_lookup32"}, ++ {NFP_6000_CPPTGT_CLS, 11, 1, 0, 0, "cam_lookup32_add"}, ++ {NFP_6000_CPPTGT_CLS, 11, 2, 0, 0, "cam_lookup24"}, ++ {NFP_6000_CPPTGT_CLS, 11, 3, 0, 0, "cam_lookup24_add"}, ++ {NFP_6000_CPPTGT_CLS, 12, 0, 0, 0, "cam_lookup8"}, ++ {NFP_6000_CPPTGT_CLS, 12, 1, 0, 0, "cam_lookup8_add"}, ++ {NFP_6000_CPPTGT_CLS, 12, 2, 0, 0, "cam_lookup16"}, ++ {NFP_6000_CPPTGT_CLS, 12, 3, 0, 0, "cam_lookup16_add"}, ++ {NFP_6000_CPPTGT_CLS, 13, 0, 0, 0, "tcam_lookup32"}, ++ {NFP_6000_CPPTGT_CLS, 13, 1, 0, 0, "tcam_lookup24"}, ++ {NFP_6000_CPPTGT_CLS, 13, 2, 0, 0, "tcam_lookup16"}, ++ {NFP_6000_CPPTGT_CLS, 13, 3, 0, 0, "tcam_lookup8"}, ++ {NFP_6000_CPPTGT_CLS, 14, 0, 0, 0, "reflect_write_sig_local"}, ++ {NFP_6000_CPPTGT_CLS, 14, 1, 0, 0, "reflect_write_sig_remote"}, ++ {NFP_6000_CPPTGT_CLS, 14, 2, 0, 0, "reflect_write_sig_both"}, ++ {NFP_6000_CPPTGT_CLS, 15, 0, 0, 0, "reflect_read_sig_remote"}, ++ {NFP_6000_CPPTGT_CLS, 15, 1, 0, 0, "reflect_read_sig_local"}, ++ {NFP_6000_CPPTGT_CLS, 15, 2, 0, 0, "reflect_read_sig_both"}, ++ {NFP_6000_CPPTGT_CLS, 16, 1, 0, 0, "cam_lookup32_add_lock"}, ++ {NFP_6000_CPPTGT_CLS, 16, 2, 0, 0, "cam_lookup24_add_inc"}, ++ {NFP_6000_CPPTGT_CLS, 16, 3, 0, 0, "cam_lookup32_add_extend"}, ++ {NFP_6000_CPPTGT_CLS, 17, 0, 0, 0, "meter"}, ++ {NFP_6000_CPPTGT_CLS, 17, 2, 0, 0, "statistic"}, ++ {NFP_6000_CPPTGT_CLS, 17, 3, 0, 0, "statistic_imm"}, ++ {NFP_6000_CPPTGT_CLS, 20, 0, 0, 0, "test_add"}, ++ {NFP_6000_CPPTGT_CLS, 20, 1, 0, 0, "test_add64"}, ++ {NFP_6000_CPPTGT_CLS, 20, 2, 0, 0, "test_addsat"}, ++ {NFP_6000_CPPTGT_CLS, 21, 0, 0, 0, "test_add_imm"}, ++ {NFP_6000_CPPTGT_CLS, 21, 1, 0, 0, "test_add64_imm"}, ++ {NFP_6000_CPPTGT_CLS, 21, 2, 0, 0, "test_addsat_imm"}, ++ {NFP_6000_CPPTGT_CLS, 22, 0, 0, 0, "test_sub"}, ++ {NFP_6000_CPPTGT_CLS, 22, 1, 0, 0, "test_sub64"}, ++ {NFP_6000_CPPTGT_CLS, 22, 2, 0, 0, "test_subsat"}, ++ {NFP_6000_CPPTGT_CLS, 23, 0, 0, 0, "test_sub_imm"}, ++ {NFP_6000_CPPTGT_CLS, 23, 1, 0, 0, "test_sub64_imm"}, ++ {NFP_6000_CPPTGT_CLS, 23, 2, 0, 0, "test_subsat_imm"}, ++ {NFP_6000_CPPTGT_CLS, 24, 0, 0, 0, "ring_read"}, ++ {NFP_6000_CPPTGT_CLS, 24, 1, 0, 0, "ring_write"}, ++ {NFP_6000_CPPTGT_CLS, 24, 2, 0, 0, "ring_ordered_lock"}, ++ {NFP_6000_CPPTGT_CLS, 24, 3, 0, 0, "ring_ordered_unlock"}, ++ {NFP_6000_CPPTGT_CLS, 25, 0, 0, 0, "ring_workq_add_thread"}, ++ {NFP_6000_CPPTGT_CLS, 25, 1, 0, 0, "ring_workq_add_work"} ++}; ++ ++static int ++nfp_me_print_invalid (uint64_t instr, struct disassemble_info *dinfo) ++{ ++ const char * err_msg = N_(":"); ++ dinfo->fprintf_func (dinfo->stream, "%s 0x%llx", err_msg, (long long) instr); ++ return _NFP_ERR_CONT; ++} ++ ++static bfd_boolean ++nfp_me_is_imm_opnd10 (unsigned int opnd) ++{ ++ return _BF (opnd, 9, 8) == 0x3; ++} ++ ++static bfd_boolean ++nfp_me_is_imm_opnd8 (unsigned int opnd) ++{ ++ return _BTST (opnd, 5); ++} ++ ++static unsigned int ++nfp_me_imm_opnd10 (unsigned int opnd) ++{ ++ return nfp_me_is_imm_opnd10 (opnd) ? (opnd & 0xff) : ~0U; ++} ++ ++static unsigned int ++nfp_me_imm_opnd8 (unsigned int opnd, unsigned int imm8_msb) ++{ ++ unsigned int v = (imm8_msb << 7) | _BFS (opnd, 7, 6, 5) | _BF (opnd, 4, 0); ++ ++ return nfp_me_is_imm_opnd8 (opnd) ? v : ~0U; ++} ++ ++/* Print an unrestricted/10-bit operand. ++ This can mostly be generic across NFP families at the moment. */ ++static bfd_boolean ++nfp_me_print_opnd10 (unsigned int opnd, char bank, int num_ctx, int lmem_ext, ++ struct disassemble_info *dinfo) ++{ ++ unsigned int n = _BF (opnd, (num_ctx == 8) ? 3 : 4, 0); ++ ++ /* Absolute GPR. */ ++ if (_BF (opnd, 9, 7) == 0x1) ++ dinfo->fprintf_func (dinfo->stream, "@gpr%c_%d", bank, _BF (opnd, 6, 0)); ++ ++ /* Relative GPR. */ ++ else if (_BF (opnd, 9, 6) == 0x0) ++ dinfo->fprintf_func (dinfo->stream, "gpr%c_%d", bank, n); ++ ++ /* Indexed Xfer. */ ++ else if (_BF (opnd, 9, 7) == 0x2) ++ { ++ dinfo->fprintf_func (dinfo->stream, "*$index"); ++ if (_BF (opnd, 2, 1) == 0x1) ++ dinfo->fprintf_func (dinfo->stream, "++"); ++ else if (_BF (opnd, 2, 1) == 0x2) ++ dinfo->fprintf_func (dinfo->stream, "--"); ++ } ++ ++ /* Relative Xfer. */ ++ else if (_BF (opnd, 9, 7) == 0x3) ++ { ++ if (_BTST (opnd, 6)) ++ n += (num_ctx == 8 ? 16 : 32); ++ dinfo->fprintf_func (dinfo->stream, "$xfer_%d", n); ++ } ++ ++ /* Indexed Next Neighbour. */ ++ else if (_BF (opnd, 9, 6) == 0x9) ++ { ++ dinfo->fprintf_func (dinfo->stream, "*n$index"); ++ if (_BTST (opnd, 1)) ++ dinfo->fprintf_func (dinfo->stream, "++"); ++ } ++ ++ /* Relative Next Neighbour. */ ++ else if (_BF (opnd, 9, 6) == 0xa) ++ { ++ dinfo->fprintf_func (dinfo->stream, "n$reg_%d", n); ++ } ++ ++ /* Indexed LMEM. */ ++ else if (_BF (opnd, 9, 6) == 0x8) ++ { ++ n = _BF (opnd, 5, 5) + (lmem_ext * 2); ++ dinfo->fprintf_func (dinfo->stream, "*l$index%d", n); ++ if (_BTST (opnd, 4)) ++ dinfo->fprintf_func (dinfo->stream, _BTST (opnd, 0) ? "--" : "++"); ++ else if (_BF (opnd, 3, 0)) ++ dinfo->fprintf_func (dinfo->stream, "[%d]", _BF (opnd, 3, 0)); ++ } ++ ++ /* 8-bit Constant value. */ ++ else if (_BF (opnd, 9, 8) == 0x3) ++ dinfo->fprintf_func (dinfo->stream, "0x%x", _BF (opnd, 7, 0)); ++ ++ else ++ { ++ dinfo->fprintf_func (dinfo->stream, "", opnd); ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ ++/* Print a restricted/8-bit operand. ++ This can mostly be generic across NFP families at the moment. */ ++ ++static bfd_boolean ++nfp_me_print_opnd8 (unsigned int opnd, char bank, int num_ctx, int lmem_ext, ++ unsigned int imm8_msb, struct disassemble_info *dinfo) ++{ ++ unsigned int n = _BF (opnd, (num_ctx == 8) ? 3 : 4, 0); ++ ++ /* Relative GPR. */ ++ if (_BF (opnd, 7, 5) == 0x0) ++ dinfo->fprintf_func (dinfo->stream, "gpr%c_%d", bank, n); ++ ++ /* Relative Xfer. */ ++ else if (_BF (opnd, 7, 5) == 0x4) ++ dinfo->fprintf_func (dinfo->stream, "$xfer_%d", n); ++ ++ /* Relative Xfer. */ ++ else if (_BF (opnd, 7, 5) == 0x6) ++ { ++ n += (num_ctx == 8 ? 16 : 32); ++ dinfo->fprintf_func (dinfo->stream, "$xfer_%d", n); ++ } ++ ++ /* Indexed Xfer. */ ++ else if ((_BF (opnd, 7, 4) == 0x4) && (!_BTST (opnd, 0))) ++ { ++ dinfo->fprintf_func (dinfo->stream, "*$index"); ++ if (_BF (opnd, 2, 1) == 0x1) ++ dinfo->fprintf_func (dinfo->stream, "++"); ++ else if (_BF (opnd, 2, 1) == 0x2) ++ dinfo->fprintf_func (dinfo->stream, "--"); ++ } ++ ++ /* Indexed NN. */ ++ else if ((_BF (opnd, 7, 4) == 0x4) && (_BTST (opnd, 0))) ++ { ++ dinfo->fprintf_func (dinfo->stream, "*n$index"); ++ if (_BTST (opnd, 1)) ++ dinfo->fprintf_func (dinfo->stream, "++"); ++ } ++ ++ /* Indexed LMEM. */ ++ else if (_BF (opnd, 7, 4) == 0x5) ++ { ++ n = _BF (opnd, 3, 3) + (lmem_ext * 2); ++ dinfo->fprintf_func (dinfo->stream, "*l$index%d", n); ++ if (_BF (opnd, 2, 0)) ++ dinfo->fprintf_func (dinfo->stream, "[%d]", _BF (opnd, 2, 0)); ++ } ++ ++ /* 7+1-bit Constant value. */ ++ else if (_BTST (opnd, 5)) ++ { ++ n = (imm8_msb << 7) | _BFS (opnd, 7, 6, 5) | _BF (opnd, 4, 0); ++ dinfo->fprintf_func (dinfo->stream, "0x%x", n); ++ } ++ ++ else ++ { ++ dinfo->fprintf_func (dinfo->stream, "", opnd); ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ ++static int ++nfp_me27_28_print_alu_shf (uint64_t instr, unsigned int pred_cc, ++ unsigned int dst_lmext, unsigned int src_lmext, ++ unsigned int gpr_wrboth, ++ int num_ctx, struct disassemble_info *dinfo) ++{ ++ unsigned int op = _BF (instr, 35, 33); ++ unsigned int srcA = _BF (instr, 7, 0); ++ unsigned int srcB = _BF (instr, 17, 10); ++ unsigned int dst = _BF (instr, 27, 20); ++ unsigned int sc = _BF (instr, 9, 8); ++ unsigned int imm_msb = _BTST (instr, 18); ++ unsigned int swap = _BTST (instr, 19); ++ unsigned int shift = _BF (instr, 32, 28); ++ char dst_bank = 'A' + _BTST (instr, 36); ++ unsigned int nocc = _BTST (instr, 40); ++ bfd_boolean err = FALSE; ++ ++ if (swap) ++ { ++ unsigned int tmp = srcA; ++ srcA = srcB; ++ srcB = tmp; ++ } ++ ++ /* alu_shf, dbl_shf, asr. */ ++ if (op < 7) ++ { ++ if (sc == 3) ++ dinfo->fprintf_func (dinfo->stream, "dbl_shf["); ++ else if (op == 6) ++ dinfo->fprintf_func (dinfo->stream, "asr["); ++ else ++ dinfo->fprintf_func (dinfo->stream, "alu_shf["); ++ ++ /* dest operand */ ++ if (nfp_me_is_imm_opnd8 (dst)) ++ dinfo->fprintf_func (dinfo->stream, "--"); ++ else ++ err = err || !nfp_me_print_opnd8 (dst, dst_bank, num_ctx, ++ dst_lmext, imm_msb, dinfo); ++ ++ dinfo->fprintf_func (dinfo->stream, ", "); ++ ++ /* A operand. */ ++ if (op != 6) ++ { ++ if ((op < 2) && (sc != 3)) /* Not dbl_shf. */ ++ dinfo->fprintf_func (dinfo->stream, "--"); /* B or ~B operator. */ ++ else ++ err = err || !nfp_me_print_opnd8 (srcA, (swap) ? 'B' : 'A', ++ num_ctx, src_lmext, imm_msb, ++ dinfo); ++ ++ dinfo->fprintf_func (dinfo->stream, ", "); ++ ++ /* Operator (not for dbl_shf). */ ++ if (sc != 3) ++ { ++ dinfo->fprintf_func (dinfo->stream, "%s, ", ++ nfp_mealu_shf_op[op]); ++ } ++ } ++ ++ /* B operand. */ ++ err = err || !nfp_me_print_opnd8 (srcB, (swap) ? 'A' : 'B', ++ num_ctx, src_lmext, imm_msb, dinfo); ++ ++ dinfo->fprintf_func (dinfo->stream, ", "); ++ ++ /* Shift */ ++ if (sc == 0) ++ dinfo->fprintf_func (dinfo->stream, ">>rot%d", shift); ++ else if (sc == 2) ++ { ++ if (shift) ++ dinfo->fprintf_func (dinfo->stream, "<<%d", (32 - shift)); ++ else ++ dinfo->fprintf_func (dinfo->stream, "<fprintf_func (dinfo->stream, ">>%d", shift); ++ else ++ dinfo->fprintf_func (dinfo->stream, ">>indirect"); ++ } ++ } ++ /* Byte Align. */ ++ else if (op == 7) ++ { ++ dinfo->fprintf_func (dinfo->stream, "byte_align_%s[", ++ ((sc == 2) ? "le" : "be")); ++ ++ /* Dest operand. */ ++ if (nfp_me_is_imm_opnd8 (dst)) ++ dinfo->fprintf_func (dinfo->stream, "--"); ++ else ++ err = err || !nfp_me_print_opnd8 (dst, dst_bank, num_ctx, ++ dst_lmext, imm_msb, dinfo); ++ ++ dinfo->fprintf_func (dinfo->stream, ", "); ++ ++ if (sc == 2) ++ err = err || !nfp_me_print_opnd8 (srcA, (swap) ? 'B' : 'A', num_ctx, ++ 0, imm_msb, dinfo); ++ else ++ err = err || !nfp_me_print_opnd8 (srcB, (swap) ? 'A' : 'B', num_ctx, ++ 0, imm_msb, dinfo); ++ } ++ ++ dinfo->fprintf_func (dinfo->stream, "]"); ++ if (nocc) ++ dinfo->fprintf_func (dinfo->stream, ", no_cc"); ++ if (gpr_wrboth) ++ dinfo->fprintf_func (dinfo->stream, ", gpr_wrboth"); ++ if (pred_cc) ++ dinfo->fprintf_func (dinfo->stream, ", predicate_cc"); ++ ++ if (err) ++ return _NFP_ERR_CONT; ++ return 0; ++} ++ ++static int ++nfp_me27_28_print_alu (uint64_t instr, unsigned int pred_cc, ++ unsigned int dst_lmext, unsigned int src_lmext, ++ unsigned int gpr_wrboth, ++ int num_ctx, struct disassemble_info *dinfo) ++{ ++ unsigned int op = _BF (instr, 35, 31); ++ unsigned int srcA = _BF (instr, 9, 0); ++ unsigned int srcB = _BF (instr, 19, 10); ++ unsigned int dst = _BF (instr, 29, 20); ++ unsigned int swap = _BTST (instr, 30); ++ char dst_bank = 'A' + _BTST (instr, 36); ++ unsigned int nocc = _BTST (instr, 40); ++ int do_close_bracket = 1; ++ bfd_boolean err = FALSE; ++ ++ if (swap) ++ { ++ unsigned int tmp = srcA; ++ srcA = srcB; ++ srcB = tmp; ++ } ++ ++ switch (op) ++ { ++ case 3: /* pop_count3[dst, srcB] */ ++ case 6: /* pop_count1[srcB] */ ++ case 7: /* pop_count2[srcB] */ ++ case 14: /* ffs[dst, srcB] */ ++ case 15: /* cam_read_tag[dst, srcB] */ ++ case 31: /* cam_read_state[dst, srcB] */ ++ dinfo->fprintf_func (dinfo->stream, "%s[", nfp_me27_28_alu_op[op]); ++ ++ /* No dest for pop_count1/2. */ ++ if ((op != 6) && (op != 7)) ++ { ++ /* dest operand */ ++ if (nfp_me_is_imm_opnd10 (dst)) ++ dinfo->fprintf_func (dinfo->stream, "--"); ++ else ++ err = err || !nfp_me_print_opnd10 (dst, dst_bank, num_ctx, ++ dst_lmext, dinfo); ++ ++ dinfo->fprintf_func (dinfo->stream, ", "); ++ } ++ ++ /* B operand. */ ++ err = err || !nfp_me_print_opnd10 (srcB, (swap) ? 'A' : 'B', ++ num_ctx, src_lmext, dinfo); ++ break; ++ ++ /* cam_clear. */ ++ case 11: ++ do_close_bracket = 0; ++ dinfo->fprintf_func (dinfo->stream, "cam_clear"); ++ break; ++ ++ /* cam_lookup. */ ++ case 23: ++ do_close_bracket = 0; ++ dinfo->fprintf_func (dinfo->stream, "%s[", nfp_me27_28_alu_op[op]); ++ ++ /* Dest operand. */ ++ if (nfp_me_is_imm_opnd10 (dst)) ++ dinfo->fprintf_func (dinfo->stream, "--"); ++ else ++ err = err || !nfp_me_print_opnd10 (dst, dst_bank, num_ctx, ++ dst_lmext, dinfo); ++ ++ dinfo->fprintf_func (dinfo->stream, ", "); ++ ++ /* A operand. */ ++ err = err || !nfp_me_print_opnd10 (srcA, (swap) ? 'B' : 'A', ++ num_ctx, src_lmext, dinfo); ++ ++ dinfo->fprintf_func (dinfo->stream, "]"); ++ ++ if (_BF (srcB, 1, 0)) ++ { ++ unsigned int n = _BTST (srcB, 1); ++ if (_BTST (srcB, 4)) /* Only for MEv28. */ ++ n += 2; ++ dinfo->fprintf_func (dinfo->stream, ", lm_addr%d[%d]", n, ++ _BF (srcB, 3, 2)); ++ } ++ ++ break; ++ ++ case 19: /* cam_write. */ ++ case 27: /* cam_write_state. */ ++ dinfo->fprintf_func (dinfo->stream, "%s[", nfp_me27_28_alu_op[op]); ++ err = err || !nfp_me_print_opnd10 (srcB, (swap) ? 'A' : 'B', ++ num_ctx, src_lmext, dinfo); ++ dinfo->fprintf_func (dinfo->stream, ", "); ++ if (op == 19) ++ { ++ err = err || !nfp_me_print_opnd10 (srcA, (swap) ? 'B' : 'A', ++ num_ctx, src_lmext, dinfo); ++ dinfo->fprintf_func (dinfo->stream, ", "); ++ } ++ dinfo->fprintf_func (dinfo->stream, "%d", (dst & 0xf)); ++ break; ++ ++ /* CRC. */ ++ case 18: ++ do_close_bracket = 0; ++ dinfo->fprintf_func (dinfo->stream, "crc_%s[", ++ _BTST (srcA, 3) ? "le" : "be"); ++ if (!nfp_me27_28_crc_op[_BF (srcA, 7, 5)]) ++ { ++ dinfo->fprintf_func (dinfo->stream, _(", , ")); ++ err = TRUE; ++ } ++ else ++ { ++ dinfo->fprintf_func (dinfo->stream, "%s, ", ++ nfp_me27_28_crc_op[_BF (srcA, 7, 5)]); ++ } ++ ++ /* Dest operand. */ ++ if (nfp_me_is_imm_opnd10 (dst)) ++ dinfo->fprintf_func (dinfo->stream, "--"); ++ else ++ err = err || !nfp_me_print_opnd10 (dst, dst_bank, num_ctx, ++ dst_lmext, dinfo); ++ ++ dinfo->fprintf_func (dinfo->stream, ", "); ++ ++ /* B operand. */ ++ err = err || !nfp_me_print_opnd10 (srcB, (swap) ? 'A' : 'B', ++ num_ctx, src_lmext, dinfo); ++ ++ dinfo->fprintf_func (dinfo->stream, "]"); ++ if (_BF (srcA, 2, 0)) ++ dinfo->fprintf_func (dinfo->stream, ", %s", ++ nfp_me27_28_crc_bytes[_BF (srcA, 2, 0)]); ++ if (_BTST (srcA, 4)) ++ dinfo->fprintf_func (dinfo->stream, ", bit_swap"); ++ break; ++ ++ default: ++ /* s += 'alu[%s, %s, %s, %s]' % (dst, srcAs, op, srcBs). */ ++ dinfo->fprintf_func (dinfo->stream, "alu["); ++ ++ /* Dest operand. */ ++ if (nfp_me_is_imm_opnd10 (dst)) ++ dinfo->fprintf_func (dinfo->stream, "--"); ++ else ++ err = err || !nfp_me_print_opnd10 (dst, dst_bank, num_ctx, ++ dst_lmext, dinfo); ++ dinfo->fprintf_func (dinfo->stream, ", "); ++ ++ /* A operand. */ ++ if ((op == 0) || (op == 4)) /* B only operators. */ ++ dinfo->fprintf_func (dinfo->stream, "--"); ++ else ++ err = err || !nfp_me_print_opnd10 (srcA, (swap) ? 'B' : 'A', ++ num_ctx, src_lmext, dinfo); ++ ++ if (!nfp_me27_28_alu_op[op]) ++ { ++ dinfo->fprintf_func (dinfo->stream, ", , ", op); ++ err = TRUE; ++ } ++ else ++ { ++ dinfo->fprintf_func (dinfo->stream, ", %s, ", ++ nfp_me27_28_alu_op[op]); ++ } ++ ++ /* B operand. */ ++ err = err || !nfp_me_print_opnd10 (srcB, (swap) ? 'A' : 'B', ++ num_ctx, src_lmext, dinfo); ++ break; ++ } ++ ++ if (do_close_bracket) ++ dinfo->fprintf_func (dinfo->stream, "]"); ++ ++ if (nocc) ++ dinfo->fprintf_func (dinfo->stream, ", no_cc"); ++ if (gpr_wrboth) ++ dinfo->fprintf_func (dinfo->stream, ", gpr_wrboth"); ++ if (pred_cc) ++ dinfo->fprintf_func (dinfo->stream, ", predicate_cc"); ++ ++ if (err) ++ return _NFP_ERR_CONT; ++ return 0; ++} ++ ++static int ++nfp_me27_28_print_immed (uint64_t instr, unsigned int pred_cc, ++ unsigned int dst_lmext, ++ unsigned int gpr_wrboth, ++ int num_ctx, struct disassemble_info *dinfo) ++{ ++ unsigned int srcA = _BF (instr, 9, 0); ++ unsigned int srcB = _BF (instr, 19, 10); ++ unsigned int imm = _BF (instr, 27, 20); ++ unsigned int by = _BTST (instr, 29); ++ unsigned int wd = _BTST (instr, 30); ++ unsigned int inv = _BTST (instr, 31); ++ unsigned int byte_shift = _BF (instr, 34, 33); ++ bfd_boolean err = FALSE; ++ ++ if (nfp_me_is_imm_opnd10 (srcB)) ++ { ++ imm = (imm << 8) | nfp_me_imm_opnd10 (srcB); ++ if (nfp_me_is_imm_opnd10 (srcA) && (imm == 0)) ++ { ++ dinfo->fprintf_func (dinfo->stream, "nop"); ++ return 0; ++ } ++ } ++ else ++ { ++ imm = (imm << 8) | nfp_me_imm_opnd10 (srcA); ++ } ++ ++ if (inv) ++ imm = (imm ^ 0xffff) | 0xffff0000U; ++ ++ if (by) ++ { ++ dinfo->fprintf_func (dinfo->stream, "immed_b%d[", byte_shift); ++ imm &= 0xff; ++ } ++ else if (wd) ++ { ++ dinfo->fprintf_func (dinfo->stream, "immed_w%d[", (byte_shift / 2)); ++ imm &= 0xffff; ++ } ++ else ++ dinfo->fprintf_func (dinfo->stream, "immed["); ++ ++ /* Dest. */ ++ if (nfp_me_is_imm_opnd10 (srcA) && nfp_me_is_imm_opnd10 (srcB)) ++ dinfo->fprintf_func (dinfo->stream, "--"); /* No Dest. */ ++ else if (nfp_me_is_imm_opnd10 (srcA)) ++ err = err || !nfp_me_print_opnd10 (srcB, 'B', num_ctx, dst_lmext, dinfo); ++ else ++ err = err || !nfp_me_print_opnd10 (srcA, 'A', num_ctx, dst_lmext, dinfo); ++ ++ dinfo->fprintf_func (dinfo->stream, ", 0x%x", imm); ++ ++ if ((!by) && (!wd) && (byte_shift)) ++ dinfo->fprintf_func (dinfo->stream, ", <<%d", (byte_shift * 8)); ++ ++ dinfo->fprintf_func (dinfo->stream, "]"); ++ ++ if (gpr_wrboth) ++ dinfo->fprintf_func (dinfo->stream, ", gpr_wrboth"); ++ if (pred_cc) ++ dinfo->fprintf_func (dinfo->stream, ", predicate_cc"); ++ ++ if (err) ++ return _NFP_ERR_CONT; ++ return 0; ++} ++ ++static int ++nfp_me27_28_print_ld_field (uint64_t instr, unsigned int pred_cc, ++ unsigned int dst_lmext, unsigned int src_lmext, ++ unsigned int gpr_wrboth, ++ int num_ctx, struct disassemble_info *dinfo) ++{ ++ unsigned int load_cc = _BTST (instr, 34); ++ unsigned int shift = _BF (instr, 32, 28); ++ unsigned int byte_mask = _BF (instr, 27, 24); ++ unsigned int zerof = _BTST (instr, 20); ++ unsigned int swap = _BTST (instr, 19); ++ unsigned int imm_msb = _BTST (instr, 18); ++ unsigned int src = _BF (instr, 17, 10); ++ unsigned int sc = _BF (instr, 9, 8); ++ unsigned int dst = _BF (instr, 7, 0); ++ bfd_boolean err = FALSE; ++ ++ if (swap) ++ { ++ unsigned int tmp = src; ++ src = dst; ++ dst = tmp; ++ } ++ ++ if (zerof) ++ dinfo->fprintf_func (dinfo->stream, "ld_field_w_clr["); ++ else ++ dinfo->fprintf_func (dinfo->stream, "ld_field["); ++ ++ err = err || !nfp_me_print_opnd8 (dst, (swap) ? 'B' : 'A', num_ctx, ++ dst_lmext, imm_msb, dinfo); ++ dinfo->fprintf_func (dinfo->stream, ", %d%d%d%d, ", ++ _BTST (byte_mask, 3), ++ _BTST (byte_mask, 2), ++ _BTST (byte_mask, 1), _BTST (byte_mask, 0)); ++ err = err || !nfp_me_print_opnd8 (src, (swap) ? 'A' : 'B', num_ctx, ++ src_lmext, imm_msb, dinfo); ++ ++ if ((sc == 0) && (shift != 0)) ++ dinfo->fprintf_func (dinfo->stream, ", >>rot%d", shift); ++ else if (sc == 1) ++ { ++ if (shift) ++ dinfo->fprintf_func (dinfo->stream, ", >>%d", shift); ++ else ++ dinfo->fprintf_func (dinfo->stream, ", >>indirect"); ++ } ++ else if (sc == 2) ++ { ++ if (shift) ++ dinfo->fprintf_func (dinfo->stream, ", <<%d", (32 - shift)); ++ else ++ dinfo->fprintf_func (dinfo->stream, ", <fprintf_func (dinfo->stream, ", >>dbl%d", shift); ++ ++ dinfo->fprintf_func (dinfo->stream, "]"); ++ ++ if (load_cc) ++ dinfo->fprintf_func (dinfo->stream, ", load_cc"); ++ if (gpr_wrboth) ++ dinfo->fprintf_func (dinfo->stream, ", gpr_wrboth"); ++ if (pred_cc) ++ dinfo->fprintf_func (dinfo->stream, ", predicate_cc"); ++ ++ if (err) ++ return _NFP_ERR_CONT; ++ return 0; ++} ++ ++static int ++nfp_me27_28_print_ctx_arb (uint64_t instr, struct disassemble_info *dinfo) ++{ ++ unsigned int resume_addr = _BFS (instr, 40, 40, 13) | _BF (instr, 34, 22); ++ unsigned int defer = _BF (instr, 21, 20); ++ unsigned int no_load = _BTST (instr, 19); ++ unsigned int resume = _BTST (instr, 18); ++ unsigned int bpt = _BTST (instr, 17); ++ unsigned int sig_or = _BTST (instr, 16); ++ unsigned int ev_mask = _BF (instr, 15, 0); ++ ++ dinfo->fprintf_func (dinfo->stream, "ctx_arb["); ++ if (bpt) ++ dinfo->fprintf_func (dinfo->stream, "bpt"); ++ else if (ev_mask == 1) ++ dinfo->fprintf_func (dinfo->stream, "voluntary"); ++ else if ((!no_load) && (ev_mask == 0)) ++ { ++ dinfo->fprintf_func (dinfo->stream, "kill"); ++ sig_or = 0; ++ } ++ else if (ev_mask == 0) ++ dinfo->fprintf_func (dinfo->stream, "--"); ++ else ++ { ++ int first_print = 1; ++ unsigned int n; ++ ++ for (n = 1; n < 16; n++) ++ { ++ if (!_BTST (ev_mask, n)) ++ continue; ++ dinfo->fprintf_func (dinfo->stream, "%ssig%d", ++ (first_print) ? "" : ", ", n); ++ first_print = 0; ++ } ++ } ++ ++ dinfo->fprintf_func (dinfo->stream, "]"); ++ ++ if (sig_or) ++ dinfo->fprintf_func (dinfo->stream, ", any"); ++ if (resume) ++ dinfo->fprintf_func (dinfo->stream, ", br[.%d]", resume_addr); ++ if (defer) ++ dinfo->fprintf_func (dinfo->stream, ", defer[%d]", defer); ++ ++ return 0; ++} ++ ++static int ++nfp_me27_28_print_local_csr (uint64_t instr, ++ unsigned int src_lmext, ++ int num_ctx, struct disassemble_info *dinfo) ++{ ++ unsigned int srcA = _BF (instr, 9, 0); ++ unsigned int srcB = _BF (instr, 19, 10); ++ unsigned int wr = _BTST (instr, 21); ++ unsigned int csr_num = _BF (instr, 32, 22); ++ unsigned int src = srcA; ++ char src_bank = 'A'; ++ bfd_boolean err = FALSE; ++ ++ if (nfp_me_is_imm_opnd10 (srcA) && !nfp_me_is_imm_opnd10 (srcB)) ++ { ++ src_bank = 'B'; ++ src = srcB; ++ } ++ ++ /* MEv28 does not have urd/uwr. */ ++ if (csr_num == 1) ++ { ++ if (wr) ++ { ++ dinfo->fprintf_func (dinfo->stream, "uwr[*u$index%d++, ", ++ (int) _BTST (instr, 20)); ++ err = err || !nfp_me_print_opnd10 (src, src_bank, num_ctx, ++ src_lmext, dinfo); ++ } ++ else ++ { ++ dinfo->fprintf_func (dinfo->stream, "urd["); ++ err = err || !nfp_me_print_opnd10 (src, src_bank, num_ctx, ++ src_lmext, dinfo); ++ dinfo->fprintf_func (dinfo->stream, ", *u$index%d++", ++ (int) _BTST (instr, 20)); ++ } ++ dinfo->fprintf_func (dinfo->stream, "]"); ++ } ++ else ++ { ++ const char *nm = NULL; ++ ++ if (csr_num < ARRAY_SIZE (nfp_me27_28_mecsrs)) ++ nm = nfp_me27_28_mecsrs[csr_num]; ++ ++ dinfo->fprintf_func (dinfo->stream, "local_csr_%s[", ++ (wr) ? "wr" : "rd"); ++ if (nm) ++ dinfo->fprintf_func (dinfo->stream, "%s", nm); ++ else ++ dinfo->fprintf_func (dinfo->stream, "0x%x", (csr_num * 4)); ++ ++ if (wr) ++ { ++ dinfo->fprintf_func (dinfo->stream, ", "); ++ err = err || !nfp_me_print_opnd10 (src, src_bank, num_ctx, ++ src_lmext, dinfo); ++ } ++ dinfo->fprintf_func (dinfo->stream, "]"); ++ } ++ ++ if (err) ++ return _NFP_ERR_CONT; ++ return 0; ++} ++ ++static int ++nfp_me27_28_print_branch (uint64_t instr, ++ const char *br_inpstates[16], ++ struct disassemble_info *dinfo) ++{ ++ unsigned int br_op = _BF (instr, 4, 0); ++ unsigned int ctx_sig_state = _BF (instr, 17, 14); ++ unsigned int defer = _BF (instr, 21, 20); ++ unsigned int br_addr = _BFS (instr, 40, 40, 13) | _BF (instr, 34, 22); ++ int ret = 0; ++ ++ if (!nfp_me27_28_br_ops[br_op]) ++ { ++ dinfo->fprintf_func (dinfo->stream, _("[")); ++ ret = _NFP_ERR_CONT; ++ } ++ else ++ dinfo->fprintf_func (dinfo->stream, "%s[", nfp_me27_28_br_ops[br_op]); ++ ++ switch (br_op) ++ { ++ case 16: /* br=ctx */ ++ case 17: /* br!=ctx */ ++ case 18: /* br_signal */ ++ case 19: /* br_!signal */ ++ dinfo->fprintf_func (dinfo->stream, "%d, ", ctx_sig_state); ++ break; ++ case 20: /* "br_inp_state" */ ++ case 21: /* "br_!inp_state" */ ++ dinfo->fprintf_func (dinfo->stream, "%s, ", ++ br_inpstates[ctx_sig_state]); ++ break; ++ case 22: /* "br_cls_state" */ ++ case 23: /* "br_!cls_state" */ ++ dinfo->fprintf_func (dinfo->stream, "cls_ring%d_status, ", ++ ctx_sig_state); ++ break; ++ default: ++ break; ++ } ++ ++ dinfo->fprintf_func (dinfo->stream, ".%d]", br_addr); ++ ++ if (defer) ++ dinfo->fprintf_func (dinfo->stream, ", defer[%d]", defer); ++ ++ return ret; ++} ++ ++static int ++nfp_me27_28_print_br_byte (uint64_t instr, ++ unsigned int src_lmext, int num_ctx, ++ struct disassemble_info *dinfo) ++{ ++ unsigned int srcA = _BF (instr, 7, 0); ++ unsigned int by = _BF (instr, 9, 8); ++ unsigned int srcB = _BF (instr, 17, 10); ++ unsigned int imm_msb = _BTST (instr, 18); ++ unsigned int eq = _BTST (instr, 19); ++ unsigned int defer = _BF (instr, 21, 20); ++ unsigned int br_addr = _BFS (instr, 40, 40, 13) | _BF (instr, 34, 22); ++ bfd_boolean err = FALSE; ++ ++ if (eq) ++ dinfo->fprintf_func (dinfo->stream, "br=byte["); ++ else ++ dinfo->fprintf_func (dinfo->stream, "br!=byte["); ++ ++ if (nfp_me_is_imm_opnd8 (srcA)) ++ err = err || !nfp_me_print_opnd8 (srcB, 'B', num_ctx, ++ src_lmext, imm_msb, dinfo); ++ else ++ err = err || !nfp_me_print_opnd8 (srcA, 'A', num_ctx, ++ src_lmext, imm_msb, dinfo); ++ ++ dinfo->fprintf_func (dinfo->stream, ", %d, ", by); ++ ++ if (nfp_me_is_imm_opnd8 (srcA)) ++ err = err || !nfp_me_print_opnd8 (srcA, 'A', num_ctx, ++ src_lmext, imm_msb, dinfo); ++ else ++ err = err || !nfp_me_print_opnd8 (srcB, 'B', num_ctx, ++ src_lmext, imm_msb, dinfo); ++ ++ dinfo->fprintf_func (dinfo->stream, ", .%d]", br_addr); ++ ++ if (defer) ++ dinfo->fprintf_func (dinfo->stream, ", defer[%d]", defer); ++ ++ if (err) ++ return _NFP_ERR_CONT; ++ return 0; ++} ++ ++static int ++nfp_me27_28_print_br_bit (uint64_t instr, unsigned int src_lmext, ++ int num_ctx, struct disassemble_info *dinfo) ++{ ++ unsigned int srcA = _BF (instr, 7, 0); ++ unsigned int srcB = _BF (instr, 17, 10); ++ unsigned int b = _BTST (instr, 18); ++ unsigned int defer = _BF (instr, 21, 20); ++ unsigned int br_addr = _BFS (instr, 40, 40, 13) | _BF (instr, 34, 22); ++ bfd_boolean err = FALSE; ++ ++ if (b) ++ dinfo->fprintf_func (dinfo->stream, "br_bset["); ++ else ++ dinfo->fprintf_func (dinfo->stream, "br_bclr["); ++ ++ if (nfp_me_is_imm_opnd8 (srcA)) ++ { ++ err = err ++ || !nfp_me_print_opnd8 (srcB, 'B', num_ctx, src_lmext, 0, dinfo); ++ b = (nfp_me_imm_opnd8 (srcA, 0) - 1) & 0x1f; ++ } ++ else ++ { ++ err = err ++ || !nfp_me_print_opnd8 (srcA, 'A', num_ctx, src_lmext, 0, dinfo); ++ b = (nfp_me_imm_opnd8 (srcB, 0) - 1) & 0x1f; ++ } ++ ++ dinfo->fprintf_func (dinfo->stream, ", %d, .%d]", b, br_addr); ++ ++ if (defer) ++ dinfo->fprintf_func (dinfo->stream, ", defer[%d]", defer); ++ ++ if (err) ++ return _NFP_ERR_CONT; ++ return 0; ++} ++ ++static int ++nfp_me27_28_print_br_alu (uint64_t instr, unsigned int src_lmext, ++ int num_ctx, struct disassemble_info *dinfo) ++{ ++ unsigned int srcA = _BF (instr, 9, 0); ++ unsigned int srcB = _BF (instr, 19, 10); ++ unsigned int defer = _BF (instr, 21, 20); ++ unsigned int imm = _BF (instr, 30, 22); ++ bfd_boolean err = FALSE; ++ ++ if (nfp_me_is_imm_opnd10 (srcA)) ++ imm = (imm << 8) | nfp_me_imm_opnd10 (srcA); ++ else ++ imm = (imm << 8) | nfp_me_imm_opnd10 (srcB); ++ ++ if (!imm) ++ dinfo->fprintf_func (dinfo->stream, "rtn["); ++ else ++ dinfo->fprintf_func (dinfo->stream, "jump["); ++ ++ if (nfp_me_is_imm_opnd10 (srcA)) ++ err = err || !nfp_me_print_opnd10 (srcB, 'B', num_ctx, src_lmext, dinfo); ++ else ++ err = err || !nfp_me_print_opnd10 (srcA, 'A', num_ctx, src_lmext, dinfo); ++ ++ if (imm) ++ dinfo->fprintf_func (dinfo->stream, ", .%d", imm); ++ ++ dinfo->fprintf_func (dinfo->stream, "]"); ++ ++ if (defer) ++ dinfo->fprintf_func (dinfo->stream, ", defer[%d]", defer); ++ ++ if (err) ++ return _NFP_ERR_CONT; ++ return 0; ++} ++ ++static int ++nfp_me27_28_print_mult (uint64_t instr, unsigned int pred_cc, ++ unsigned int dst_lmext, unsigned int src_lmext, ++ unsigned int gpr_wrboth, ++ int num_ctx, struct disassemble_info *dinfo) ++{ ++ unsigned int srcA = _BF (instr, 9, 0); ++ unsigned int srcB = _BF (instr, 19, 10); ++ unsigned int mstep = _BF (instr, 22, 20); ++ char dst_bank = 'A' + _BTST (instr, 23); ++ unsigned int swap = _BTST (instr, 30); ++ unsigned int mtype = _BF (instr, 32, 31); ++ unsigned int nocc = _BTST (instr, 40); ++ bfd_boolean err = FALSE; ++ ++ if (swap) ++ { ++ unsigned int tmp = srcA; ++ srcA = srcB; ++ srcB = tmp; ++ } ++ ++ dinfo->fprintf_func (dinfo->stream, "mul_step["); ++ ++ if (mstep >= 4) ++ err = err ++ || !nfp_me_print_opnd10 (srcA, dst_bank, num_ctx, dst_lmext, dinfo); ++ else ++ err = err || !nfp_me_print_opnd10 (srcA, (swap) ? 'B' : 'A', num_ctx, ++ src_lmext, dinfo); ++ ++ dinfo->fprintf_func (dinfo->stream, ", "); ++ ++ if (mstep >= 4) ++ dinfo->fprintf_func (dinfo->stream, "--"); ++ else ++ err = err || !nfp_me_print_opnd10 (srcB, (swap) ? 'A' : 'B', num_ctx, ++ src_lmext, dinfo); ++ ++ dinfo->fprintf_func (dinfo->stream, "], %s", nfp_me27_28_mult_types[mtype]); ++ if (mtype > 0) ++ { ++ const char *s = nfp_me27_28_mult_steps[mstep]; ++ if (!s) ++ { ++ s = ""; ++ err = TRUE; ++ } ++ dinfo->fprintf_func (dinfo->stream, "_%s", s); ++ } ++ ++ if (nocc) ++ dinfo->fprintf_func (dinfo->stream, ", no_cc"); ++ if (gpr_wrboth) ++ dinfo->fprintf_func (dinfo->stream, ", gpr_wrboth"); ++ if (pred_cc) ++ dinfo->fprintf_func (dinfo->stream, ", predicate_cc"); ++ ++ if (err) ++ return _NFP_ERR_CONT; ++ return 0; ++} ++ ++static int ++_nfp_cmp_mnmnc (const void *arg_a, const void *arg_b) ++{ ++ const nfp_cmd_mnemonic *a = arg_a; ++ const nfp_cmd_mnemonic *b = arg_b; ++ ++ if (a->cpp_target != b->cpp_target) ++ return (a->cpp_target > b->cpp_target) - (a->cpp_target < b->cpp_target); ++ ++ if (a->cpp_action != b->cpp_action) ++ return (a->cpp_action > b->cpp_action) - (a->cpp_action < b->cpp_action); ++ ++ return (a->cpp_token > b->cpp_token) - (a->cpp_token < b->cpp_token); ++} ++ ++static const char * ++nfp_me_find_mnemonic (unsigned int cpp_tgt, unsigned int cpp_act, ++ unsigned int cpp_tok, unsigned int cpp_len, ++ const nfp_cmd_mnemonic * mnemonics, ++ size_t mnemonics_cnt) ++{ ++ nfp_cmd_mnemonic search_key = { cpp_tgt, cpp_act, cpp_tok, 0, 0, NULL }; ++ const nfp_cmd_mnemonic *cmd = NULL; ++ ++ cmd = bsearch (&search_key, mnemonics, mnemonics_cnt, ++ sizeof (nfp_cmd_mnemonic), _nfp_cmp_mnmnc); ++ ++ if (!cmd) ++ return NULL; ++ ++ /* Make sure we backtrack to the first entry that still matches the three ++ bsearched fields - then we simply iterate and compare cpp_len. */ ++ while ((cmd > mnemonics) && (_nfp_cmp_mnmnc (&cmd[-1], &search_key) == 0)) ++ --cmd; ++ ++ /* Now compare by cpp_len and make sure we stay in range. */ ++ for (; (cmd < (mnemonics + mnemonics_cnt)) ++ && (_nfp_cmp_mnmnc (cmd, &search_key) == 0); ++cmd) ++ { ++ if ((cpp_len & cmd->len_mask) == cmd->len_fixed) ++ return cmd->mnemonic; ++ } ++ ++ return NULL; ++} ++ ++/* NFP-32xx (ME Version 2.7). */ ++ ++static int ++nfp_me27_print_cmd (uint64_t instr, int third_party_32bit, ++ int num_ctx, struct disassemble_info *dinfo) ++{ ++ unsigned int srcA = _BF (instr, 7, 0); ++ unsigned int ctxswap_defer = _BF (instr, 9, 8); ++ unsigned int srcB = _BF (instr, 17, 10); ++ unsigned int token = _BF (instr, 19, 18); ++ unsigned int xfer = _BFS (instr, 40, 40, 5) | _BF (instr, 24, 20); ++ unsigned int cpp_len = _BF (instr, 27, 25); ++ unsigned int sig = _BF (instr, 31, 28); ++ unsigned int tgtcmd = _BF (instr, 38, 32); ++ unsigned int indref = _BTST (instr, 41); ++ unsigned int mode = _BF (instr, 44, 42); ++ ++ bfd_boolean err = FALSE; ++ int cpp_target = -1; ++ int cpp_action = -1; ++ const char *mnemonic = NULL; ++ unsigned int imm; ++ unsigned int valBA; ++ int visswap = ((mode == 1) || (mode == 3)); ++ ++ imm = (sig << 10) | (cpp_len << 7) | ((xfer & 0x1f) << 2) | token; ++ valBA = (srcB << 8) | srcA; ++ ++ if (mode == 6) ++ { ++ token = 0; ++ sig = 0; ++ xfer = 0; ++ } ++ ++ /* Convert tgtcmd to action/token tuple. */ ++ if (_BF (tgtcmd, 6, 5) == 0x0) ++ { ++ switch (_BF (tgtcmd, 4, 2)) ++ { ++ case 0: ++ cpp_target = NFP_3200_CPPTGT_CAP; ++ dinfo->fprintf_func (dinfo->stream, "cap["); ++ break; ++ case 1: ++ cpp_target = NFP_3200_CPPTGT_MSF0; ++ dinfo->fprintf_func (dinfo->stream, "msf0["); ++ break; ++ case 2: ++ cpp_target = NFP_3200_CPPTGT_MSF1; ++ dinfo->fprintf_func (dinfo->stream, "msf1["); ++ break; ++ case 3: ++ cpp_target = NFP_3200_CPPTGT_PCIE; ++ dinfo->fprintf_func (dinfo->stream, "pcie["); ++ break; ++ case 4: ++ cpp_target = NFP_3200_CPPTGT_HASH; ++ break; ++ case 5: ++ cpp_target = NFP_3200_CPPTGT_CRYPTO; ++ dinfo->fprintf_func (dinfo->stream, "crypto["); ++ break; ++ case 6: ++ cpp_target = NFP_3200_CPPTGT_ARM; ++ dinfo->fprintf_func (dinfo->stream, "arm["); ++ break; ++ case 7: ++ cpp_target = NFP_3200_CPPTGT_CT; ++ dinfo->fprintf_func (dinfo->stream, "ct["); ++ break; ++ } ++ cpp_action = _BF (tgtcmd, 1, 0); ++ } ++ else ++ { ++ switch (_BF (tgtcmd, 6, 4)) ++ { ++ case 2: ++ cpp_target = NFP_3200_CPPTGT_GS; ++ dinfo->fprintf_func (dinfo->stream, "scratch["); ++ break; ++ case 3: ++ cpp_target = NFP_3200_CPPTGT_QDR; /* A.k.a. SRAM. */ ++ dinfo->fprintf_func (dinfo->stream, "sram["); ++ break; ++ case 4: ++ case 5: ++ cpp_target = NFP_3200_CPPTGT_MU; ++ dinfo->fprintf_func (dinfo->stream, "mem["); ++ break; ++ case 6: ++ case 7: ++ cpp_target = NFP_3200_CPPTGT_CLS; ++ dinfo->fprintf_func (dinfo->stream, "cls["); ++ break; ++ } ++ cpp_action = _BF (tgtcmd, 3, 0); ++ } ++ ++ if (cpp_target < 0) ++ { ++ dinfo->fprintf_func (dinfo->stream, _("[]"), ++ cpp_target, cpp_action, token); ++ return _NFP_ERR_CONT; ++ } ++ ++ mnemonic = nfp_me_find_mnemonic (cpp_target, cpp_action, token, cpp_len, ++ nfp_me27_mnemonics, ++ ARRAY_SIZE (nfp_me27_mnemonics)); ++ ++ if (!mnemonic) ++ { ++ dinfo->fprintf_func (dinfo->stream, _("[]"), ++ cpp_target, cpp_action, token); ++ return _NFP_ERR_CONT; ++ } ++ ++ if (cpp_target == NFP_3200_CPPTGT_HASH) ++ { ++ dinfo->fprintf_func (dinfo->stream, "%s[$xfer_%d, %d", ++ mnemonic, xfer, cpp_len); ++ goto print_opt_toks; ++ } ++ ++ dinfo->fprintf_func (dinfo->stream, "%s, ", mnemonic); ++ ++ if (visswap) ++ { ++ unsigned int tmp = srcA; ++ srcA = srcB; ++ srcB = tmp; ++ } ++ ++ switch (mode) ++ { ++ case 0: /* (A << 8) + B. */ ++ case 1: /* (B << 8) + A. */ ++ dinfo->fprintf_func (dinfo->stream, "$xfer_%d, ", xfer); ++ err = err ++ || !nfp_me_print_opnd8 (srcA, 'A' + visswap, num_ctx, 0, 0, dinfo); ++ dinfo->fprintf_func (dinfo->stream, ", <<8, "); ++ err = err ++ || !nfp_me_print_opnd8 (srcB, 'B' - visswap, num_ctx, 0, 0, dinfo); ++ dinfo->fprintf_func (dinfo->stream, ", %d", (cpp_len + 1)); ++ break; ++ case 2: /* Accelerated 3rd party (A[ << 8]) + B. */ ++ case 3: /* Accelerated 3rd party (B[ << 8]) + A. */ ++ dinfo->fprintf_func (dinfo->stream, "0x%x, ", (indref << 6) | xfer); ++ err = err ++ || !nfp_me_print_opnd8 (srcA, 'A' + visswap, num_ctx, 0, 0, dinfo); ++ if (third_party_32bit) ++ dinfo->fprintf_func (dinfo->stream, ", "); ++ else ++ dinfo->fprintf_func (dinfo->stream, ", <<8, "); ++ err = err ++ || !nfp_me_print_opnd8 (srcB, 'B' - visswap, num_ctx, 0, 0, dinfo); ++ dinfo->fprintf_func (dinfo->stream, ", %d", (cpp_len + 1)); ++ break; ++ case 4: /* A + B. */ ++ dinfo->fprintf_func (dinfo->stream, "$xfer_%d, ", xfer); ++ err = err || !nfp_me_print_opnd8 (srcA, 'A', num_ctx, 0, 0, dinfo); ++ dinfo->fprintf_func (dinfo->stream, ", "); ++ err = err || !nfp_me_print_opnd8 (srcB, 'B', num_ctx, 0, 0, dinfo); ++ dinfo->fprintf_func (dinfo->stream, ", %d", (cpp_len + 1)); ++ break; ++ case 5: /* Immediate address. */ ++ dinfo->fprintf_func (dinfo->stream, "$xfer_%d, 0x%x, %d", xfer, valBA, ++ (cpp_len + 1)); ++ break; ++ case 6: /* Immediate address and data. */ ++ dinfo->fprintf_func (dinfo->stream, "0x%x, 0x%x", valBA, imm); ++ break; ++ case 7: /* Immediate data. */ ++ dinfo->fprintf_func (dinfo->stream, "0x%x, --, %d", ++ ((xfer << 16) | valBA), (cpp_len + 1)); ++ break; ++ } ++ ++ print_opt_toks: ++ dinfo->fprintf_func (dinfo->stream, "]"); ++ ++ if (indref && (mode != 2) && (mode != 3)) ++ dinfo->fprintf_func (dinfo->stream, ", indirect_ref"); ++ ++ if (ctxswap_defer != 3) ++ { ++ dinfo->fprintf_func (dinfo->stream, ", ctx_swap["); ++ if (sig) ++ dinfo->fprintf_func (dinfo->stream, "sig%d]", sig); ++ else ++ dinfo->fprintf_func (dinfo->stream, "--]"); ++ ++ if (ctxswap_defer != 0) ++ dinfo->fprintf_func (dinfo->stream, ", defer[%d]", ctxswap_defer); ++ } ++ else if (sig) ++ dinfo->fprintf_func (dinfo->stream, ", sig_done[sig%d]", sig); ++ ++ if (err) ++ return _NFP_ERR_CONT; ++ return 0; ++} ++ ++static int ++nfp_me27_print_alu_shf (uint64_t instr, int num_ctx, ++ struct disassemble_info *dinfo) ++{ ++ return nfp_me27_28_print_alu_shf (instr, 0, 0, 0, 0, num_ctx, dinfo); ++} ++ ++static int ++nfp_me27_print_alu (uint64_t instr, int num_ctx, ++ struct disassemble_info *dinfo) ++{ ++ return nfp_me27_28_print_alu_shf (instr, 0, 0, 0, 0, num_ctx, dinfo); ++} ++ ++static int ++nfp_me27_print_immed (uint64_t instr, int num_ctx, ++ struct disassemble_info *dinfo) ++{ ++ return nfp_me27_28_print_immed (instr, 0, 0, 0, num_ctx, dinfo); ++} ++ ++static int ++nfp_me27_print_ld_field (uint64_t instr, int num_ctx, ++ struct disassemble_info *dinfo) ++{ ++ return nfp_me27_28_print_ld_field (instr, 0, 0, 0, 0, num_ctx, dinfo); ++} ++ ++static int ++nfp_me27_print_ctx_arb (uint64_t instr, struct disassemble_info *dinfo) ++{ ++ return nfp_me27_28_print_ctx_arb (instr, dinfo); ++} ++ ++static int ++nfp_me27_print_local_csr (uint64_t instr, int num_ctx, ++ struct disassemble_info *dinfo) ++{ ++ return nfp_me27_28_print_local_csr (instr, 0, num_ctx, dinfo); ++} ++ ++static int ++nfp_me27_print_branch (uint64_t instr, struct disassemble_info *dinfo) ++{ ++ return nfp_me27_28_print_branch (instr, nfp_me27_br_inpstates, dinfo); ++} ++ ++static int ++nfp_me27_print_br_byte (uint64_t instr, int num_ctx, ++ struct disassemble_info *dinfo) ++{ ++ return nfp_me27_28_print_br_byte (instr, 0, num_ctx, dinfo); ++} ++ ++static int ++nfp_me27_print_br_bit (uint64_t instr, int num_ctx, ++ struct disassemble_info *dinfo) ++{ ++ return nfp_me27_28_print_br_bit (instr, 0, num_ctx, dinfo); ++} ++ ++static int ++nfp_me27_print_br_alu (uint64_t instr, int num_ctx, ++ struct disassemble_info *dinfo) ++{ ++ return nfp_me27_28_print_br_alu (instr, 0, num_ctx, dinfo); ++} ++ ++static int ++nfp_me27_print_mult (uint64_t instr, int num_ctx, ++ struct disassemble_info *dinfo) ++{ ++ return nfp_me27_28_print_mult (instr, 0, 0, 0, 0, num_ctx, dinfo); ++} ++ ++/*NFP-6xxx/4xxx (ME Version 2.8). */ ++ ++static int ++nfp_me28_print_cmd (uint64_t instr, int third_party_32bit, ++ int num_ctx, struct disassemble_info *dinfo) ++{ ++ unsigned int srcA = _BF (instr, 7, 0); ++ unsigned int ctxswap_defer = _BF (instr, 9, 8); ++ unsigned int srcB = _BF (instr, 17, 10); ++ unsigned int token = _BF (instr, 19, 18); ++ unsigned int xfer = _BFS (instr, 40, 40, 5) | _BF (instr, 24, 20); ++ unsigned int cpp_len = _BF (instr, 27, 25); ++ unsigned int sig = _BF (instr, 31, 28); ++ unsigned int tgtcmd = _BF (instr, 38, 32); ++ unsigned int indref = _BTST (instr, 41); ++ unsigned int mode = _BF (instr, 44, 42); ++ ++ bfd_boolean err = FALSE; ++ int cpp_target = -1; ++ int cpp_action = -1; ++ const char *mnemonic = NULL; ++ unsigned int imm; ++ unsigned int valBA; ++ int visswap = ((mode == 1) || (mode == 3)); ++ ++ imm = (sig << 10) | (cpp_len << 7) | ((xfer & 0x1f) << 2) | token; ++ valBA = (srcB << 8) | srcA; ++ ++ if (mode == 6) ++ { ++ token = 0; ++ sig = 0; ++ xfer = 0; ++ } ++ ++ /* Convert tgtcmd to action/token tuple. */ ++ if (_BF (tgtcmd, 6, 5) == 0x0) ++ { ++ switch (_BF (tgtcmd, 4, 2)) ++ { ++ case 0: ++ cpp_target = NFP_6000_CPPTGT_ILA; ++ dinfo->fprintf_func (dinfo->stream, "ila["); ++ break; ++ case 1: ++ cpp_target = NFP_6000_CPPTGT_NBI; ++ dinfo->fprintf_func (dinfo->stream, "nbi["); ++ break; ++ case 3: ++ cpp_target = NFP_6000_CPPTGT_PCIE; ++ dinfo->fprintf_func (dinfo->stream, "pcie["); ++ break; ++ case 5: ++ cpp_target = NFP_6000_CPPTGT_CRYPTO; ++ dinfo->fprintf_func (dinfo->stream, "crypto["); ++ break; ++ case 6: ++ cpp_target = NFP_6000_CPPTGT_ARM; ++ dinfo->fprintf_func (dinfo->stream, "arm["); ++ break; ++ case 7: ++ cpp_target = NFP_6000_CPPTGT_CTXPB; ++ dinfo->fprintf_func (dinfo->stream, "ct["); ++ break; ++ } ++ cpp_action = _BF (tgtcmd, 1, 0); ++ } ++ else ++ { ++ /* One bit overlap between "t" and "a" fields, for sram it's "t" and ++ for mem/cls it's "a". */ ++ cpp_action = _BF (tgtcmd, 4, 0); ++ switch (_BF (tgtcmd, 6, 4)) ++ { ++ case 3: ++ cpp_target = NFP_6000_CPPTGT_VQDR; ++ cpp_action = _BF (tgtcmd, 3, 0); ++ dinfo->fprintf_func (dinfo->stream, "sram["); ++ break; ++ case 4: ++ case 5: ++ cpp_target = NFP_6000_CPPTGT_MU; ++ dinfo->fprintf_func (dinfo->stream, "mem["); ++ break; ++ case 6: ++ case 7: ++ cpp_target = NFP_6000_CPPTGT_CLS; ++ dinfo->fprintf_func (dinfo->stream, "cls["); ++ break; ++ } ++ } ++ ++ if (cpp_target < 0) ++ { ++ dinfo->fprintf_func (dinfo->stream, _("[]"), ++ cpp_target, cpp_action, token); ++ return _NFP_ERR_CONT; ++ } ++ ++ mnemonic = nfp_me_find_mnemonic (cpp_target, cpp_action, token, cpp_len, ++ nfp_me28_mnemonics, ++ ARRAY_SIZE (nfp_me28_mnemonics)); ++ ++ if (!mnemonic) ++ { ++ dinfo->fprintf_func (dinfo->stream, _("[]"), ++ cpp_target, cpp_action, token); ++ return _NFP_ERR_CONT; ++ } ++ ++ dinfo->fprintf_func (dinfo->stream, "%s, ", mnemonic); ++ ++ if (visswap) ++ { ++ unsigned int tmp = srcA; ++ srcA = srcB; ++ srcB = tmp; ++ } ++ ++ switch (mode) ++ { ++ case 0: /* (A << 8) + B. */ ++ case 1: /* (B << 8) + A. */ ++ dinfo->fprintf_func (dinfo->stream, "$xfer_%d, ", xfer); ++ err = err ++ || !nfp_me_print_opnd8 (srcA, 'A' + visswap, num_ctx, 0, 0, dinfo); ++ dinfo->fprintf_func (dinfo->stream, ", <<8, "); ++ err = err ++ || !nfp_me_print_opnd8 (srcB, 'B' - visswap, num_ctx, 0, 0, dinfo); ++ dinfo->fprintf_func (dinfo->stream, ", %d", (cpp_len + 1)); ++ break; ++ case 2: /* Accelerated 3rd party (A[ << 8]) + B. */ ++ case 3: /* Accelerated 3rd party (B[ << 8]) + A. */ ++ dinfo->fprintf_func (dinfo->stream, "0x%x, ", (indref << 6) | xfer); ++ err = err ++ || !nfp_me_print_opnd8 (srcA, 'A' + visswap, num_ctx, 0, 0, dinfo); ++ if (third_party_32bit) ++ dinfo->fprintf_func (dinfo->stream, ", "); ++ else ++ dinfo->fprintf_func (dinfo->stream, ", <<8, "); ++ err = err ++ || !nfp_me_print_opnd8 (srcB, 'B' - visswap, num_ctx, 0, 0, dinfo); ++ dinfo->fprintf_func (dinfo->stream, ", %d", (cpp_len + 1)); ++ break; ++ case 4: /* A + B. */ ++ dinfo->fprintf_func (dinfo->stream, "$xfer_%d, ", xfer); ++ err = err || !nfp_me_print_opnd8 (srcA, 'A', num_ctx, 0, 0, dinfo); ++ dinfo->fprintf_func (dinfo->stream, ", "); ++ err = err || !nfp_me_print_opnd8 (srcB, 'B', num_ctx, 0, 0, dinfo); ++ dinfo->fprintf_func (dinfo->stream, ", %d", (cpp_len + 1)); ++ break; ++ case 5: /* Immediate address. */ ++ dinfo->fprintf_func (dinfo->stream, "$xfer_%d, 0x%x, %d", xfer, valBA, ++ (cpp_len + 1)); ++ break; ++ case 6: /* Immediate address and data. */ ++ dinfo->fprintf_func (dinfo->stream, "0x%x, 0x%x", valBA, imm); ++ break; ++ case 7: /* Immediate data. */ ++ dinfo->fprintf_func (dinfo->stream, "0x%x, --, %d", ++ ((xfer << 16) | valBA), (cpp_len + 1)); ++ break; ++ } ++ ++ dinfo->fprintf_func (dinfo->stream, "]"); ++ ++ if (indref && (mode != 2) && (mode != 3)) ++ dinfo->fprintf_func (dinfo->stream, ", indirect_ref"); ++ ++ if (ctxswap_defer != 3) ++ { ++ dinfo->fprintf_func (dinfo->stream, ", ctx_swap["); ++ if (sig) ++ dinfo->fprintf_func (dinfo->stream, "sig%d]", sig); ++ else ++ dinfo->fprintf_func (dinfo->stream, "--]"); ++ ++ if (ctxswap_defer != 0) ++ dinfo->fprintf_func (dinfo->stream, ", defer[%d]", ctxswap_defer); ++ } ++ else if (sig) ++ dinfo->fprintf_func (dinfo->stream, ", sig_done[sig%d]", sig); ++ ++ if (err) ++ return _NFP_ERR_CONT; ++ return 0; ++} ++ ++static int ++nfp_me28_print_alu_shf (uint64_t instr, int num_ctx, ++ struct disassemble_info *dinfo) ++{ ++ unsigned int gpr_wrboth = _BTST (instr, 41); ++ unsigned int src_lmext = _BTST (instr, 42); ++ unsigned int dst_lmext = _BTST (instr, 43); ++ unsigned int pred_cc = _BTST (instr, 44); ++ ++ return nfp_me27_28_print_alu_shf (instr, pred_cc, dst_lmext, ++ src_lmext, gpr_wrboth, num_ctx, dinfo); ++} ++ ++static int ++nfp_me28_print_alu (uint64_t instr, int num_ctx, ++ struct disassemble_info *dinfo) ++{ ++ unsigned int gpr_wrboth = _BTST (instr, 41); ++ unsigned int src_lmext = _BTST (instr, 42); ++ unsigned int dst_lmext = _BTST (instr, 43); ++ unsigned int pred_cc = _BTST (instr, 44); ++ ++ return nfp_me27_28_print_alu (instr, pred_cc, dst_lmext, src_lmext, ++ gpr_wrboth, num_ctx, dinfo); ++} ++ ++static int ++nfp_me28_print_immed (uint64_t instr, int num_ctx, ++ struct disassemble_info *dinfo) ++{ ++ unsigned int gpr_wrboth = _BTST (instr, 41); ++ unsigned int dst_lmext = _BTST (instr, 43); ++ unsigned int pred_cc = _BTST (instr, 44); ++ ++ return nfp_me27_28_print_immed (instr, pred_cc, dst_lmext, gpr_wrboth, ++ num_ctx, dinfo); ++} ++ ++static int ++nfp_me28_print_ld_field (uint64_t instr, int num_ctx, ++ struct disassemble_info *dinfo) ++{ ++ unsigned int gpr_wrboth = _BTST (instr, 41); ++ unsigned int src_lmext = _BTST (instr, 42); ++ unsigned int dst_lmext = _BTST (instr, 43); ++ unsigned int pred_cc = _BTST (instr, 44); ++ ++ return nfp_me27_28_print_ld_field (instr, pred_cc, dst_lmext, ++ src_lmext, gpr_wrboth, num_ctx, dinfo); ++} ++ ++static int ++nfp_me28_print_ctx_arb (uint64_t instr, struct disassemble_info *dinfo) ++{ ++ return nfp_me27_28_print_ctx_arb (instr, dinfo); ++} ++ ++static int ++nfp_me28_print_local_csr (uint64_t instr, int num_ctx, ++ struct disassemble_info *dinfo) ++{ ++ unsigned int src_lmext = _BTST (instr, 42); ++ ++ return nfp_me27_28_print_local_csr (instr, src_lmext, num_ctx, dinfo); ++} ++ ++static int ++nfp_me28_print_branch (uint64_t instr, struct disassemble_info *dinfo) ++{ ++ return nfp_me27_28_print_branch (instr, nfp_me28_br_inpstates, dinfo); ++} ++ ++static int ++nfp_me28_print_br_byte (uint64_t instr, int num_ctx, ++ struct disassemble_info *dinfo) ++{ ++ unsigned int src_lmext = _BTST (instr, 42); ++ return nfp_me27_28_print_br_byte (instr, src_lmext, num_ctx, dinfo); ++} ++ ++static int ++nfp_me28_print_br_bit (uint64_t instr, int num_ctx, ++ struct disassemble_info *dinfo) ++{ ++ unsigned int src_lmext = _BTST (instr, 42); ++ return nfp_me27_28_print_br_bit (instr, src_lmext, num_ctx, dinfo); ++} ++ ++static int ++nfp_me28_print_br_alu (uint64_t instr, int num_ctx, ++ struct disassemble_info *dinfo) ++{ ++ unsigned int src_lmext = _BTST (instr, 42); ++ return nfp_me27_28_print_br_alu (instr, src_lmext, num_ctx, dinfo); ++} ++ ++static int ++nfp_me28_print_mult (uint64_t instr, int num_ctx, ++ struct disassemble_info *dinfo) ++{ ++ unsigned int gpr_wrboth = _BTST (instr, 41); ++ unsigned int src_lmext = _BTST (instr, 42); ++ unsigned int dst_lmext = _BTST (instr, 43); ++ unsigned int pred_cc = _BTST (instr, 44); ++ ++ return nfp_me27_28_print_mult (instr, pred_cc, dst_lmext, src_lmext, ++ gpr_wrboth, num_ctx, dinfo); ++} ++ ++static bfd_boolean ++init_nfp3200_priv (nfp_priv_data * priv, struct disassemble_info *dinfo) ++{ ++ Elf_Internal_Shdr *sec = NULL; ++ Elf_Nfp_MeConfig mecfg_ent; ++ unsigned char buffer[sizeof (Elf_Nfp_MeConfig)]; ++ file_ptr roff = 0; ++ unsigned int sec_cnt = 0; ++ unsigned int sec_idx; ++ size_t menum_linear = 0; ++ ++ if (!dinfo->section) ++ /* No section info, will use default values. */ ++ return TRUE; ++ ++ sec_cnt = elf_numsections (dinfo->section->owner); ++ ++ /* Find the MECONFIG section. It's index is also in e_flags, but it has ++ a unique SHT and we'll use that. */ ++ for (sec_idx = 0; sec_idx < sec_cnt; sec_idx++) ++ { ++ sec = elf_elfsections (dinfo->section->owner)[sec_idx]; ++ ++ if (sec->sh_type == SHT_NFP_MECONFIG) ++ break; ++ } ++ ++ if (sec_idx == sec_cnt) ++ { ++ dinfo->fprintf_func (dinfo->stream, _("File has no ME-Config section.")); ++ return FALSE; ++ } ++ ++ for (roff = 0; (bfd_size_type) roff < sec->sh_size; ++ roff += sec->sh_entsize, menum_linear++) ++ { ++ nfp_priv_mecfg *mecfg; ++ int isl = menum_linear >> 3; ++ int menum = menum_linear & 7; ++ ++ if (menum_linear >= 40) ++ { ++ dinfo->fprintf_func (dinfo->stream, ++ _("File has invalid ME-Config section.")); ++ return FALSE; ++ } ++ ++ mecfg = &priv->mecfgs[isl][menum][1]; ++ ++ if (!bfd_get_section_contents (dinfo->section->owner, sec->bfd_section, ++ buffer, roff, sizeof (buffer))) ++ return FALSE; ++ ++ mecfg_ent.ctx_enables = bfd_getl32 (buffer + offsetof (Elf_Nfp_MeConfig, ++ ctx_enables)); ++ mecfg_ent.misc_control = bfd_getl32 (buffer ++ + offsetof (Elf_Nfp_MeConfig, misc_control)); ++ ++ mecfg->ctx4_mode = _BTST (mecfg_ent.ctx_enables, 31); ++ mecfg->addr_3rdparty32 = _BTST (mecfg_ent.misc_control, 4); ++ mecfg->scs_cnt = _BTST (mecfg_ent.misc_control, 2); ++ } ++ ++ return TRUE; ++} ++ ++static bfd_boolean ++init_nfp6000_mecsr_sec (nfp_priv_data * priv, Elf_Internal_Shdr * sec, ++ int is_for_text, struct disassemble_info *dinfo) ++{ ++ Elf_Nfp_InitRegEntry ireg; ++ unsigned char buffer[sizeof (Elf_Nfp_InitRegEntry)]; ++ file_ptr ireg_off = 0; ++ size_t isl, menum; ++ ++ if (sec->sh_entsize != sizeof (ireg)) ++ return FALSE; ++ ++ isl = SHI_NFP_IREG_ISLAND (sec->sh_info); ++ ++ /* For these sections we know that the address will only be 32 bits ++ so we only need cpp_offset_lo. ++ Address is encoded as follows: ++ <31:30> 0 ++ <29:24> island (already got this from sh_info) ++ <23:17> 0 ++ <16:16> XferCsrRegSel (1 for these sections) ++ <15:14> 0 ++ <13:10> DataMasterID (MEnum = this - 4) ++ <9:2> register (index) ++ <1:0> 0b0 (register byte address if appened to the previous field). */ ++ for (ireg_off = 0; (bfd_size_type) ireg_off < sec->sh_size; ++ ireg_off += sec->sh_entsize) ++ { ++ uint32_t csr_off; ++ nfp_priv_mecfg *mecfg; ++ ++ if (!bfd_get_section_contents (dinfo->section->owner, sec->bfd_section, ++ buffer, ireg_off, sizeof (buffer))) ++ return FALSE; ++ ++ ireg.cpp_offset_lo = bfd_getl32 (buffer ++ + offsetof (Elf_Nfp_InitRegEntry, cpp_offset_lo)); ++ ireg.mask = bfd_getl32 (buffer + offsetof (Elf_Nfp_InitRegEntry, mask)); ++ ireg.val = bfd_getl32 (buffer + offsetof (Elf_Nfp_InitRegEntry, val)); ++ ireg.w0 = bfd_getl32 (buffer + offsetof (Elf_Nfp_InitRegEntry, w0)); ++ ++ if (NFP_IREG_ENTRY_WO_NLW (ireg.w0)) ++ continue; ++ ++ /* Only consider entries that are permanent for runtime. */ ++ if ((NFP_IREG_ENTRY_WO_VTP (ireg.w0) != NFP_IREG_VTP_CONST) ++ && (NFP_IREG_ENTRY_WO_VTP (ireg.w0) != NFP_IREG_VTP_FORCE)) ++ continue; ++ ++ menum = _BF (ireg.cpp_offset_lo, 13, 10) - 4; ++ csr_off = _BF (ireg.cpp_offset_lo, 9, 0); ++ ++ mecfg = &priv->mecfgs[isl][menum][is_for_text]; ++ switch (csr_off) ++ { ++ case _NFP_ME27_28_CSR_CTX_ENABLES: ++ mecfg->ctx4_mode = _BTST (ireg.val, 31); ++ break; ++ case _NFP_ME27_28_CSR_MISC_CONTROL: ++ mecfg->addr_3rdparty32 = _BTST (ireg.val, 4); ++ mecfg->scs_cnt = _BTST (ireg.val, 2); ++ break; ++ default: ++ break; ++ } ++ } ++ ++ return TRUE; ++} ++ ++static bfd_boolean ++init_nfp6000_priv (nfp_priv_data * priv, struct disassemble_info *dinfo) ++{ ++ int mecfg_orders[64][2]; ++ size_t isl; ++ unsigned int sec_cnt = 0; ++ unsigned int sec_idx; ++ int is_for_text; ++ ++ memset (mecfg_orders, -1, sizeof (mecfg_orders)); ++ ++ if (!dinfo->section) ++ /* No section info, will use default values. */ ++ return TRUE; ++ ++ sec_cnt = elf_numsections (dinfo->section->owner); ++ ++ /* Go through all MECSR init sections to find ME configs. */ ++ for (sec_idx = 0; sec_idx < sec_cnt; sec_idx++) ++ { ++ Elf_Internal_Shdr *sec; ++ int sec_order; ++ ++ sec = elf_elfsections (dinfo->section->owner)[sec_idx]; ++ sec_order = (int) SHI_NFP_IREG_ORDER (sec->sh_info); ++ ++ is_for_text = (sec->sh_flags & (SHF_NFP_INIT | SHF_NFP_INIT2)) == 0; ++ ++ /* If we have an init2 section, that is the one that applies to the ++ ME when executing init code. So we make it's order higher than ++ any plain init section. */ ++ if (sec->sh_flags & SHF_NFP_INIT2) ++ sec_order += SHI_NFP_IREG_ORDER (~0U) + 1; ++ ++ if (sec->sh_type != SHT_NFP_INITREG) ++ continue; ++ if (!SHI_NFP_6000_IS_IREG_MECSR (sec->sh_info)) ++ continue; ++ ++ isl = SHI_NFP_IREG_ISLAND (sec->sh_info); ++ if ((sec_order < mecfg_orders[isl][is_for_text])) ++ /* Lower order or transient, skip it. */ ++ continue; ++ ++ mecfg_orders[isl][is_for_text] = sec_order; ++ ++ if (!init_nfp6000_mecsr_sec (priv, sec, is_for_text, dinfo)) ++ { ++ dinfo->fprintf_func (dinfo->stream, ++ _("Error processing section %u "), sec_idx); ++ return FALSE; ++ } ++ } ++ ++ return TRUE; ++} ++ ++static int ++parse_disassembler_options (nfp_opts * opts, struct disassemble_info *dinfo) ++{ ++ const char *option; ++ ++ if (dinfo->disassembler_options == NULL) ++ return 0; ++ ++ FOR_EACH_DISASSEMBLER_OPTION (option, dinfo->disassembler_options) ++ { ++ if (disassembler_options_cmp (option, "no-pc") == 0) ++ opts->show_pc = 0; ++ else if (disassembler_options_cmp (option, "ctx4") == 0) ++ { ++ if (!opts->ctx_mode) ++ opts->ctx_mode = 4; ++ } ++ else if (disassembler_options_cmp (option, "ctx8") == 0) ++ opts->ctx_mode = 8; ++ else ++ { ++ dinfo->fprintf_func (dinfo->stream, _("Invalid NFP option: %s"), option); ++ return _NFP_ERR_STOP; ++ } ++ } ++ ++ return 0; ++} ++ ++/* Called on first disassembly attempt so that dinfo->section is valid ++ so that we can get the bfd owner to find ME configs. */ ++ ++static nfp_priv_data * ++init_nfp_priv (struct disassemble_info *dinfo) ++{ ++ nfp_priv_data *priv; ++ int ret = FALSE; ++ ++ if (dinfo->private_data) ++ return (nfp_priv_data *) dinfo->private_data; ++ ++#if 0 /* Right now only section-related info is kept in priv. ++ So don't even calloc it if we don't need it. */ ++ if (!dinfo->section) ++ return NULL; ++#endif ++ ++ /* Alloc with no free, seems to be either this or a static global variable ++ and this at least keeps a large struct unallocated until really needed. */ ++ priv = calloc (1, sizeof (*priv)); ++ if (!priv) ++ return NULL; ++ ++ switch (dinfo->mach) ++ { ++ case E_NFP_MACH_3200: ++ ret = init_nfp3200_priv (priv, dinfo); ++ break; ++ case E_NFP_MACH_6000: ++ ret = init_nfp6000_priv (priv, dinfo); ++ break; ++ } ++ ++ if (!ret) ++ { ++ free (priv); ++ return NULL; ++ } ++ ++ dinfo->private_data = priv; ++ return priv; ++} ++ ++static int ++_print_instrs (bfd_vma addr, struct disassemble_info *dinfo, nfp_opts * opts) ++{ ++ nfp_priv_data *priv = init_nfp_priv (dinfo); ++ bfd_byte buffer[8]; ++ int err; ++ uint64_t instr = 0; ++ size_t island, menum; ++ int num_ctx, scs_cnt, addr_3rdparty32, pc, tmpi, tmpj; ++ int is_text = 1; ++ ++ err = dinfo->read_memory_func (addr, buffer, 8, dinfo); ++ if (err) ++ return _NFP_ERR_STOP; ++ ++ if (!dinfo->section) ++ { ++ num_ctx = 8; ++ scs_cnt = 0; ++ addr_3rdparty32 = 0; ++ } ++ else ++ { ++ unsigned int sh_info = 0; ++ nfp_priv_mecfg *mecfg; ++ ++ /* We have a section, presumably all ELF sections. Try to find ++ proper ME configs to produce better disassembly. */ ++ if (!priv) ++ return _NFP_ERR_STOP; /* Sanity check */ ++ ++ is_text = (elf_section_flags (dinfo->section) ++ & (SHF_NFP_INIT | SHF_NFP_INIT2)) == 0; ++ ++ sh_info = elf_section_info (dinfo->section); ++ ++ switch (dinfo->mach) ++ { ++ case E_NFP_MACH_3200: ++ island = SHI_NFP_3200_ISLAND (sh_info); ++ menum = SHI_NFP_3200_MENUM (sh_info); ++ break; ++ default: ++ island = SHI_NFP_ISLAND (sh_info); ++ menum = SHI_NFP_MENUM (sh_info); ++ break; ++ } ++ ++ mecfg = &priv->mecfgs[island][menum][is_text]; ++ num_ctx = (mecfg->ctx4_mode) ? 4 : 8; ++ addr_3rdparty32 = mecfg->addr_3rdparty32; ++ scs_cnt = mecfg->scs_cnt; ++ } ++ ++ if (opts->ctx_mode) ++ num_ctx = opts->ctx_mode; ++ ++ dinfo->bytes_per_line = 8; ++ dinfo->bytes_per_chunk = 8; ++ ++ instr = bfd_getl64 (buffer); ++ ++ if (opts->show_pc) ++ { ++ pc = (int) (addr >> 3); ++ ++ /* Guess max PC for formatting */ ++ tmpj = (int) (dinfo->buffer_length >> 3); ++ if (scs_cnt == 1) ++ { ++ pc *= 2; ++ tmpj *= 2; ++ if (! !(menum & 1)) ++ { ++ pc++; ++ tmpj++; ++ } ++ } ++ ++ for (tmpi = 1; tmpj > 9; tmpj /= 10) ++ tmpi++; ++ ++ tmpj = pc; ++ for (; tmpj > 9; tmpj /= 10) ++ tmpi--; ++ ++ dinfo->fprintf_func (dinfo->stream, "%*c%d ", tmpi, '.', pc); ++ } ++ ++ switch (dinfo->mach) ++ { ++ case E_NFP_MACH_3200: ++ if (NFP_ME27_INSTR_IS_CMD (instr)) ++ err = nfp_me27_print_cmd (instr, addr_3rdparty32, num_ctx, dinfo); ++ else if (NFP_ME27_INSTR_IS_ALU_SHF (instr)) ++ err = nfp_me27_print_alu_shf (instr, num_ctx, dinfo); ++ else if (NFP_ME27_INSTR_IS_ALU (instr)) ++ err = nfp_me27_print_alu (instr, num_ctx, dinfo); ++ else if (NFP_ME27_INSTR_IS_IMMED (instr)) ++ err = nfp_me27_print_immed (instr, num_ctx, dinfo); ++ else if (NFP_ME27_INSTR_IS_LD_FIELD (instr)) ++ err = nfp_me27_print_ld_field (instr, num_ctx, dinfo); ++ else if (NFP_ME27_INSTR_IS_CTX_ARB (instr)) ++ err = nfp_me27_print_ctx_arb (instr, dinfo); ++ else if (NFP_ME27_INSTR_IS_LOCAL_CSR (instr)) ++ err = nfp_me27_print_local_csr (instr, num_ctx, dinfo); ++ else if (NFP_ME27_INSTR_IS_BRANCH (instr)) ++ err = nfp_me27_print_branch (instr, dinfo); ++ else if (NFP_ME27_INSTR_IS_BR_BYTE (instr)) ++ err = nfp_me27_print_br_byte (instr, num_ctx, dinfo); ++ else if (NFP_ME27_INSTR_IS_BR_BIT (instr)) ++ err = nfp_me27_print_br_bit (instr, num_ctx, dinfo); ++ else if (NFP_ME27_INSTR_IS_BR_ALU (instr)) ++ err = nfp_me27_print_br_alu (instr, num_ctx, dinfo); ++ else if (NFP_ME27_INSTR_IS_MULT (instr)) ++ err = nfp_me27_print_mult (instr, num_ctx, dinfo); ++ else ++ err = nfp_me_print_invalid (instr, dinfo); ++ break; ++ ++ case E_NFP_MACH_6000: ++ if (NFP_ME28_INSTR_IS_CMD (instr)) ++ err = nfp_me28_print_cmd (instr, addr_3rdparty32, num_ctx, dinfo); ++ else if (NFP_ME28_INSTR_IS_ALU_SHF (instr)) ++ err = nfp_me28_print_alu_shf (instr, num_ctx, dinfo); ++ else if (NFP_ME28_INSTR_IS_ALU (instr)) ++ err = nfp_me28_print_alu (instr, num_ctx, dinfo); ++ else if (NFP_ME28_INSTR_IS_IMMED (instr)) ++ err = nfp_me28_print_immed (instr, num_ctx, dinfo); ++ else if (NFP_ME28_INSTR_IS_LD_FIELD (instr)) ++ err = nfp_me28_print_ld_field (instr, num_ctx, dinfo); ++ else if (NFP_ME28_INSTR_IS_CTX_ARB (instr)) ++ err = nfp_me28_print_ctx_arb (instr, dinfo); ++ else if (NFP_ME28_INSTR_IS_LOCAL_CSR (instr)) ++ err = nfp_me28_print_local_csr (instr, num_ctx, dinfo); ++ else if (NFP_ME28_INSTR_IS_BRANCH (instr)) ++ err = nfp_me28_print_branch (instr, dinfo); ++ else if (NFP_ME28_INSTR_IS_BR_BYTE (instr)) ++ err = nfp_me28_print_br_byte (instr, num_ctx, dinfo); ++ else if (NFP_ME28_INSTR_IS_BR_BIT (instr)) ++ err = nfp_me28_print_br_bit (instr, num_ctx, dinfo); ++ else if (NFP_ME28_INSTR_IS_BR_ALU (instr)) ++ err = nfp_me28_print_br_alu (instr, num_ctx, dinfo); ++ else if (NFP_ME28_INSTR_IS_MULT (instr)) ++ err = nfp_me28_print_mult (instr, num_ctx, dinfo); ++ else ++ err = nfp_me_print_invalid (instr, dinfo); ++ break; ++ } ++ ++ if (err < 0) ++ return err; ++ return 8; ++} ++ ++int ++print_insn_nfp (bfd_vma addr, struct disassemble_info *dinfo) ++{ ++ nfp_opts opts; ++ int err; ++ ++ opts.show_pc = 1; ++ opts.ctx_mode = 0; ++ err = parse_disassembler_options (&opts, dinfo); ++ if (err < 0) ++ goto end; ++ ++ err = _print_instrs (addr, dinfo, &opts); ++ ++end: ++ if (err != 8) ++ dinfo->fprintf_func (dinfo->stream, "\t # ERROR"); ++ if (err == _NFP_ERR_CONT) ++ return 8; ++ return err; ++} ++ ++void ++print_nfp_disassembler_options (FILE * stream) ++{ ++ fprintf (stream, _("\n\ ++The following NFP specific disassembler options are supported for use\n\ ++with the -M switch (multiple options should be separated by commas):\n")); ++ ++ fprintf (stream, _("\n\ ++ no-pc Don't print program counter prefix.\n\ ++ ctx4 Force disassembly using 4-context mode.\n\ ++ ctx8 Force 8-context mode, takes precedence.")); ++ ++ fprintf (stream, _("\n")); ++} +--- /dev/null 2019-03-07 09:27:55.425999321 +0000 ++++ /binutils/testsuite/binutils-all/nfp/test2_nfp6000.nffw 2018-04-30 11:21:22.978953995 +0100 +@@ -0,0 +1,11 @@ ++ELF