binutils: Upgrade to 2.33.1
PATCH 1/1 binutils: Upgrade to 2.33.1
Drop CVE patches which are already available on binutils-2_33-branch Forward port rest of the patches
---
meta/conf/distro/include/tcmode-default.inc | 2 +-
.../{binutils-2.32.inc => binutils-2.33.inc} | 16 +-
....32.bb => binutils-cross-canadian_2.33.bb} | 0
...32.bb => binutils-cross-testsuite_2.33.bb} | 0
...s-cross_2.32.bb => binutils-cross_2.33.bb} | 0
...ssdk_2.32.bb => binutils-crosssdk_2.33.bb} | 0
...s-crosssdk-Generate-relocatable-SDKs.patch | 27 +-
...o-not-generate-linker-script-directo.patch | 12 +-
...iden-the-regexp-for-SH-architectures.patch | 13 +-
...004-Point-scripts-location-to-libdir.patch | 15 +-
...-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | 16 +-
.../binutils/0006-Use-libtool-2.4.patch | 1247 ++++++++---------
...stro-compiler-point-to-the-wrong-ins.patch | 9 +-
...-system-directories-when-cross-linki.patch | 60 +-
...h-in-libtool-when-sysroot-is-enabled.patch | 7 +-
...e-default-emulation-for-mips64-linux.patch | 14 +-
.../0011-Add-support-for-Netlogic-XLP.patch | 99 +-
...ect-assembling-for-ppc-wait-mnemonic.patch | 13 +-
.../0013-Detect-64-bit-MIPS-targets.patch | 7 +-
.../0014-sync-with-OE-libtool-changes.patch | 7 +-
...x86_64-pep-for-producing-EFI-binarie.patch | 15 +-
.../binutils/binutils/CVE-2019-12972.patch | 51 -
.../binutils/binutils/CVE-2019-14250.patch | 33 -
.../binutils/binutils/CVE-2019-14444.patch | 28 -
.../binutils/binutils/CVE-2019-17450.patch | 17 +-
.../binutils/binutils/CVE-2019-17451.patch | 7 +-
.../binutils/binutils/CVE-2019-9071.patch | 165 ---
.../binutils/binutils/CVE-2019-9074.patch | 68 -
.../binutils/binutils/CVE-2019-9075.patch | 119 --
.../binutils/binutils/CVE-2019-9076.patch | 49 -
.../binutils/binutils/CVE-2019-9077.patch | 37 -
.../{binutils_2.32.bb => binutils_2.33.bb} | 0
32 files changed, 719 insertions(+), 1434 deletions(-)
rename meta/recipes-devtools/binutils/{binutils-2.32.inc => binutils-2.33.inc} (84%)
rename meta/recipes-devtools/binutils/{binutils-cross-canadian_2.32.bb => binutils-cross-canadian_2.33.bb} (100%)
rename meta/recipes-devtools/binutils/{binutils-cross-testsuite_2.32.bb => binutils-cross-testsuite_2.33.bb} (100%)
rename meta/recipes-devtools/binutils/{binutils-cross_2.32.bb => binutils-cross_2.33.bb} (100%)
rename meta/recipes-devtools/binutils/{binutils-crosssdk_2.32.bb => binutils-crosssdk_2.33.bb} (100%)
delete mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-12972.patch
delete mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-14250.patch
delete mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-14444.patch
delete mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-9071.patch
delete mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-9074.patch
delete mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-9075.patch
delete mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-9076.patch
delete mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-9077.patch
rename meta/recipes-devtools/binutils/{binutils_2.32.bb => binutils_2.33.bb} (100%)meta/conf/distro/include/tcmode-default.inc +1 -1
@@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" -BINUVERSION ?= "2.32%" +BINUVERSION ?= "2.33%" GDBVERSION ?= "8.3%" GLIBCVERSION ?= "2.30%" LINUXLIBCVERSION ?= "5.2%"
meta/recipes-devtools/binutils/binutils-2.33.inc renamed from meta/recipes-devtools/binutils/binutils-2.32.inc +4 -12
@@ -16,15 +16,15 @@ def binutils_branch_version(d): # When upgrading to 2.33, please make sure there is no trailing .0, so # that upstream version check can work correctly. -PV = "2.32.0" -CVE_VERSION = "2.32" +PV = "2.33.1" +CVE_VERSION = "2.33" BINUPV = "${@binutils_branch_version(d)}" #BRANCH = "binutils-${BINUPV}-branch" -BRANCH ?= "binutils-2_32-branch" +BRANCH ?= "binutils-2_33-branch" UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" -SRCREV ?= "b8c1f608db9ef3edd483d21a921d1fbedc71df6f" +SRCREV ?= "c656f9a430636a6a7fc7a08c0e08f0098a729a02" BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git" SRC_URI = "\ ${BINUTILS_GIT_URI} \
@@ -41,14 +41,6 @@ SRC_URI = "\ file://0013-Detect-64-bit-MIPS-targets.patch \ file://0014-sync-with-OE-libtool-changes.patch \ file://0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch \ - file://CVE-2019-9074.patch \ - file://CVE-2019-9075.patch \ - file://CVE-2019-9076.patch \ - file://CVE-2019-9077.patch \ - file://CVE-2019-9071.patch \ - file://CVE-2019-12972.patch \ - file://CVE-2019-14250.patch \ - file://CVE-2019-14444.patch \ file://CVE-2019-17450.patch \ file://CVE-2019-17451.patch \ "
meta/recipes-devtools/binutils/binutils-cross-canadian_2.33.bb renamed from meta/recipes-devtools/binutils/binutils-cross-canadian_2.32.bb +0 -0
meta/recipes-devtools/binutils/binutils-cross-testsuite_2.33.bb renamed from meta/recipes-devtools/binutils/binutils-cross-testsuite_2.32.bb +0 -0
meta/recipes-devtools/binutils/binutils-cross_2.33.bb renamed from meta/recipes-devtools/binutils/binutils-cross_2.32.bb +0 -0
meta/recipes-devtools/binutils/binutils-crosssdk_2.33.bb renamed from meta/recipes-devtools/binutils/binutils-crosssdk_2.32.bb +0 -0
meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch +12 -15
@@ -1,7 +1,7 @@ -From 5bcd884f8af5106d0fa380c42cffe07f3c993ed2 Mon Sep 17 00:00:00 2001 +From c9aed4cb3c02715b2ba1fc70949043849f202f46 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> -Date: Mon, 2 Mar 2015 01:58:54 +0000 -Subject: [PATCH 01/15] binutils-crosssdk: Generate relocatable SDKs +Date: Sun, 8 Dec 2019 00:31:35 -0800 +Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs This patch will modify the ELF linker scripts so that the crosssdk linker will generate binaries with a 4096 bytes PT_INTERP section. When the binaries
@@ -18,35 +18,35 @@ Signed-off-by: Khem Raj <[email protected]> 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ld/genscripts.sh b/ld/genscripts.sh -index 77ddbbc8f8..d789e77943 100755 +index cb2b081e9e..db2e9fd569 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh -@@ -310,6 +310,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" +@@ -325,6 +325,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" LD_FLAG=r DATA_ALIGNMENT=${DATA_ALIGNMENT_r} DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" +PARTIAL_LINKING=" " ( echo "/* Script for ld -r: link without relocation */" - . ${CUSTOMIZER_SCRIPT} - . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc -@@ -318,10 +319,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" + source_sh ${CUSTOMIZER_SCRIPT} + source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc +@@ -333,10 +334,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" LD_FLAG=u DATA_ALIGNMENT=${DATA_ALIGNMENT_u} CONSTRUCTING=" " +PARTIAL_LINKING=" " ( echo "/* Script for ld -Ur: link w/out relocation, do create constructors */" - . ${CUSTOMIZER_SCRIPT} - . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc + source_sh ${CUSTOMIZER_SCRIPT} + source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xu +unset PARTIAL_LINKING DATA_ALIGNMENT=${DATA_ALIGNMENT_} RELOCATING=" " diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc -index bd7584120e..8bbe052d4b 100644 +index f9f0f7d402..9e469dca86 100644 --- a/ld/scripttempl/elf.sc +++ b/ld/scripttempl/elf.sc -@@ -139,8 +139,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then +@@ -140,8 +140,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then DATA_SEGMENT_RELRO_END=". = DATA_SEGMENT_RELRO_END (${SEPARATE_GOTPLT-0}, .);" fi fi
@@ -57,6 +57,3 @@ index bd7584120e..8bbe052d4b 100644 fi if test -z "$PLT"; then IPLT=".iplt ${RELOCATING-0} : { *(.iplt) }" --- -2.20.1 -
meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch +4 -8
@@ -1,8 +1,7 @@ -From 11927913560fc5a5d51af3bc5eb8ad62a86c9840 Mon Sep 17 00:00:00 2001 +From 9fe5a2dd03fdf2986c89dd58ae48c0095f1c0411 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 6 Mar 2017 23:37:05 -0800 -Subject: [PATCH 02/15] binutils-cross: Do not generate linker script - directories +Subject: [PATCH] binutils-cross: Do not generate linker script directories We don't place target libraries within ${exec_prefix}, we'd always place these within the target sysroot within the standard library directories. Worse, the
@@ -23,10 +22,10 @@ Signed-off-by: Khem Raj <[email protected]> 1 file changed, 25 deletions(-) diff --git a/ld/genscripts.sh b/ld/genscripts.sh -index d789e77943..144e2e8736 100755 +index c90f38a63c..97ad1a24d6 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh -@@ -220,31 +220,6 @@ append_to_lib_path() +@@ -235,31 +235,6 @@ append_to_lib_path() fi }
@@ -58,6 +57,3 @@ index d789e77943..144e2e8736 100755 if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then libs=${NATIVE_LIB_DIRS} if [ "x${NATIVE}" = "xyes" ] ; then --- -2.20.1 -
meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch +5 -8
@@ -1,7 +1,7 @@ -From da3939de6fb36da2c6484f14f08a37be195d9dc3 Mon Sep 17 00:00:00 2001 +From aecded290b2ec0b469c70fc6b062bd5ee6ba5e3a Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 2 Mar 2015 01:07:33 +0000 -Subject: [PATCH 03/15] configure: widen the regexp for SH architectures +Subject: [PATCH] configure: widen the regexp for SH architectures gprof needs to know about uclibc
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <[email protected]> 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configure b/configure -index 3747645961..78b5240101 100755 +index 6a9719f609..001523eebf 100755 --- a/configure +++ b/configure -@@ -3861,7 +3861,7 @@ case "${target}" in +@@ -3865,7 +3865,7 @@ case "${target}" in nvptx*-*-*) noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" ;;
@@ -27,7 +27,7 @@ index 3747645961..78b5240101 100755 sh*-*-elf) ;; diff --git a/gprof/configure b/gprof/configure -index f84efaba20..ab32bab2b6 100755 +index cbb3aced46..b5eabceb77 100755 --- a/gprof/configure +++ b/gprof/configure @@ -6162,6 +6162,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
@@ -42,6 +42,3 @@ index f84efaba20..ab32bab2b6 100755 netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' --- -2.20.1 -
meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch +6 -9
@@ -1,7 +1,7 @@ -From fc1ff860fd88fa2d0584bd19181c880a76331a8d Mon Sep 17 00:00:00 2001 +From a9332107872ada73e72e92872ea2998a4e1495e0 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 2 Mar 2015 01:09:58 +0000 -Subject: [PATCH 04/15] Point scripts location to libdir +Subject: [PATCH] Point scripts location to libdir Upstream-Status: Inappropriate [debian patch]
@@ -12,10 +12,10 @@ Signed-off-by: Khem Raj <[email protected]> 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ld/Makefile.am b/ld/Makefile.am -index c2c798b4fe..d7faf19271 100644 +index ddc7a78368..6fa7bf2583 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am -@@ -57,7 +57,7 @@ endif +@@ -63,7 +63,7 @@ endif # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers.
@@ -25,10 +25,10 @@ index c2c798b4fe..d7faf19271 100644 EMUL = @EMUL@ EMULATION_OFILES = @EMULATION_OFILES@ diff --git a/ld/Makefile.in b/ld/Makefile.in -index fc687fc516..8b14f5236c 100644 +index fdf06128b2..5c108b9e05 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in -@@ -563,7 +563,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) +@@ -572,7 +572,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers.
@@ -37,6 +37,3 @@ index fc687fc516..8b14f5236c 100644 BASEDIR = $(srcdir)/.. BFDDIR = $(BASEDIR)/bfd INCDIR = $(BASEDIR)/include --- -2.20.1 -
meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch +5 -11
@@ -1,8 +1,7 @@ -From 66861bff389434e3454c7650ee29fade7a1cc5ed Mon Sep 17 00:00:00 2001 +From 65fb7a33aba30dec8690e0a237efaa3b9649154c Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 2 Mar 2015 01:27:17 +0000 -Subject: [PATCH 05/15] Only generate an RPATH entry if LD_RUN_PATH is not - empty +Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty for cases where -rpath isn't specified. debian (#151024)
@@ -14,20 +13,18 @@ Signed-off-by: Khem Raj <[email protected]> ld/emultempl/elf32.em | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em -index f4f7ad6b4e..cfd787ff28 100644 --- a/ld/emultempl/elf32.em +++ b/ld/emultempl/elf32.em -@@ -1471,6 +1471,8 @@ fragment <<EOF +@@ -1470,6 +1470,8 @@ fragment <<EOF && command_line.rpath == NULL) { path = (const char *) getenv ("LD_RUN_PATH"); + if ((path) && (strlen (path) == 0)) -+ path = NULL; ++ path = NULL; if (path && gld${EMULATION_NAME}_search_needed (path, &n, force)) break; -@@ -1746,6 +1748,8 @@ gld${EMULATION_NAME}_before_allocation (void) +@@ -1745,6 +1747,8 @@ gld${EMULATION_NAME}_before_allocation ( rpath = command_line.rpath; if (rpath == NULL) rpath = (const char *) getenv ("LD_RUN_PATH");
@@ -36,6 +33,3 @@ index f4f7ad6b4e..cfd787ff28 100644 for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) --- -2.20.1 -
meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch +599 -648
2,758 lines not on this page · raw message
meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch +3 -6
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch +19 -41
60 lines not on this page · raw message
meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch +2 -5
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch +5 -9
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch +34 -65
99 lines not on this page · raw message
meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch +5 -8
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch +2 -5
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch +2 -5
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch +4 -11
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/binutils/binutils/CVE-2019-12972.patch deleted +0 -51
51 lines not on this page · raw message
meta/recipes-devtools/binutils/binutils/CVE-2019-14250.patch deleted +0 -33
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/binutils/binutils/CVE-2019-14444.patch deleted +0 -28
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch +6 -11
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch +1 -6
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/binutils/binutils/CVE-2019-9071.patch deleted +0 -165
165 lines not on this page · raw message
meta/recipes-devtools/binutils/binutils/CVE-2019-9074.patch deleted +0 -68
68 lines not on this page · raw message
meta/recipes-devtools/binutils/binutils/CVE-2019-9075.patch deleted +0 -119
119 lines not on this page · raw message
meta/recipes-devtools/binutils/binutils/CVE-2019-9076.patch deleted +0 -49
49 lines not on this page · raw message
meta/recipes-devtools/binutils/binutils/CVE-2019-9077.patch deleted +0 -37
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/binutils/binutils_2.33.bb renamed from meta/recipes-devtools/binutils/binutils_2.32.bb +0 -0
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.24.0
Part of the diff is not shown here. View the raw message.