From a8446ea78daa5875de43eb5bcccd8f536ea07e1c Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 8 Jan 2015 00:11:40 -0800 Subject: binutils: upgrade to 2.25 * Remove the following patches since they are already in the new code: binutils/fix-pr15815.patch binutils/fix-pr16428.patch binutils/fix-pr16476.patch binutils/fix-pr2404.patch binutils/replace_macros_with_static_inline.patch binutils/binutils_CVE-2014-8484.patch binutils/binutils_CVE-2014-8485.patch binutils/binutils_CVE-2014-8501.patch binutils/binutils_CVE-2014-8502.patch binutils/binutils_CVE-2014-8502_1.patch binutils/binutils_CVE-2014-8503.patch binutils/binutils_CVE-2014-8504.patch binutils/binutils_CVE-2014-8737.patch * The file src-release is gone. * Updated patches for the new code. Signed-off-by: Robert Yang Signed-off-by: Khem Raj Conflicts: meta/conf/distro/include/tcmode-default.inc --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/binutils/binutils-2.24.inc | 46 -- meta/recipes-devtools/binutils/binutils-2.25.inc | 30 ++ .../binutils/binutils-cross-canadian_2.24.bb | 3 - .../binutils/binutils-cross-canadian_2.25.bb | 3 + .../binutils/binutils-cross_2.24.bb | 3 - .../binutils/binutils-cross_2.25.bb | 3 + .../binutils/binutils-crosssdk_2.24.bb | 13 - .../binutils/binutils-crosssdk_2.25.bb | 13 + .../binutils/binutils/binutils-poison.patch | 40 +- .../binutils/binutils/binutils-xlp-support.patch | 296 ++++++------ .../binutils/binutils/binutils_CVE-2014-8484.patch | 67 --- .../binutils/binutils/binutils_CVE-2014-8485.patch | 102 ---- .../binutils/binutils/binutils_CVE-2014-8501.patch | 60 --- .../binutils/binutils/binutils_CVE-2014-8502.patch | 89 ---- .../binutils/binutils_CVE-2014-8502_1.patch | 523 --------------------- .../binutils/binutils/binutils_CVE-2014-8503.patch | 47 -- .../binutils/binutils/binutils_CVE-2014-8504.patch | 75 --- .../binutils/binutils/binutils_CVE-2014-8737.patch | 177 ------- .../binutils/binutils/fix-pr15815.patch | 36 -- .../binutils/binutils/fix-pr16428.patch | 123 ----- .../binutils/binutils/fix-pr16476.patch | 220 --------- .../binutils/binutils/fix-pr2404.patch | 76 --- .../binutils/binutils/libtool-2.4-update.patch | 301 ++++++------ .../binutils/mips64-default-ld-emulation.patch | 38 +- .../replace_macros_with_static_inline.patch | 188 -------- meta/recipes-devtools/binutils/binutils_2.24.bb | 39 -- meta/recipes-devtools/binutils/binutils_2.25.bb | 39 ++ 28 files changed, 426 insertions(+), 2226 deletions(-) delete mode 100644 meta/recipes-devtools/binutils/binutils-2.24.inc create mode 100644 meta/recipes-devtools/binutils/binutils-2.25.inc delete mode 100644 meta/recipes-devtools/binutils/binutils-cross-canadian_2.24.bb create mode 100644 meta/recipes-devtools/binutils/binutils-cross-canadian_2.25.bb delete mode 100644 meta/recipes-devtools/binutils/binutils-cross_2.24.bb create mode 100644 meta/recipes-devtools/binutils/binutils-cross_2.25.bb delete mode 100644 meta/recipes-devtools/binutils/binutils-crosssdk_2.24.bb create mode 100644 meta/recipes-devtools/binutils/binutils-crosssdk_2.25.bb delete mode 100644 meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8484.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8485.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8501.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8502.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8502_1.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8503.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8504.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8737.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/fix-pr15815.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/fix-pr16428.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/fix-pr16476.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/fix-pr2404.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/replace_macros_with_static_inline.patch delete mode 100644 meta/recipes-devtools/binutils/binutils_2.24.bb create mode 100644 meta/recipes-devtools/binutils/binutils_2.25.bb (limited to 'meta') diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index a666510c17..f69fe9a0d7 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -24,7 +24,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "4.9%" SDKGCCVERSION ?= "${GCCVERSION}" -BINUVERSION ?= "2.24" +BINUVERSION ?= "2.25" GDBVERSION ?= "7.8%" GLIBCVERSION ?= "2.21" UCLIBCVERSION ?= "0.9.33+git%" diff --git a/meta/recipes-devtools/binutils/binutils-2.24.inc b/meta/recipes-devtools/binutils/binutils-2.24.inc deleted file mode 100644 index 63c928712e..0000000000 --- a/meta/recipes-devtools/binutils/binutils-2.24.inc +++ /dev/null @@ -1,46 +0,0 @@ -LIC_FILES_CHKSUM="\ - file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\ - file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552\ - file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674\ - file://COPYING3;md5=d32239bcb673463ab874e80d47fae504\ - file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6\ - file://gas/COPYING;md5=d32239bcb673463ab874e80d47fae504\ - file://include/COPYING;md5=59530bdf33659b29e73d4adb9f9f6552\ - file://include/COPYING3;md5=d32239bcb673463ab874e80d47fae504\ - file://libiberty/COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7\ - file://bfd/COPYING;md5=d32239bcb673463ab874e80d47fae504\ - " - -SRC_URI = "\ - ${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \ - file://binutils-uclibc-100-uclibc-conf.patch \ - file://binutils-uclibc-300-001_ld_makefile_patch.patch \ - file://binutils-uclibc-300-006_better_file_error.patch \ - file://binutils-uclibc-300-012_check_ldrunpath_length.patch \ - file://binutils-uclibc-gas-needs-libm.patch \ - file://libtool-2.4-update.patch \ - file://libiberty_path_fix.patch \ - file://binutils-poison.patch \ - file://libtool-rpath-fix.patch \ - file://binutils-armv5e.patch \ - file://mips64-default-ld-emulation.patch \ - file://binutils-xlp-support.patch \ - file://fix-pr15815.patch \ - file://fix-pr2404.patch \ - file://fix-pr16476.patch \ - file://fix-pr16428.patch \ - file://replace_macros_with_static_inline.patch \ - file://0001-Fix-MMIX-build-breakage-from-bfd_set_section_vma-cha.patch \ - file://binutils-uninitialised-warning.patch \ - file://binutils_CVE-2014-8484.patch \ - file://binutils_CVE-2014-8485.patch \ - file://binutils_CVE-2014-8501.patch \ - file://binutils_CVE-2014-8502_1.patch \ - file://binutils_CVE-2014-8502.patch \ - file://binutils_CVE-2014-8503.patch \ - file://binutils_CVE-2014-8504.patch \ - file://binutils_CVE-2014-8737.patch \ - " - -SRC_URI[md5sum] = "e0f71a7b2ddab0f8612336ac81d9636b" -SRC_URI[sha256sum] = "e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137" diff --git a/meta/recipes-devtools/binutils/binutils-2.25.inc b/meta/recipes-devtools/binutils/binutils-2.25.inc new file mode 100644 index 0000000000..d69b519542 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils-2.25.inc @@ -0,0 +1,30 @@ +LIC_FILES_CHKSUM="\ + file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552\ + file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674\ + file://COPYING3;md5=d32239bcb673463ab874e80d47fae504\ + file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6\ + file://gas/COPYING;md5=d32239bcb673463ab874e80d47fae504\ + file://include/COPYING;md5=59530bdf33659b29e73d4adb9f9f6552\ + file://include/COPYING3;md5=d32239bcb673463ab874e80d47fae504\ + file://libiberty/COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7\ + file://bfd/COPYING;md5=d32239bcb673463ab874e80d47fae504\ + " + +SRC_URI = "\ + ${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \ + file://binutils-uclibc-100-uclibc-conf.patch \ + file://binutils-uclibc-300-001_ld_makefile_patch.patch \ + file://binutils-uclibc-300-006_better_file_error.patch \ + file://binutils-uclibc-300-012_check_ldrunpath_length.patch \ + file://binutils-uclibc-gas-needs-libm.patch \ + file://libtool-2.4-update.patch \ + file://libiberty_path_fix.patch \ + file://binutils-poison.patch \ + file://libtool-rpath-fix.patch \ + file://binutils-armv5e.patch \ + file://mips64-default-ld-emulation.patch \ + file://binutils-xlp-support.patch \ + " +SRC_URI[md5sum] = "d9f3303f802a5b6b0bb73a335ab89d66" +SRC_URI[sha256sum] = "22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923" + diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.24.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.24.bb deleted file mode 100644 index 5dbaa03017..0000000000 --- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.24.bb +++ /dev/null @@ -1,3 +0,0 @@ -require binutils.inc -require binutils-${PV}.inc -require binutils-cross-canadian.inc diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.25.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.25.bb new file mode 100644 index 0000000000..5dbaa03017 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.25.bb @@ -0,0 +1,3 @@ +require binutils.inc +require binutils-${PV}.inc +require binutils-cross-canadian.inc diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.24.bb b/meta/recipes-devtools/binutils/binutils-cross_2.24.bb deleted file mode 100644 index fbd1f7d25a..0000000000 --- a/meta/recipes-devtools/binutils/binutils-cross_2.24.bb +++ /dev/null @@ -1,3 +0,0 @@ -require binutils.inc -require binutils-${PV}.inc -require binutils-cross.inc diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.25.bb b/meta/recipes-devtools/binutils/binutils-cross_2.25.bb new file mode 100644 index 0000000000..fbd1f7d25a --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils-cross_2.25.bb @@ -0,0 +1,3 @@ +require binutils.inc +require binutils-${PV}.inc +require binutils-cross.inc diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.24.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.24.bb deleted file mode 100644 index b6d9a215e1..0000000000 --- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.24.bb +++ /dev/null @@ -1,13 +0,0 @@ -require binutils-cross_${PV}.bb - -inherit crosssdk - -PN = "binutils-crosssdk-${TARGET_ARCH}" - -PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk" - -SRC_URI += "file://relocatable_sdk.patch" - -do_configure_prepend () { - sed -i 's#/usr/local/lib /lib /usr/lib#${SDKPATHNATIVE}/lib ${SDKPATHNATIVE}/usr/lib /usr/local/lib /lib /usr/lib#' ${S}/ld/configure.tgt -} diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.25.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.25.bb new file mode 100644 index 0000000000..b6d9a215e1 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.25.bb @@ -0,0 +1,13 @@ +require binutils-cross_${PV}.bb + +inherit crosssdk + +PN = "binutils-crosssdk-${TARGET_ARCH}" + +PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk" + +SRC_URI += "file://relocatable_sdk.patch" + +do_configure_prepend () { + sed -i 's#/usr/local/lib /lib /usr/lib#${SDKPATHNATIVE}/lib ${SDKPATHNATIVE}/usr/lib /usr/local/lib /lib /usr/lib#' ${S}/ld/configure.tgt +} diff --git a/meta/recipes-devtools/binutils/binutils/binutils-poison.patch b/meta/recipes-devtools/binutils/binutils/binutils-poison.patch index 996c023810..eb540766dc 100644 --- a/meta/recipes-devtools/binutils/binutils/binutils-poison.patch +++ b/meta/recipes-devtools/binutils/binutils/binutils-poison.patch @@ -106,10 +106,10 @@ Index: binutils-2.24/ld/configure # Check whether --enable-got was given. if test "${enable_got+set}" = set; then : -Index: binutils-2.24/ld/configure.in +Index: binutils-2.24/ld/configure.ac =================================================================== ---- binutils-2.24.orig/ld/configure.in 2013-12-15 11:46:17.000000000 -0800 -+++ binutils-2.24/ld/configure.in 2013-12-15 11:46:59.810435651 -0800 +--- binutils-2.24.orig/ld/configure.ac 2013-12-15 11:46:17.000000000 -0800 ++++ binutils-2.24/ld/configure.ac 2013-12-15 11:46:59.810435651 -0800 @@ -87,6 +87,16 @@ AC_SUBST(TARGET_SYSTEM_ROOT) AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) @@ -214,10 +214,10 @@ Index: binutils-2.24/ld/lexsup.c =================================================================== --- binutils-2.24.orig/ld/lexsup.c 2013-12-15 11:46:17.000000000 -0800 +++ binutils-2.24/ld/lexsup.c 2013-12-15 11:49:28.950434490 -0800 -@@ -507,6 +507,14 @@ - OPTION_IGNORE_UNRESOLVED_SYMBOL}, - '\0', N_("SYMBOL"), - N_("Unresolved SYMBOL will not cause an error or warning"), TWO_DASHES }, +@@ -513,6 +513,14 @@ static const struct ld_option ld_options[] = + { {"pop-state", no_argument, NULL, OPTION_POP_STATE}, + '\0', NULL, N_("Pop state of flags governing input file handling"), + TWO_DASHES }, + { {"no-poison-system-directories", no_argument, NULL, + OPTION_NO_POISON_SYSTEM_DIRECTORIES}, + '\0', NULL, N_("Do not warn for -L options using system directories"), @@ -229,18 +229,18 @@ Index: binutils-2.24/ld/lexsup.c }; #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -1442,6 +1450,14 @@ - einfo (_("%P%X: --hash-size needs a numeric argument\n")); - } - break; +@@ -1474,6 +1482,14 @@ parse_args (unsigned argc, char **argv) + free (oldp); + } + break; + -+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: -+ command_line.poison_system_directories = FALSE; -+ break; ++ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: ++ command_line.poison_system_directories = FALSE; ++ break; + -+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: -+ command_line.error_poison_system_directories = TRUE; -+ break; ++ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: ++ command_line.error_poison_system_directories = TRUE; ++ break; } } @@ -248,10 +248,10 @@ Index: binutils-2.24/ld/ldlex.h =================================================================== --- binutils-2.24.orig/ld/ldlex.h 2013-12-15 11:46:17.000000000 -0800 +++ binutils-2.24/ld/ldlex.h 2013-12-15 11:47:43.230435299 -0800 -@@ -138,6 +138,8 @@ - OPTION_DEFAULT_SCRIPT, - OPTION_PRINT_OUTPUT_FORMAT, +@@ -140,6 +140,8 @@ enum option_values OPTION_IGNORE_UNRESOLVED_SYMBOL, + OPTION_PUSH_STATE, + OPTION_POP_STATE, + OPTION_NO_POISON_SYSTEM_DIRECTORIES, + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, }; diff --git a/meta/recipes-devtools/binutils/binutils/binutils-xlp-support.patch b/meta/recipes-devtools/binutils/binutils/binutils-xlp-support.patch index a1999184be..b03bb28237 100644 --- a/meta/recipes-devtools/binutils/binutils/binutils-xlp-support.patch +++ b/meta/recipes-devtools/binutils/binutils/binutils-xlp-support.patch @@ -16,75 +16,73 @@ Netlogic. Also, update vendor name to NLM wherever applicable. bfd/cpu-mips.c | 6 ++++-- bfd/elfxx-mips.c | 8 ++++++++ binutils/readelf.c | 1 + - config.sub | 6 ++++++ - gas/config/tc-mips.c | 7 ++++++- + gas/config/tc-mips.c | 4 +++- gas/configure | 3 +++ gas/configure.tgt | 2 +- - gas/doc/c-mips.texi | 3 ++- include/elf/mips.h | 1 + - include/opcode/mips.h | 6 +++++- + include/opcode/mips.h | 10 ++++++++-- ld/configure.tgt | 2 ++ - opcodes/mips-dis.c | 6 ++++++ - opcodes/mips-opc.c | 31 ++++++++++++++++++++----------- - 17 files changed, 73 insertions(+), 17 deletions(-) + opcodes/mips-dis.c | 12 +++++------- + opcodes/mips-opc.c | 33 +++++++++++++++++++++------------ + 15 files changed, 65 insertions(+), 25 deletions(-) -Index: binutils-2.24/bfd/aoutx.h -=================================================================== ---- binutils-2.24.orig/bfd/aoutx.h 2013-12-15 13:07:57.180399300 -0800 -+++ binutils-2.24/bfd/aoutx.h 2013-12-15 13:08:03.397065919 -0800 -@@ -798,6 +798,7 @@ - case bfd_mach_mipsisa64r2: +diff --git a/bfd/aoutx.h b/bfd/aoutx.h +index 9385a98..a88df99 100644 +--- a/bfd/aoutx.h ++++ b/bfd/aoutx.h +@@ -802,6 +802,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch, + case bfd_mach_mipsisa64r6: case bfd_mach_mips_sb1: case bfd_mach_mips_xlr: + case bfd_mach_mips_xlp: /* FIXME: These should be MIPS3, MIPS4, MIPS16, MIPS32, etc. */ arch_flags = M_MIPS2; break; -Index: binutils-2.24/bfd/archures.c -=================================================================== ---- binutils-2.24.orig/bfd/archures.c 2013-12-15 13:07:57.180399300 -0800 -+++ binutils-2.24/bfd/archures.c 2013-12-15 13:08:03.397065919 -0800 -@@ -178,6 +178,7 @@ +diff --git a/bfd/archures.c b/bfd/archures.c +index c9fd6c8..547bd09 100644 +--- a/bfd/archures.c ++++ b/bfd/archures.c +@@ -180,6 +180,7 @@ DESCRIPTION .#define bfd_mach_mips_octeonp 6601 .#define bfd_mach_mips_octeon2 6502 .#define bfd_mach_mips_xlr 887682 {* decimal 'XLR' *} +.#define bfd_mach_mips_xlp 887680 {* decimal 'XLP' *} .#define bfd_mach_mipsisa32 32 .#define bfd_mach_mipsisa32r2 33 - .#define bfd_mach_mipsisa64 64 -Index: binutils-2.24/bfd/bfd-in2.h -=================================================================== ---- binutils-2.24.orig/bfd/bfd-in2.h 2013-12-15 13:07:57.180399300 -0800 -+++ binutils-2.24/bfd/bfd-in2.h 2013-12-15 13:08:03.400399254 -0800 -@@ -1933,6 +1933,7 @@ + .#define bfd_mach_mipsisa32r3 34 +diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h +index c7a2bb5..413b773 100644 +--- a/bfd/bfd-in2.h ++++ b/bfd/bfd-in2.h +@@ -1967,6 +1967,7 @@ enum bfd_architecture #define bfd_mach_mips_octeonp 6601 #define bfd_mach_mips_octeon2 6502 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR' */ +#define bfd_mach_mips_xlp 887680 /* decimal 'XLP' */ #define bfd_mach_mipsisa32 32 #define bfd_mach_mipsisa32r2 33 - #define bfd_mach_mipsisa64 64 -Index: binutils-2.24/bfd/config.bfd -=================================================================== ---- binutils-2.24.orig/bfd/config.bfd 2013-12-15 13:08:03.047065922 -0800 -+++ binutils-2.24/bfd/config.bfd 2013-12-15 13:08:03.400399254 -0800 -@@ -1032,6 +1032,11 @@ - targ_defvec=bfd_elf32_littlemips_vec - targ_selvecs="bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec" + #define bfd_mach_mipsisa32r3 34 +diff --git a/bfd/config.bfd b/bfd/config.bfd +index 03d2c6f..91cedb8 100644 +--- a/bfd/config.bfd ++++ b/bfd/config.bfd +@@ -1041,6 +1041,11 @@ case "${targ}" in + targ_defvec=mips_elf32_le_vec + targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec" ;; + mipsisa64*-*-elf*) -+ targ_defvec=bfd_elf32_tradbigmips_vec -+ targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec" ++ targ_defvec=mips_elf32_trad_be_vec ++ targ_selvecs="mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec" + want64=true + ;; mips*-*-elf* | mips*-*-rtems* | mips*-*-vxworks | mips*-*-windiss) - targ_defvec=bfd_elf32_bigmips_vec - targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec" -Index: binutils-2.24/bfd/cpu-mips.c -=================================================================== ---- binutils-2.24.orig/bfd/cpu-mips.c 2013-12-15 13:07:57.180399300 -0800 -+++ binutils-2.24/bfd/cpu-mips.c 2013-12-15 13:08:03.400399254 -0800 -@@ -99,7 +99,8 @@ + targ_defvec=mips_elf32_be_vec + targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec" +diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c +index b617aaa..19a99d1 100644 +--- a/bfd/cpu-mips.c ++++ b/bfd/cpu-mips.c +@@ -103,7 +103,8 @@ enum I_mipsocteonp, I_mipsocteon2, I_xlr, @@ -94,7 +92,7 @@ Index: binutils-2.24/bfd/cpu-mips.c }; #define NN(index) (&arch_info_struct[(index) + 1]) -@@ -143,7 +144,8 @@ +@@ -153,7 +154,8 @@ static const bfd_arch_info_type arch_info_struct[] = N (64, 64, bfd_mach_mips_octeonp,"mips:octeon+", FALSE, NN(I_mipsocteonp)), N (64, 64, bfd_mach_mips_octeon2,"mips:octeon2", FALSE, NN(I_mipsocteon2)), N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)), @@ -104,11 +102,11 @@ Index: binutils-2.24/bfd/cpu-mips.c }; /* The default architecture is mips:3000, but with a machine number of -Index: binutils-2.24/bfd/elfxx-mips.c -=================================================================== ---- binutils-2.24.orig/bfd/elfxx-mips.c 2013-12-15 13:07:57.180399300 -0800 -+++ binutils-2.24/bfd/elfxx-mips.c 2013-12-15 13:08:03.400399254 -0800 -@@ -6404,6 +6404,9 @@ +diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c +index a0cc26e..672d5b3 100644 +--- a/bfd/elfxx-mips.c ++++ b/bfd/elfxx-mips.c +@@ -6608,6 +6608,9 @@ _bfd_elf_mips_mach (flagword flags) case E_MIPS_MACH_XLR: return bfd_mach_mips_xlr; @@ -118,7 +116,7 @@ Index: binutils-2.24/bfd/elfxx-mips.c default: switch (flags & EF_MIPS_ARCH) { -@@ -11622,6 +11625,10 @@ +@@ -11878,6 +11881,10 @@ mips_set_isa_flags (bfd *abfd) val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2; break; @@ -129,31 +127,31 @@ Index: binutils-2.24/bfd/elfxx-mips.c case bfd_mach_mipsisa32: val = E_MIPS_ARCH_32; break; -@@ -14202,6 +14209,7 @@ - { bfd_mach_mips_octeon2, bfd_mach_mips_octeonp }, +@@ -14753,6 +14760,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = { bfd_mach_mips_octeonp, bfd_mach_mips_octeon }, { bfd_mach_mips_octeon, bfd_mach_mipsisa64r2 }, + { bfd_mach_mips_loongson_3a, bfd_mach_mipsisa64r2 }, + { bfd_mach_mips_xlp, bfd_mach_mipsisa64r2 }, /* MIPS64 extensions. */ { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 }, -Index: binutils-2.24/binutils/readelf.c -=================================================================== ---- binutils-2.24.orig/binutils/readelf.c 2013-12-15 13:07:57.180399300 -0800 -+++ binutils-2.24/binutils/readelf.c 2013-12-15 13:08:03.403732587 -0800 -@@ -2602,6 +2602,7 @@ - case E_MIPS_MACH_OCTEON: strcat (buf, ", octeon"); break; +diff --git a/binutils/readelf.c b/binutils/readelf.c +index 0c00b2f..6e9d5e4 100644 +--- a/binutils/readelf.c ++++ b/binutils/readelf.c +@@ -2898,6 +2898,7 @@ get_machine_flags (unsigned e_flags, unsigned e_machine) case E_MIPS_MACH_OCTEON2: strcat (buf, ", octeon2"); break; + case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break; case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break; + case E_MIPS_MACH_XLP: strcat (buf, ", xlp"); break; case 0: /* We simply ignore the field in this case to avoid confusion: MIPS ELF does not specify EF_MIPS_MACH, it is a GNU -Index: binutils-2.24/gas/config/tc-mips.c -=================================================================== ---- binutils-2.24.orig/gas/config/tc-mips.c 2013-12-15 13:07:57.180399300 -0800 -+++ binutils-2.24/gas/config/tc-mips.c 2013-12-15 13:17:19.943728439 -0800 -@@ -486,6 +486,7 @@ +diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c +index c3e3e2a..8d64344 100644 +--- a/gas/config/tc-mips.c ++++ b/gas/config/tc-mips.c +@@ -551,6 +551,7 @@ static int mips_32bitmode = 0; || mips_opts.arch == CPU_RM7000 \ || mips_opts.arch == CPU_VR5500 \ || mips_opts.micromips \ @@ -161,7 +159,7 @@ Index: binutils-2.24/gas/config/tc-mips.c ) /* Whether the processor uses hardware interlocks to protect reads -@@ -515,6 +516,7 @@ +@@ -580,6 +581,7 @@ static int mips_32bitmode = 0; && mips_opts.isa != ISA_MIPS3) \ || mips_opts.arch == CPU_R4300 \ || mips_opts.micromips \ @@ -169,7 +167,7 @@ Index: binutils-2.24/gas/config/tc-mips.c ) /* Whether the processor uses hardware interlocks to protect reads -@@ -17794,7 +17796,7 @@ +@@ -18682,7 +18684,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = /* Broadcom XLP. XLP is mostly like XLR, with the prominent exception that it is MIPS64R2 rather than MIPS64. */ @@ -178,13 +176,13 @@ Index: binutils-2.24/gas/config/tc-mips.c /* End marker */ { NULL, 0, 0, 0, 0 } -Index: binutils-2.24/gas/configure -=================================================================== ---- binutils-2.24.orig/gas/configure 2013-12-15 13:08:01.127065936 -0800 -+++ binutils-2.24/gas/configure 2013-12-15 13:08:03.407065920 -0800 -@@ -12697,6 +12697,9 @@ - mipsisa64r2 | mipsisa64r2el) - mips_cpu=mips64r2 +diff --git a/gas/configure b/gas/configure +index 9529f1a..63bba5b 100755 +--- a/gas/configure ++++ b/gas/configure +@@ -12808,6 +12808,9 @@ _ACEOF + mipsisa64r6 | mipsisa64r6el) + mips_cpu=mips64r6 ;; + mipsisa64r2nlm | mipsisa64r2nlmel) + mips_cpu=xlp @@ -192,36 +190,36 @@ Index: binutils-2.24/gas/configure mipstx39 | mipstx39el) mips_cpu=r3900 ;; -Index: binutils-2.24/gas/configure.tgt -=================================================================== ---- binutils-2.24.orig/gas/configure.tgt 2013-12-15 13:08:00.783732605 -0800 -+++ binutils-2.24/gas/configure.tgt 2013-12-15 13:08:03.407065920 -0800 -@@ -325,7 +325,7 @@ - fmt=elf em=freebsd ;; +diff --git a/gas/configure.tgt b/gas/configure.tgt +index 05546ca..bb859d6 100644 +--- a/gas/configure.tgt ++++ b/gas/configure.tgt +@@ -332,7 +332,7 @@ case ${generic_target} in mips-*-sysv4*MP* | mips-*-gnu*) fmt=elf em=tmips ;; - mips*-sde-elf* | mips*-mti-elf*) fmt=elf em=tmips ;; + mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) + fmt=elf em=tmips ;; - mips-*-elf* | mips-*-rtems*) fmt=elf ;; + mips-*-elf* | mips-*-rtems*) fmt=elf em=tmips ;; mips-*-netbsd*) fmt=elf em=tmips ;; mips-*-openbsd*) fmt=elf em=tmips ;; -Index: binutils-2.24/include/elf/mips.h -=================================================================== ---- binutils-2.24.orig/include/elf/mips.h 2013-12-15 13:07:57.180399300 -0800 -+++ binutils-2.24/include/elf/mips.h 2013-12-15 13:08:03.407065920 -0800 -@@ -274,6 +274,7 @@ +diff --git a/include/elf/mips.h b/include/elf/mips.h +index 2ed6acd..899b1e5 100644 +--- a/include/elf/mips.h ++++ b/include/elf/mips.h +@@ -285,6 +285,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext) #define E_MIPS_MACH_SB1 0x008a0000 #define E_MIPS_MACH_OCTEON 0x008b0000 #define E_MIPS_MACH_XLR 0x008c0000 -+#define E_MIPS_MACH_XLP 0x008e0000 ++#define E_MIPS_MACH_XLP 0x008f0000 #define E_MIPS_MACH_OCTEON2 0x008d0000 + #define E_MIPS_MACH_OCTEON3 0x008e0000 #define E_MIPS_MACH_5400 0x00910000 - #define E_MIPS_MACH_5900 0x00920000 -Index: binutils-2.24/include/opcode/mips.h -=================================================================== ---- binutils-2.24.orig/include/opcode/mips.h 2013-12-15 13:07:57.180399300 -0800 -+++ binutils-2.24/include/opcode/mips.h 2013-12-15 13:40:11.130384844 -0800 -@@ -1092,8 +1092,10 @@ +diff --git a/include/opcode/mips.h b/include/opcode/mips.h +index ef26167..ef53ec6 100644 +--- a/include/opcode/mips.h ++++ b/include/opcode/mips.h +@@ -1227,8 +1227,10 @@ static const unsigned int mips_isa_table[] = { #define INSN_LOONGSON_2F 0x80000000 /* Loongson 3A. */ #define INSN_LOONGSON_3A 0x00000400 @@ -234,7 +232,7 @@ Index: binutils-2.24/include/opcode/mips.h /* DSP ASE */ #define ASE_DSP 0x00000001 -@@ -1172,6 +1174,7 @@ +@@ -1324,6 +1326,7 @@ static const unsigned int mips_isa_table[] = { #define CPU_OCTEONP 6601 #define CPU_OCTEON2 6502 #define CPU_XLR 887682 /* decimal 'XLR' */ @@ -242,9 +240,9 @@ Index: binutils-2.24/include/opcode/mips.h /* Return true if the given CPU is included in INSN_* mask MASK. */ -@@ -1239,6 +1242,9 @@ - case CPU_XLR: - return (mask & INSN_XLR) != 0; +@@ -1398,6 +1401,9 @@ cpu_is_member (int cpu, unsigned int mask) + return ((mask & INSN_ISA_MASK) == INSN_ISA32R6) + || ((mask & INSN_ISA_MASK) == INSN_ISA64R6); + case CPU_XLP: + return (mask & INSN_XLP) != 0; @@ -252,12 +250,12 @@ Index: binutils-2.24/include/opcode/mips.h default: return FALSE; } -Index: binutils-2.24/ld/configure.tgt -=================================================================== ---- binutils-2.24.orig/ld/configure.tgt 2013-12-15 13:08:03.047065922 -0800 -+++ binutils-2.24/ld/configure.tgt 2013-12-15 13:08:03.407065920 -0800 -@@ -457,6 +457,8 @@ - mips*-sde-elf* | mips*-mti-elf*) +diff --git a/ld/configure.tgt b/ld/configure.tgt +index 740b2ea..4df13a7 100644 +--- a/ld/configure.tgt ++++ b/ld/configure.tgt +@@ -462,6 +462,8 @@ mips*el-sde-elf*) targ_emul=elf32ltsmip + mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) targ_emul=elf32btsmip targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" ;; +mipsisa64*-*-elf*) targ_emul=elf32btsmip @@ -265,13 +263,13 @@ Index: binutils-2.24/ld/configure.tgt mips64*el-ps2-elf*) targ_emul=elf32lr5900n32 targ_extra_emuls="elf32lr5900" targ_extra_libpath=$targ_extra_emuls ;; -Index: binutils-2.24/opcodes/mips-dis.c -=================================================================== ---- binutils-2.24.orig/opcodes/mips-dis.c 2013-12-15 13:07:57.180399300 -0800 -+++ binutils-2.24/opcodes/mips-dis.c 2013-12-15 13:39:50.243718329 -0800 -@@ -554,13 +554,11 @@ +diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c +index 1eb1d45..d6881af 100644 +--- a/opcodes/mips-dis.c ++++ b/opcodes/mips-dis.c +@@ -655,13 +655,11 @@ const struct mips_arch_choice mips_arch_choices[] = mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr), - mips_hwr_names_numeric }, + mips_cp1_names_mips3264, mips_hwr_names_numeric }, - /* XLP is mostly like XLR, with the prominent exception it is being - MIPS64R2. */ @@ -279,7 +277,7 @@ Index: binutils-2.24/opcodes/mips-dis.c - ISA_MIPS64R2 | INSN_XLR, 0, - mips_cp0_names_xlr, - mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr), -- mips_hwr_names_numeric }, +- mips_cp1_names_mips3264, mips_hwr_names_numeric }, + { "xlp", 1, bfd_mach_mips_xlp, CPU_XLP, + ISA_MIPS64R2 | INSN_XLP, 0, + mips_cp0_names_mips3264r2, @@ -288,11 +286,11 @@ Index: binutils-2.24/opcodes/mips-dis.c /* This entry, mips16, is here only for ISA/processor selection; do not print its name. */ -Index: binutils-2.24/opcodes/mips-opc.c -=================================================================== ---- binutils-2.24.orig/opcodes/mips-opc.c 2013-12-15 13:07:57.180399300 -0800 -+++ binutils-2.24/opcodes/mips-opc.c 2013-12-15 13:27:30.573724118 -0800 -@@ -262,7 +262,8 @@ +diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c +index 2c3bbad..86eb95b 100644 +--- a/opcodes/mips-opc.c ++++ b/opcodes/mips-opc.c +@@ -319,7 +319,8 @@ decode_mips_operand (const char *p) #define IOCT (INSN_OCTEON | INSN_OCTEONP | INSN_OCTEON2) #define IOCTP (INSN_OCTEONP | INSN_OCTEON2) #define IOCT2 INSN_OCTEON2 @@ -302,67 +300,69 @@ Index: binutils-2.24/opcodes/mips-opc.c #define IVIRT ASE_VIRT #define IVIRT64 ASE_VIRT64 -@@ -881,6 +882,7 @@ - {"cins", "t,r,+p,+S", 0x70000032, 0xfc00003f, WR_1|RD_2, 0, IOCT, 0, 0 }, - {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, 0 }, - {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, 0 }, +@@ -956,6 +957,7 @@ const struct mips_opcode mips_builtin_opcodes[] = + {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, + {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 }, + {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, +{"crc", "d,s,t", 0x7000001c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, XLP, 0, 0 }, - {"ctc0", "t,G", 0x40c00000, 0xffe007ff, RD_1|WR_CC|COD, 0, I1, 0, IOCT|IOCTP|IOCT2 }, - {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|COD|FP_S, 0, I1, 0, 0 }, - {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|COD|FP_S, 0, I1, 0, 0 }, -@@ -913,10 +915,11 @@ + /* ctc0 is at the bottom of the table. */ + {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, + {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, +@@ -988,12 +990,13 @@ const struct mips_opcode mips_builtin_opcodes[] = {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 }, {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 }, {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 }, -{"daddwc", "d,s,t", 0x70000038, 0xfc0007ff, WR_1|RD_2|RD_3|WR_C0|RD_C0, 0, XLR, 0, 0 }, +{"daddwc", "d,s,t", 0x70000038, 0xfc0007ff, WR_1|RD_2|RD_3|WR_C0|RD_C0, 0, XLR|XLP, 0, 0 }, {"dbreak", "", 0x7000003f, 0xffffffff, 0, 0, N5, 0, 0 }, - {"dclo", "U,s", 0x70000025, 0xfc0007ff, WR_1|RD_2, 0, I64|N55, 0, 0 }, - {"dclz", "U,s", 0x70000024, 0xfc0007ff, WR_1|RD_2, 0, I64|N55, 0, 0 }, + {"dclo", "d,s", 0x00000053, 0xfc1f07ff, WR_1|RD_2, 0, I69, 0, 0 }, + {"dclo", "U,s", 0x70000025, 0xfc0007ff, WR_1|RD_2, 0, I64|N55, 0, I69 }, + {"dclz", "d,s", 0x00000052, 0xfc1f07ff, WR_1|RD_2, 0, I69, 0, 0 }, + {"dclz", "U,s", 0x70000024, 0xfc0007ff, WR_1|RD_2, 0, I64|N55, 0, I69 }, +{"dcrc", "d,s,t", 0x7000001d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, XLP, 0, 0 }, /* dctr and dctw are used on the r5000. */ {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, -@@ -980,6 +983,7 @@ - {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LCD, 0, I64, 0, 0 }, - {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LCD, 0, 0, IVIRT64, 0 }, - {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LCD, 0, 0, IVIRT64, 0 }, +@@ -1065,6 +1068,7 @@ const struct mips_opcode mips_builtin_opcodes[] = + {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 }, + {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, + {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, +{"dmfur", "t,d", 0x7000001e, 0xffe007ff, WR_1, 0, XLP, 0, 0 }, {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 }, {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 }, - {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|COD, 0, I3, 0, EE }, -@@ -994,6 +998,8 @@ + {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE }, +@@ -1079,6 +1083,8 @@ const struct mips_opcode mips_builtin_opcodes[] = /* dmtc2 is at the bottom of the table. */ /* dmfc3 is at the bottom of the table. */ /* dmtc3 is at the bottom of the table. */ + {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, +{"dmtur", "t,d", 0x7000001f, 0xffe007ff, RD_1, 0, XLP, 0, 0 }, +{"dmul", "d,s,t", 0x70000006, 0xfc0007ff, WR_1|RD_2|RD_3, 0, XLP, 0, 0 }, + {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 }, - {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32 }, - {"dmul", "d,v,I", 0, (int) M_DMUL_I, INSN_MACRO, 0, I3, 0, M32 }, -@@ -1134,9 +1140,9 @@ - /* The macro has to be first to handle o32 correctly. */ +@@ -1229,9 +1235,9 @@ const struct mips_opcode mips_builtin_opcodes[] = + {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 }, {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 }, - {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3, 0, I3, 0, 0 }, --{"ldaddw", "t,b", 0x70000010, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR, 0, 0 }, --{"ldaddwu", "t,b", 0x70000011, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR, 0, 0 }, --{"ldaddd", "t,b", 0x70000012, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR, 0, 0 }, + {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 }, +-{"ldaddw", "t,b", 0x70000010, 0xfc00ffff, MOD_1|RD_2|LM|SM, 0, XLR, 0, 0 }, +-{"ldaddwu", "t,b", 0x70000011, 0xfc00ffff, MOD_1|RD_2|LM|SM, 0, XLR, 0, 0 }, +-{"ldaddd", "t,b", 0x70000012, 0xfc00ffff, MOD_1|RD_2|LM|SM, 0, XLR, 0, 0 }, +{"ldaddw", "t,b", 0x70000010, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 }, +{"ldaddwu", "t,b", 0x70000011, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 }, +{"ldaddd", "t,b", 0x70000012, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 }, {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF }, -@@ -1288,7 +1294,7 @@ +@@ -1396,7 +1402,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 }, {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 }, {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 }, --{"mfcr", "t,s", 0x70000018, 0xfc00ffff, WR_1, 0, XLR, 0, 0 }, +-{"mfcr", "t,s", 0x70000018, 0xfc00ffff, WR_1|RD_2, 0, XLR, 0, 0 }, +{"mfcr", "t,s", 0x70000018, 0xfc00ffff, WR_1, 0, XLR|XLP, 0, 0 }, {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 }, {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 }, {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 }, -@@ -1332,10 +1338,13 @@ +@@ -1441,10 +1447,13 @@ const struct mips_opcode mips_builtin_opcodes[] = /* move is at the top of the table. */ {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 }, {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 }, @@ -375,28 +375,28 @@ Index: binutils-2.24/opcodes/mips-opc.c +{"msgwait", "", 0, (int) M_MSGWAIT, INSN_MACRO, 0, XLR|XLP, 0, 0 }, +{"msgwait", "t", 0, (int) M_MSGWAIT_T,INSN_MACRO, 0, XLR|XLP, 0, 0 }, +{"msgsync", "", 0x4a000004, 0xffffffff,0, 0, XLP, 0, 0 }, - {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, 0 }, + {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 }, {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 }, {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 }, -@@ -1381,7 +1390,7 @@ +@@ -1494,7 +1503,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 }, {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 }, {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 }, --{"mtcr", "t,s", 0x70000019, 0xfc00ffff, RD_1, 0, XLR, 0, 0 }, +-{"mtcr", "t,s", 0x70000019, 0xfc00ffff, RD_1|RD_2, 0, XLR, 0, 0 }, +{"mtcr", "t,s", 0x70000019, 0xfc00ffff, RD_1, 0, XLR|XLP, 0, 0 }, {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, {"mtm2", "s", 0x7000000d, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, -@@ -1802,9 +1811,9 @@ - {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, 0}, +@@ -1924,9 +1933,9 @@ const struct mips_opcode mips_builtin_opcodes[] = + {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37}, {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 }, {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 }, --{"swapw", "t,b", 0x70000014, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR, 0, 0 }, --{"swapwu", "t,b", 0x70000015, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR, 0, 0 }, --{"swapd", "t,b", 0x70000016, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR, 0, 0 }, +-{"swapw", "t,b", 0x70000014, 0xfc00ffff, MOD_1|RD_2|LM|SM, 0, XLR, 0, 0 }, +-{"swapwu", "t,b", 0x70000015, 0xfc00ffff, MOD_1|RD_2|LM|SM, 0, XLR, 0, 0 }, +-{"swapd", "t,b", 0x70000016, 0xfc00ffff, MOD_1|RD_2|LM|SM, 0, XLR, 0, 0 }, +{"swapw", "t,b", 0x70000014, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 }, +{"swapwu", "t,b", 0x70000015, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 }, +{"swapd", "t,b", 0x70000016, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 }, - {"swc0", "E,o(b)", 0xe0000000, 0xfc000000, RD_3|RD_C0|SM, 0, I1, 0, IOCT|IOCTP|IOCT2 }, - {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, IOCT|IOCTP|IOCT2 }, + {"swc0", "E,o(b)", 0xe0000000, 0xfc000000, RD_3|RD_C0|SM, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, + {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, {"swc1", "T,o(b)", 0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S, 0, I1, 0, 0 }, diff --git a/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8484.patch b/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8484.patch deleted file mode 100644 index e789499477..0000000000 --- a/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8484.patch +++ /dev/null @@ -1,67 +0,0 @@ -Upstream-Status: Backport - -CVE-2014-8484 fix. - -[YOCTO #7084] - -Signed-off-by: Armin Kuster - -From bd25671c6f202c4a5108883caa2adb24ff6f361f Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Fri, 29 Aug 2014 10:36:29 +0930 -Subject: [PATCH] Report an error for S-records with less than the miniumum - size - - * srec.c (srec_scan): Revert last change. Report an error for - S-records with less than the miniumum byte count. ---- - bfd/ChangeLog | 5 +++++ - bfd/srec.c | 18 +++++++++++++++--- - 2 files changed, 20 insertions(+), 3 deletions(-) - -Index: binutils-2.24/bfd/srec.c -=================================================================== ---- binutils-2.24.orig/bfd/srec.c -+++ binutils-2.24/bfd/srec.c -@@ -455,7 +455,7 @@ srec_scan (bfd *abfd) - { - file_ptr pos; - char hdr[3]; -- unsigned int bytes; -+ unsigned int bytes, min_bytes; - bfd_vma address; - bfd_byte *data; - unsigned char check_sum; -@@ -478,6 +478,19 @@ srec_scan (bfd *abfd) - } - - check_sum = bytes = HEX (hdr + 1); -+ min_bytes = 3; -+ if (hdr[0] == '2' || hdr[0] == '8') -+ min_bytes = 4; -+ else if (hdr[0] == '3' || hdr[0] == '7') -+ min_bytes = 5; -+ if (bytes < min_bytes) -+ { -+ (*_bfd_error_handler) (_("%B:%d: byte count %d too small\n"), -+ abfd, lineno, bytes); -+ bfd_set_error (bfd_error_bad_value); -+ goto error_return; -+ } -+ - if (bytes * 2 > bufsize) - { - if (buf != NULL) -Index: binutils-2.24/bfd/ChangeLog -=================================================================== ---- binutils-2.24.orig/bfd/ChangeLog -+++ binutils-2.24/bfd/ChangeLog -@@ -1,3 +1,8 @@ -+2014-08-29 Alan Modra -+ -+ * srec.c (srec_scan): Revert last change. Report an error for -+ S-records with less than the miniumum byte count. -+ - 2013-12-02 Tristan Gingold - - * configure.in: Bump version to 2.24 diff --git a/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8485.patch b/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8485.patch deleted file mode 100644 index ec3308b4f4..0000000000 --- a/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8485.patch +++ /dev/null @@ -1,102 +0,0 @@ -Upstream-Status: Backport - -CVE-2014-8485 fix. - -[YOCTO #7084] - -Signed-off-by: Armin Kuster - -From 493a33860c71cac998f1a56d6d87d6faa801fbaa Mon Sep 17 00:00:00 2001 -From: Nick Clifton -Date: Mon, 27 Oct 2014 12:43:16 +0000 -Subject: [PATCH] This patch closes a potential security hole in applications - that use the bfd library to parse binaries containing maliciously corrupt - section group headers. - - PR binutils/17510 - * elf.c (setup_group): Improve handling of corrupt group - sections. ---- - bfd/ChangeLog | 6 ++++++ - bfd/elf.c | 34 ++++++++++++++++++++++++++++++---- - 2 files changed, 36 insertions(+), 4 deletions(-) - -Index: binutils-2.24/bfd/elf.c -=================================================================== ---- binutils-2.24.orig/bfd/elf.c -+++ binutils-2.24/bfd/elf.c -@@ -608,9 +608,10 @@ setup_group (bfd *abfd, Elf_Internal_Shd - if (shdr->contents == NULL) - { - _bfd_error_handler -- (_("%B: Corrupt size field in group section header: 0x%lx"), abfd, shdr->sh_size); -+ (_("%B: corrupt size field in group section header: 0x%lx"), abfd, shdr->sh_size); - bfd_set_error (bfd_error_bad_value); -- return FALSE; -+ -- num_group; -+ continue; - } - - memset (shdr->contents, 0, amt); -@@ -618,7 +619,16 @@ setup_group (bfd *abfd, Elf_Internal_Shd - if (bfd_seek (abfd, shdr->sh_offset, SEEK_SET) != 0 - || (bfd_bread (shdr->contents, shdr->sh_size, abfd) - != shdr->sh_size)) -- return FALSE; -+ { -+ _bfd_error_handler -+ (_("%B: invalid size field in group section header: 0x%lx"), abfd, shdr->sh_size); -+ bfd_set_error (bfd_error_bad_value); -+ -- num_group; -+ /* PR 17510: If the group contents are even partially -+ corrupt, do not allow any of the contents to be used. */ -+ memset (shdr->contents, 0, amt); -+ continue; -+ } - - /* Translate raw contents, a flag word followed by an - array of elf section indices all in target byte order, -@@ -651,6 +661,21 @@ setup_group (bfd *abfd, Elf_Internal_Shd - } - } - } -+ -+ /* PR 17510: Corrupt binaries might contain invalid groups. */ -+ if (num_group != (unsigned) elf_tdata (abfd)->num_group) -+ { -+ elf_tdata (abfd)->num_group = num_group; -+ -+ /* If all groups are invalid then fail. */ -+ if (num_group == 0) -+ { -+ elf_tdata (abfd)->group_sect_ptr = NULL; -+ elf_tdata (abfd)->num_group = num_group = -1; -+ (*_bfd_error_handler) (_("%B: no valid group sections found"), abfd); -+ bfd_set_error (bfd_error_bad_value); -+ } -+ } - } - } - -@@ -716,6 +741,7 @@ setup_group (bfd *abfd, Elf_Internal_Shd - { - (*_bfd_error_handler) (_("%B: no group info for section %A"), - abfd, newsect); -+ return FALSE; - } - return TRUE; - } -Index: binutils-2.24/bfd/ChangeLog -=================================================================== ---- binutils-2.24.orig/bfd/ChangeLog -+++ binutils-2.24/bfd/ChangeLog -@@ -1,3 +1,9 @@ -+2014-10-27 Nick Clifton -+ -+ PR binutils/17510 -+ * elf.c (setup_group): Improve handling of corrupt group -+ sections. -+ - 2014-08-29 Alan Modra - - * srec.c (srec_scan): Revert last change. Report an error for diff --git a/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8501.patch b/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8501.patch deleted file mode 100644 index a48fe9b23b..0000000000 --- a/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8501.patch +++ /dev/null @@ -1,60 +0,0 @@ -Upstream-Status: Backport - -CVE-2014-8501 fix. - -[YOCTO #7084] - -Signed-off-by: Armin Kuster - -From 7e1e19887abd24aeb15066b141cdff5541e0ec8e Mon Sep 17 00:00:00 2001 -From: Nick Clifton -Date: Mon, 27 Oct 2014 14:45:06 +0000 -Subject: [PATCH] Fix a seg-fault in strings and other binutuils when parsing a - corrupt PE executable with an invalid value in the NumberOfRvaAndSizes field - of the AOUT header. - - PR binutils/17512 - * peXXigen.c (_bfd_XXi_swap_aouthdr_in): Handle corrupt binaries - with an invalid value for NumberOfRvaAndSizes. ---- - bfd/ChangeLog | 4 ++++ - bfd/peXXigen.c | 12 ++++++++++++ - 2 files changed, 16 insertions(+) - -Index: binutils-2.24/bfd/peXXigen.c -=================================================================== ---- binutils-2.24.orig/bfd/peXXigen.c -+++ binutils-2.24/bfd/peXXigen.c -@@ -460,6 +460,18 @@ _bfd_XXi_swap_aouthdr_in (bfd * abfd, - { - int idx; - -+ /* PR 17512: Corrupt PE binaries can cause seg-faults. */ -+ if (a->NumberOfRvaAndSizes > 16) -+ { -+ (*_bfd_error_handler) -+ (_("%B: aout header specifies an invalid number of data-directory entries: %d"), -+ abfd, a->NumberOfRvaAndSizes); -+ /* Paranoia: If the number is corrupt, then assume that the -+ actual entries themselves might be corrupt as well. */ -+ a->NumberOfRvaAndSizes = 0; -+ } -+ -+ - for (idx = 0; idx < a->NumberOfRvaAndSizes; idx++) - { - /* If data directory is empty, rva also should be 0. */ -Index: binutils-2.24/bfd/ChangeLog -=================================================================== ---- binutils-2.24.orig/bfd/ChangeLog -+++ binutils-2.24/bfd/ChangeLog -@@ -1,5 +1,9 @@ - 2014-10-27 Nick Clifton - -+ PR binutils/17512 -+ * peXXigen.c (_bfd_XXi_swap_aouthdr_in): Handle corrupt binaries -+ with an invalid value for NumberOfRvaAndSizes. -+ - PR binutils/17510 - * elf.c (setup_group): Improve handling of corrupt group - sections. diff --git a/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8502.patch b/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8502.patch deleted file mode 100644 index 05af65bad1..0000000000 --- a/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8502.patch +++ /dev/null @@ -1,89 +0,0 @@ -Upstream-Status: Backport - -CVE-2014-8502 fix. - -[YOCTO #7084] - -Signed-off-by: Armin Kuster - -From 5a4b0ccc20ba30caef53b01bee2c0aaa5b855339 Mon Sep 17 00:00:00 2001 -From: Nick Clifton -Date: Tue, 28 Oct 2014 15:42:56 +0000 -Subject: [PATCH] More fixes for corrupt binaries crashing the binutils. - - PR binutils/17512 - * elf.c (bfd_section_from_shdr): Allocate and free the recursion - detection table on a per-bfd basis. - * peXXigen.c (pe_print_edata): Handle binaries with a truncated - export table. ---- - bfd/ChangeLog | 8 ++++++++ - bfd/elf.c | 16 +++++++++++++--- - bfd/peXXigen.c | 9 +++++++++ - 3 files changed, 30 insertions(+), 3 deletions(-) - -Index: binutils-2.24/bfd/peXXigen.c -=================================================================== ---- binutils-2.24.orig/bfd/peXXigen.c -+++ binutils-2.24/bfd/peXXigen.c -@@ -1438,6 +1438,15 @@ pe_print_edata (bfd * abfd, void * vfile - } - } - -+ /* PR 17512: Handle corrupt PE binaries. */ -+ if (datasize < 36) -+ { -+ fprintf (file, -+ _("\nThere is an export table in %s, but it is too small (%d)\n"), -+ section->name, (int) datasize); -+ return TRUE; -+ } -+ - fprintf (file, _("\nThere is an export table in %s at 0x%lx\n"), - section->name, (unsigned long) addr); - -Index: binutils-2.24/bfd/elf.c -=================================================================== ---- binutils-2.24.orig/bfd/elf.c -+++ binutils-2.24/bfd/elf.c -@@ -1576,6 +1576,7 @@ bfd_section_from_shdr (bfd *abfd, unsign - const char *name; - bfd_boolean ret = TRUE; - static bfd_boolean * sections_being_created = NULL; -+ static bfd * sections_being_created_abfd = NULL; - static unsigned int nesting = 0; - - if (shindex >= elf_numsections (abfd)) -@@ -1588,13 +1589,20 @@ bfd_section_from_shdr (bfd *abfd, unsign - loop. Detect this here, by refusing to load a section that we are - already in the process of loading. We only trigger this test if - we have nested at least three sections deep as normal ELF binaries -- can expect to recurse at least once. */ -+ can expect to recurse at least once. -+ -+ FIXME: It would be better if this array was attached to the bfd, -+ rather than being held in a static pointer. */ -+ -+ if (sections_being_created_abfd != abfd) -+ sections_being_created = NULL; - - if (sections_being_created == NULL) - { - /* FIXME: It would be more efficient to attach this array to the bfd somehow. */ - sections_being_created = (bfd_boolean *) - bfd_zalloc (abfd, elf_numsections (abfd) * sizeof (bfd_boolean)); -+ sections_being_created_abfd = abfd; - } - if (sections_being_created [shindex]) - { -@@ -2098,7 +2106,10 @@ bfd_section_from_shdr (bfd *abfd, unsign - if (sections_being_created) - sections_being_created [shindex] = FALSE; - if (-- nesting == 0) -+ { - sections_being_created = NULL; -+ sections_being_created_abfd = abfd; -+ } - return ret; - } - diff --git a/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8502_1.patch b/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8502_1.patch deleted file mode 100644 index 9e0c9c8b3c..0000000000 --- a/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8502_1.patch +++ /dev/null @@ -1,523 +0,0 @@ -Upstream-Status: Backport - -CVE-2014-8502 supporting patch. - -[YOCTO #7084] - -Signed-off-by: Armin Kuster - -From bf67003b4567600ed3022a439207ac8f26454f91 Mon Sep 17 00:00:00 2001 -From: Nick Clifton -Date: Mon, 27 Oct 2014 18:05:37 +0000 -Subject: [PATCH] This fixes more seg-faults in tools like "strings" and - "objdump" when presented with corrupt binaries. - - PR binutils/17512 - * elf.c (bfd_section_from_shdr): Detect and warn about ELF - binaries with a group of sections linked by the string table - indicies. - * peXXigen.c (pe_print_edata): Detect out of range rvas and - entry counts for the Export Address table, Name Pointer table - and Ordinal table. ---- - bfd/ChangeLog | 5 ++ - bfd/elf.c | 194 ++++++++++++++++++++++++++++++++++++++------------------- - bfd/peXXigen.c | 18 +++++- - 3 files changed, 150 insertions(+), 67 deletions(-) - -Index: binutils-2.24/bfd/elf.c -=================================================================== ---- binutils-2.24.orig/bfd/elf.c -+++ binutils-2.24/bfd/elf.c -@@ -1574,38 +1574,67 @@ bfd_section_from_shdr (bfd *abfd, unsign - Elf_Internal_Ehdr *ehdr; - const struct elf_backend_data *bed; - const char *name; -+ bfd_boolean ret = TRUE; -+ static bfd_boolean * sections_being_created = NULL; -+ static unsigned int nesting = 0; - - if (shindex >= elf_numsections (abfd)) - return FALSE; - -+ if (++ nesting > 3) -+ { -+ /* PR17512: A corrupt ELF binary might contain a recursive group of -+ sections, each the string indicies pointing to the next in the -+ loop. Detect this here, by refusing to load a section that we are -+ already in the process of loading. We only trigger this test if -+ we have nested at least three sections deep as normal ELF binaries -+ can expect to recurse at least once. */ -+ -+ if (sections_being_created == NULL) -+ { -+ /* FIXME: It would be more efficient to attach this array to the bfd somehow. */ -+ sections_being_created = (bfd_boolean *) -+ bfd_zalloc (abfd, elf_numsections (abfd) * sizeof (bfd_boolean)); -+ } -+ if (sections_being_created [shindex]) -+ { -+ (*_bfd_error_handler) -+ (_("%B: warning: loop in section dependencies detected"), abfd); -+ return FALSE; -+ } -+ sections_being_created [shindex] = TRUE; -+ } -+ - hdr = elf_elfsections (abfd)[shindex]; - ehdr = elf_elfheader (abfd); - name = bfd_elf_string_from_elf_section (abfd, ehdr->e_shstrndx, - hdr->sh_name); - if (name == NULL) -- return FALSE; -+ goto fail; - - bed = get_elf_backend_data (abfd); - switch (hdr->sh_type) - { - case SHT_NULL: - /* Inactive section. Throw it away. */ -- return TRUE; -+ goto success; - -- case SHT_PROGBITS: /* Normal section with contents. */ -- case SHT_NOBITS: /* .bss section. */ -- case SHT_HASH: /* .hash section. */ -- case SHT_NOTE: /* .note section. */ -+ case SHT_PROGBITS: /* Normal section with contents. */ -+ case SHT_NOBITS: /* .bss section. */ -+ case SHT_HASH: /* .hash section. */ -+ case SHT_NOTE: /* .note section. */ - case SHT_INIT_ARRAY: /* .init_array section. */ - case SHT_FINI_ARRAY: /* .fini_array section. */ - case SHT_PREINIT_ARRAY: /* .preinit_array section. */ - case SHT_GNU_LIBLIST: /* .gnu.liblist section. */ - case SHT_GNU_HASH: /* .gnu.hash section. */ -- return _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex); -+ ret = _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex); -+ goto success; - - case SHT_DYNAMIC: /* Dynamic linking information. */ - if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex)) -- return FALSE; -+ goto fail; -+ - if (hdr->sh_link > elf_numsections (abfd)) - { - /* PR 10478: Accept Solaris binaries with a sh_link -@@ -1619,11 +1648,11 @@ bfd_section_from_shdr (bfd *abfd, unsign - break; - /* Otherwise fall through. */ - default: -- return FALSE; -+ goto fail; - } - } - else if (elf_elfsections (abfd)[hdr->sh_link] == NULL) -- return FALSE; -+ goto fail; - else if (elf_elfsections (abfd)[hdr->sh_link]->sh_type != SHT_STRTAB) - { - Elf_Internal_Shdr *dynsymhdr; -@@ -1652,24 +1681,26 @@ bfd_section_from_shdr (bfd *abfd, unsign - } - } - } -- break; -+ goto success; - -- case SHT_SYMTAB: /* A symbol table */ -+ case SHT_SYMTAB: /* A symbol table. */ - if (elf_onesymtab (abfd) == shindex) -- return TRUE; -+ goto success; - - if (hdr->sh_entsize != bed->s->sizeof_sym) -- return FALSE; -+ goto fail; -+ - if (hdr->sh_info * hdr->sh_entsize > hdr->sh_size) - { - if (hdr->sh_size != 0) -- return FALSE; -+ goto fail; - /* Some assemblers erroneously set sh_info to one with a - zero sh_size. ld sees this as a global symbol count - of (unsigned) -1. Fix it here. */ - hdr->sh_info = 0; -- return TRUE; -+ goto success; - } -+ - BFD_ASSERT (elf_onesymtab (abfd) == 0); - elf_onesymtab (abfd) = shindex; - elf_tdata (abfd)->symtab_hdr = *hdr; -@@ -1686,7 +1717,7 @@ bfd_section_from_shdr (bfd *abfd, unsign - && (abfd->flags & DYNAMIC) != 0 - && ! _bfd_elf_make_section_from_shdr (abfd, hdr, name, - shindex)) -- return FALSE; -+ goto fail; - - /* Go looking for SHT_SYMTAB_SHNDX too, since if there is one we - can't read symbols without that section loaded as well. It -@@ -1712,26 +1743,29 @@ bfd_section_from_shdr (bfd *abfd, unsign - break; - } - if (i != shindex) -- return bfd_section_from_shdr (abfd, i); -+ ret = bfd_section_from_shdr (abfd, i); - } -- return TRUE; -+ goto success; - -- case SHT_DYNSYM: /* A dynamic symbol table */ -+ case SHT_DYNSYM: /* A dynamic symbol table. */ - if (elf_dynsymtab (abfd) == shindex) -- return TRUE; -+ goto success; - - if (hdr->sh_entsize != bed->s->sizeof_sym) -- return FALSE; -+ goto fail; -+ - if (hdr->sh_info * hdr->sh_entsize > hdr->sh_size) - { - if (hdr->sh_size != 0) -- return FALSE; -+ goto fail; -+ - /* Some linkers erroneously set sh_info to one with a - zero sh_size. ld sees this as a global symbol count - of (unsigned) -1. Fix it here. */ - hdr->sh_info = 0; -- return TRUE; -+ goto success; - } -+ - BFD_ASSERT (elf_dynsymtab (abfd) == 0); - elf_dynsymtab (abfd) = shindex; - elf_tdata (abfd)->dynsymtab_hdr = *hdr; -@@ -1740,34 +1774,38 @@ bfd_section_from_shdr (bfd *abfd, unsign - - /* Besides being a symbol table, we also treat this as a regular - section, so that objcopy can handle it. */ -- return _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex); -+ ret = _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex); -+ goto success; - -- case SHT_SYMTAB_SHNDX: /* Symbol section indices when >64k sections */ -+ case SHT_SYMTAB_SHNDX: /* Symbol section indices when >64k sections. */ - if (elf_symtab_shndx (abfd) == shindex) -- return TRUE; -+ goto success; - - BFD_ASSERT (elf_symtab_shndx (abfd) == 0); - elf_symtab_shndx (abfd) = shindex; - elf_tdata (abfd)->symtab_shndx_hdr = *hdr; - elf_elfsections (abfd)[shindex] = &elf_tdata (abfd)->symtab_shndx_hdr; -- return TRUE; -+ goto success; - -- case SHT_STRTAB: /* A string table */ -+ case SHT_STRTAB: /* A string table. */ - if (hdr->bfd_section != NULL) -- return TRUE; -+ goto success; -+ - if (ehdr->e_shstrndx == shindex) - { - elf_tdata (abfd)->shstrtab_hdr = *hdr; - elf_elfsections (abfd)[shindex] = &elf_tdata (abfd)->shstrtab_hdr; -- return TRUE; -+ goto success; - } -+ - if (elf_elfsections (abfd)[elf_onesymtab (abfd)]->sh_link == shindex) - { - symtab_strtab: - elf_tdata (abfd)->strtab_hdr = *hdr; - elf_elfsections (abfd)[shindex] = &elf_tdata (abfd)->strtab_hdr; -- return TRUE; -+ goto success; - } -+ - if (elf_elfsections (abfd)[elf_dynsymtab (abfd)]->sh_link == shindex) - { - dynsymtab_strtab: -@@ -1776,8 +1814,9 @@ bfd_section_from_shdr (bfd *abfd, unsign - elf_elfsections (abfd)[shindex] = hdr; - /* We also treat this as a regular section, so that objcopy - can handle it. */ -- return _bfd_elf_make_section_from_shdr (abfd, hdr, name, -- shindex); -+ ret = _bfd_elf_make_section_from_shdr (abfd, hdr, name, -+ shindex); -+ goto success; - } - - /* If the string table isn't one of the above, then treat it as a -@@ -1795,9 +1834,9 @@ bfd_section_from_shdr (bfd *abfd, unsign - { - /* Prevent endless recursion on broken objects. */ - if (i == shindex) -- return FALSE; -+ goto fail; - if (! bfd_section_from_shdr (abfd, i)) -- return FALSE; -+ goto fail; - if (elf_onesymtab (abfd) == i) - goto symtab_strtab; - if (elf_dynsymtab (abfd) == i) -@@ -1805,7 +1844,8 @@ bfd_section_from_shdr (bfd *abfd, unsign - } - } - } -- return _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex); -+ ret = _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex); -+ goto success; - - case SHT_REL: - case SHT_RELA: -@@ -1820,7 +1860,7 @@ bfd_section_from_shdr (bfd *abfd, unsign - if (hdr->sh_entsize - != (bfd_size_type) (hdr->sh_type == SHT_REL - ? bed->s->sizeof_rel : bed->s->sizeof_rela)) -- return FALSE; -+ goto fail; - - /* Check for a bogus link to avoid crashing. */ - if (hdr->sh_link >= num_sec) -@@ -1828,8 +1868,9 @@ bfd_section_from_shdr (bfd *abfd, unsign - ((*_bfd_error_handler) - (_("%B: invalid link %lu for reloc section %s (index %u)"), - abfd, hdr->sh_link, name, shindex)); -- return _bfd_elf_make_section_from_shdr (abfd, hdr, name, -- shindex); -+ ret = _bfd_elf_make_section_from_shdr (abfd, hdr, name, -+ shindex); -+ goto success; - } - - /* For some incomprehensible reason Oracle distributes -@@ -1870,7 +1911,7 @@ bfd_section_from_shdr (bfd *abfd, unsign - if ((elf_elfsections (abfd)[hdr->sh_link]->sh_type == SHT_SYMTAB - || elf_elfsections (abfd)[hdr->sh_link]->sh_type == SHT_DYNSYM) - && ! bfd_section_from_shdr (abfd, hdr->sh_link)) -- return FALSE; -+ goto fail; - - /* If this reloc section does not use the main symbol table we - don't treat it as a reloc section. BFD can't adequately -@@ -1885,14 +1926,18 @@ bfd_section_from_shdr (bfd *abfd, unsign - || hdr->sh_info >= num_sec - || elf_elfsections (abfd)[hdr->sh_info]->sh_type == SHT_REL - || elf_elfsections (abfd)[hdr->sh_info]->sh_type == SHT_RELA) -- return _bfd_elf_make_section_from_shdr (abfd, hdr, name, -- shindex); -+ { -+ ret = _bfd_elf_make_section_from_shdr (abfd, hdr, name, -+ shindex); -+ goto success; -+ } - - if (! bfd_section_from_shdr (abfd, hdr->sh_info)) -- return FALSE; -+ goto fail; -+ - target_sect = bfd_section_from_elf_index (abfd, hdr->sh_info); - if (target_sect == NULL) -- return FALSE; -+ goto fail; - - esdt = elf_section_data (target_sect); - if (hdr->sh_type == SHT_RELA) -@@ -1904,7 +1949,7 @@ bfd_section_from_shdr (bfd *abfd, unsign - amt = sizeof (*hdr2); - hdr2 = (Elf_Internal_Shdr *) bfd_alloc (abfd, amt); - if (hdr2 == NULL) -- return FALSE; -+ goto fail; -