binutils: Upgrade to 2.40 release
PATCH v2 1/3 binutils: Upgrade to 2.40 release
---
v1 -> v2:
- Fix build on mingw
- Backport fix to build with --disable-gdb
meta/conf/distro/include/tcmode-default.inc | 2 +-
.../{binutils-2.39.inc => binutils-2.40.inc} | 22 +-
....39.bb => binutils-cross-canadian_2.40.bb} | 0
...39.bb => binutils-cross-testsuite_2.40.bb} | 0
...s-cross_2.39.bb => binutils-cross_2.40.bb} | 0
...ssdk_2.39.bb => binutils-crosssdk_2.40.bb} | 0
...s-crosssdk-Generate-relocatable-SDKs.patch | 10 +-
...o-not-generate-linker-script-directo.patch | 4 +-
...dk-Search-for-alternative-ld.so.conf.patch | 18 +-
...004-Point-scripts-location-to-libdir.patch | 10 +-
...stro-compiler-point-to-the-wrong-ins.patch | 4 +-
...-system-directories-when-cross-linki.patch | 44 +-
...ect-assembling-for-ppc-wait-mnemonic.patch | 8 +-
.../binutils/0008-Use-libtool-2.4.patch | 19254 ++++++++++------
...h-in-libtool-when-sysroot-is-enabled.patch | 2 +-
.../0010-sync-with-OE-libtool-changes.patch | 2 +-
...or-clang-before-checking-gcc-version.patch | 10 +-
...-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | 4 +-
.../binutils/0013-CVE-2022-38533.patch | 36 -
...sing-_Alignof-when-using-C11-or-newe.patch | 48 +
.../binutils/0014-CVE-2022-38128-1.patch | 350 -
.../binutils/0014-CVE-2022-38128-2.patch | 536 -
.../binutils/0014-CVE-2022-38128-3.patch | 95 -
...-dependencies-on-gmp-and-mpfr-when-g.patch | 56 +
.../binutils/0015-CVE-2022-4285.patch | 37 -
...-pe-dll.o-entry-deom-targ_extra_ofil.patch | 41 +
.../{binutils_2.39.bb => binutils_2.40.bb} | 0
27 files changed, 11820 insertions(+), 8773 deletions(-)
rename meta/recipes-devtools/binutils/{binutils-2.39.inc => binutils-2.40.inc} (71%)
rename meta/recipes-devtools/binutils/{binutils-cross-canadian_2.39.bb => binutils-cross-canadian_2.40.bb} (100%)
rename meta/recipes-devtools/binutils/{binutils-cross-testsuite_2.39.bb => binutils-cross-testsuite_2.40.bb} (100%)
rename meta/recipes-devtools/binutils/{binutils-cross_2.39.bb => binutils-cross_2.40.bb} (100%)
rename meta/recipes-devtools/binutils/{binutils-crosssdk_2.39.bb => binutils-crosssdk_2.40.bb} (100%)
delete mode 100644 meta/recipes-devtools/binutils/binutils/0013-CVE-2022-38533.patch
create mode 100644 meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch
delete mode 100644 meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-1.patch
delete mode 100644 meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-2.patch
delete mode 100644 meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-3.patch
create mode 100644 meta/recipes-devtools/binutils/binutils/0014-configure-remove-dependencies-on-gmp-and-mpfr-when-g.patch
delete mode 100644 meta/recipes-devtools/binutils/binutils/0015-CVE-2022-4285.patch
create mode 100644 meta/recipes-devtools/binutils/binutils/0015-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch
rename meta/recipes-devtools/binutils/{binutils_2.39.bb => binutils_2.40.bb} (100%)meta/conf/distro/include/tcmode-default.inc +1 -1
@@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "12.%" SDKGCCVERSION ?= "${GCCVERSION}" -BINUVERSION ?= "2.39%" +BINUVERSION ?= "2.40%" GDBVERSION ?= "12.%" GLIBCVERSION ?= "2.37" LINUXLIBCVERSION ?= "6.1%"
meta/recipes-devtools/binutils/binutils-2.40.inc renamed from meta/recipes-devtools/binutils/binutils-2.39.inc +8 -14
@@ -10,15 +10,15 @@ LIC_FILES_CHKSUM="\ file://bfd/COPYING;md5=d32239bcb673463ab874e80d47fae504\ " -# When upgrading to 2.39, please make sure there is no trailing .0, so +# When upgrading to 2.41, please make sure there is no trailing .0, so # that upstream version check can work correctly. -PV = "2.39" -CVE_VERSION = "2.39" -SRCBRANCH ?= "binutils-2_39-branch" +PV = "2.40" +CVE_VERSION = "2.40" +SRCBRANCH ?= "binutils-2_40-branch" UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" -SRCREV ?= "f89058434f13382c85b8729464192bc7763d88a4" +SRCREV ?= "ffb83e32fc11f36b7b82b876c14888f82cd983b3" BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=git" SRC_URI = "\ ${BINUTILS_GIT_URI} \
@@ -31,14 +31,8 @@ SRC_URI = "\ file://0010-sync-with-OE-libtool-changes.patch \ file://0011-Check-for-clang-before-checking-gcc-version.patch \ file://0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ - file://0013-CVE-2022-38533.patch \ - file://0014-CVE-2022-38128-1.patch \ - file://0014-CVE-2022-38128-2.patch \ - file://0014-CVE-2022-38128-3.patch \ - file://0015-CVE-2022-4285.patch \ + file://0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ + file://0014-configure-remove-dependencies-on-gmp-and-mpfr-when-g.patch \ + file://0015-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch \ " S = "${WORKDIR}/git" -# Already in 2.39 branch -# - https://sourceware.org/bugzilla/show_bug.cgi?id=29289 -# - https://sourceware.org/bugzilla/show_bug.cgi?id=29290 -CVE_CHECK_IGNORE += "CVE-2022-38126 CVE-2022-38127"
meta/recipes-devtools/binutils/binutils-cross-canadian_2.40.bb renamed from meta/recipes-devtools/binutils/binutils-cross-canadian_2.39.bb +0 -0
meta/recipes-devtools/binutils/binutils-cross-testsuite_2.40.bb renamed from meta/recipes-devtools/binutils/binutils-cross-testsuite_2.39.bb +0 -0
meta/recipes-devtools/binutils/binutils-cross_2.40.bb renamed from meta/recipes-devtools/binutils/binutils-cross_2.39.bb +0 -0
meta/recipes-devtools/binutils/binutils-crosssdk_2.40.bb renamed from meta/recipes-devtools/binutils/binutils-crosssdk_2.39.bb +0 -0
meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch +5 -5
@@ -1,4 +1,4 @@ -From a0ac147aec127c66c9e38292faa50bb56d3c2a19 Mon Sep 17 00:00:00 2001 +From 25e715730ddcca37021fa4876aed4fa91d5dea25 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 2 Mar 2015 01:58:54 +0000 Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs
@@ -21,10 +21,10 @@ Signed-off-by: Khem Raj <[email protected]> 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gold/layout.cc b/gold/layout.cc -index 3efe8d98ae9..9cc389664a6 100644 +index 899d4af0707..7c31b1bef6e 100644 --- a/gold/layout.cc +++ b/gold/layout.cc -@@ -5033,7 +5033,7 @@ Layout::create_interp(const Target* target) +@@ -5083,7 +5083,7 @@ Layout::create_interp(const Target* target) gold_assert(interp != NULL); }
@@ -34,7 +34,7 @@ index 3efe8d98ae9..9cc389664a6 100644 Output_section_data* odata = new Output_data_const(interp, len, 1); diff --git a/ld/genscripts.sh b/ld/genscripts.sh -index 278f212bdad..0c52ebee4d0 100755 +index 382bd07ffe2..9fbd0c4cb8a 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh @@ -304,6 +304,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}"
@@ -59,7 +59,7 @@ index 278f212bdad..0c52ebee4d0 100755 DATA_ALIGNMENT=${DATA_ALIGNMENT_} RELOCATING=" " diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc -index bf2268bb0ad..b1811ef130f 100644 +index 5d3b0d31b1b..2163909cd56 100644 --- a/ld/scripttempl/elf.sc +++ b/ld/scripttempl/elf.sc @@ -148,8 +148,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then
meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch +2 -2
@@ -1,4 +1,4 @@ -From fd7065bfd20364679e3c3f329b19059bbc51ab02 Mon Sep 17 00:00:00 2001 +From 080a8eafc5961f78222d84aaa816d0933441b7ab Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 6 Mar 2017 23:37:05 -0800 Subject: [PATCH] binutils-cross: Do not generate linker script directories
@@ -22,7 +22,7 @@ Signed-off-by: Khem Raj <[email protected]> 1 file changed, 25 deletions(-) diff --git a/ld/genscripts.sh b/ld/genscripts.sh -index 0c52ebee4d0..1acbe66bd2e 100755 +index 9fbd0c4cb8a..6be07038c9b 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh @@ -235,31 +235,6 @@ append_to_lib_path()
meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch +9 -9
@@ -1,4 +1,4 @@ -From 67735b3647f98ce0f010ff8b4f9b5c5da576cb17 Mon Sep 17 00:00:00 2001 +From 90d1bb804033a74b54f64cd5d3127c004c266af8 Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Wed, 19 Feb 2020 09:51:16 -0800 Subject: [PATCH] binutils-nativesdk: Search for alternative ld.so.conf in SDK
@@ -29,7 +29,7 @@ Signed-off-by: Khem Raj <[email protected]> 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ld/Makefile.am b/ld/Makefile.am -index d31021c13e2..29782385ca4 100644 +index 12b2c3c453f..0590b7055d0 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@
@@ -41,12 +41,12 @@ index d31021c13e2..29782385ca4 100644 + -DSYSCONFDIR="\"$(sysconfdir)\"" WARN_CFLAGS = @WARN_CFLAGS@ NO_WERROR = @NO_WERROR@ - AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) + AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) diff --git a/ld/Makefile.in b/ld/Makefile.in -index ee0c98f65b0..04ee68a2c67 100644 +index 3d5685d6bae..70643b1ce46 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in -@@ -562,7 +562,8 @@ ZLIB = @zlibdir@ -lz +@@ -566,7 +566,8 @@ ZLIB = @zlibdir@ -lz ZLIBINC = @zlibinc@ ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \ -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \
@@ -54,10 +54,10 @@ index ee0c98f65b0..04ee68a2c67 100644 + -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ \ + -DSYSCONFDIR="\"$(sysconfdir)\"" - AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) + AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) diff --git a/ld/ldelf.c b/ld/ldelf.c -index bfa0d54753a..0d61a3209ec 100644 +index eff6693e052..95787012b89 100644 --- a/ld/ldelf.c +++ b/ld/ldelf.c @@ -936,7 +936,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force,
@@ -70,7 +70,7 @@ index bfa0d54753a..0d61a3209ec 100644 if (!ldelf_parse_ld_so_conf (&info, tmppath)) { diff --git a/ld/ldmain.c b/ld/ldmain.c -index ea72b14a301..1ae90a77749 100644 +index 9290a189b0d..ceaca2d85d0 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c @@ -70,6 +70,7 @@ char *program_name;
@@ -82,7 +82,7 @@ index ea72b14a301..1ae90a77749 100644 /* The canonical representation of ld_sysroot. */ char *ld_canon_sysroot; diff --git a/ld/ldmain.h b/ld/ldmain.h -index f6d05a02f59..e60292cd522 100644 +index dda124b96e8..ba06a7d7be2 100644 --- a/ld/ldmain.h +++ b/ld/ldmain.h @@ -23,6 +23,7 @@
meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch +5 -5
@@ -1,4 +1,4 @@ -From 2158e5bd4c6ea4db89e33d46ef25428e37bfc3a6 Mon Sep 17 00:00:00 2001 +From a7c988d60f11c8279453c2d9edeede001cce7c9e Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 2 Mar 2015 01:09:58 +0000 Subject: [PATCH] Point scripts location to libdir
@@ -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 29782385ca4..062e6b6814b 100644 +index 0590b7055d0..c30db94ee3c 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am -@@ -51,7 +51,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) +@@ -51,7 +51,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) # 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 29782385ca4..062e6b6814b 100644 EMUL = @EMUL@ EMULATION_OFILES = @EMULATION_OFILES@ diff --git a/ld/Makefile.in b/ld/Makefile.in -index 04ee68a2c67..782d4017a60 100644 +index 70643b1ce46..0405028e02f 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in -@@ -570,7 +570,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) +@@ -574,7 +574,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) # 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.
meta/recipes-devtools/binutils/binutils/0005-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch +2 -2
@@ -1,4 +1,4 @@ -From e74d765a1a95253c9247228bd7ccbcabecdd8f7e Mon Sep 17 00:00:00 2001 +From fc39b9c332a346910695817274d55d0c20dc717a Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 2 Mar 2015 01:39:01 +0000 Subject: [PATCH] don't let the distro compiler point to the wrong installation
@@ -17,7 +17,7 @@ Signed-off-by: Khem Raj <[email protected]> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in -index abef3c4601b..880c8826482 100644 +index f9fbba23e2c..93495e45d6f 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in @@ -385,7 +385,8 @@ install-strip: install
meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch +22 -22
145 lines not on this page · raw message
meta/recipes-devtools/binutils/binutils/0007-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch +4 -4
@@ -1,4 +1,4 @@ -From 883b6c0930410f8553b3bce0dd98131bc1694fa6 Mon Sep 17 00:00:00 2001 +From ef9aa69324a209e546956a2f674462717ec5af0f Mon Sep 17 00:00:00 2001 From: Zhenhua Luo <[email protected]> Date: Sat, 11 Jun 2016 22:08:29 -0500 Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic
@@ -14,10 +14,10 @@ Signed-off-by: Zhenhua Luo <[email protected]> 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c -index 7637d3e349e..8e074e13208 100644 +index 37f1aeb780c..45774c7cf79 100644 --- a/opcodes/ppc-opc.c +++ b/opcodes/ppc-opc.c -@@ -6947,8 +6947,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { +@@ -7138,8 +7138,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { {"waitasec", X(31,30), XRTRARB_MASK, POWER8, POWER9, {0}}, {"waitrsv", XWCPL(31,30,1,0),0xffffffff, POWER10, EXT, {0}}, {"pause_short", XWCPL(31,30,2,0),0xffffffff, POWER10, EXT, {0}},
@@ -26,7 +26,7 @@ index 7637d3e349e..8e074e13208 100644 {"lwepx", X(31,31), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}}, -@@ -7002,7 +7000,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { +@@ -7193,7 +7191,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, EXT, {0}}, {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, EXT, {0}},
meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch +11608 -7646
2,641 lines not on this page · raw message
meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/binutils/binutils/0011-Check-for-clang-before-checking-gcc-version.patch +5 -5
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch +2 -2
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/binutils/binutils/0013-CVE-2022-38533.patch deleted +0 -36
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch new file +48 -0
48 lines not on this page · raw message
meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-1.patch deleted +0 -350
350 lines not on this page · raw message
meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-2.patch deleted +0 -536
536 lines not on this page · raw message
meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-3.patch deleted +0 -95
95 lines not on this page · raw message
meta/recipes-devtools/binutils/binutils/0014-configure-remove-dependencies-on-gmp-and-mpfr-when-g.patch new file +56 -0
56 lines not on this page · raw message
meta/recipes-devtools/binutils/binutils/0015-CVE-2022-4285.patch deleted +0 -37
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/binutils/binutils/0015-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch new file +41 -0
41 lines not on this page · raw message
meta/recipes-devtools/binutils/binutils_2.40.bb renamed from meta/recipes-devtools/binutils/binutils_2.39.bb +0 -0
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.39.1
Part of the diff is not shown here. View the raw message.
PATCH v2 2/3 binutils: Package libsframe
libsframe is newly added in binutils 2.40
---
v1 -> v2:
- Rebase
meta/recipes-devtools/binutils/binutils_2.40.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/binutils/binutils_2.40.bb +1 -1
@@ -66,7 +66,7 @@ PACKAGE_BEFORE_PN += "libbfd libopcodes gprofng" FILES:libbfd = "${libdir}/libbfd-*.so.* ${libdir}/libbfd-*.so" FILES:libopcodes = "${libdir}/libopcodes-*.so.* ${libdir}/libopcodes-*.so" FILES:gprofng = "${sysconfdir}/gprofng.rc ${libdir}/gprofng/libgp-*.so ${libdir}/gprofng/libgprofng.so.* ${bindir}/gp-* ${bindir}/gprofng" -FILES:${PN}-dev += "${libdir}/gprofng/libgprofng.so" +FILES:${PN}-dev += "${libdir}/gprofng/libgprofng.so ${libdir}/libsframe.so" SRC_URI:append:class-nativesdk = " file://0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch " USE_ALTERNATIVES_FOR:class-nativesdk = ""
Signature · 1 line
2.39.1
PATCH v2 3/3 elfutils: Fix build with libcurl >= 7.87
In reply to Khem RajBackport needed patches and remove local workaround
--- .../elfutils/elfutils_0.188.bb | 4 +- ...od-Fix-usage-of-deprecated-CURLINFO_.patch | 49 +++++++++++++++++++ ...t-Use-CURLOPT_PROTOCOLS_STR-for-libc.patch | 34 +++++++++++++ 3 files changed, 85 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/elfutils/files/0001-PR29926-debuginfod-Fix-usage-of-deprecated-CURLINFO_.patch create mode 100644 meta/recipes-devtools/elfutils/files/0002-debuginfod-client-Use-CURLOPT_PROTOCOLS_STR-for-libc.patch
meta/recipes-devtools/elfutils/elfutils_0.188.bb +2 -2
@@ -21,6 +21,8 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ file://0001-skip-the-test-when-gcc-not-deployed.patch \ file://ptest.patch \ file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \ + file://0001-PR29926-debuginfod-Fix-usage-of-deprecated-CURLINFO_.patch \ + file://0002-debuginfod-client-Use-CURLOPT_PROTOCOLS_STR-for-libc.patch \ " SRC_URI:append:libc-musl = " \ file://0003-musl-utils.patch \
@@ -33,8 +35,6 @@ inherit autotools gettext ptest pkgconfig EXTRA_OECONF = "--program-prefix=eu-" BUILD_CFLAGS += "-Wno-error=stringop-overflow" -# compatibility with curl 7.87; can be removed when elfutils upstream fixes the deprecation fails -CFLAGS:append = " -Wno-error=deprecated-declarations" DEPENDS_BZIP2 = "bzip2-replacement-native" DEPENDS_BZIP2:class-target = "bzip2"
meta/recipes-devtools/elfutils/files/0001-PR29926-debuginfod-Fix-usage-of-deprecated-CURLINFO_.patch new file +49 -0
49 lines not on this page · raw message
meta/recipes-devtools/elfutils/files/0002-debuginfod-client-Use-CURLOPT_PROTOCOLS_STR-for-libc.patch new file +34 -0
@@ -0,0 +1,34 @@ +From 6560fb26a62ef135a804357ef4f15a47de3e49b3 Mon Sep 17 00:00:00 2001 +From: Mark Wielaard <[email protected]> +Date: Tue, 10 Jan 2023 23:20:41 +0100 +Subject: [PATCH] debuginfod-client: Use CURLOPT_PROTOCOLS_STR for libcurl >= 7.85.0 + +https://sourceware.org/bugzilla/show_bug.cgi?id=29926 + +Upstream-Status: Backport [https://sourceware.org/git/?p=elfutils.git;a=commit;h=6560fb26a62ef135a804357ef4f15a47de3e49b3] +Signed-off-by: Mark Wielaard <[email protected]> +--- + debuginfod/debuginfod-client.c | 5 +++++ + 2 files changed, 10 insertions(+) + +diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c +index a16165bd..1ce45632 100644 +--- a/debuginfod/debuginfod-client.c ++++ b/debuginfod/debuginfod-client.c +@@ -1336,8 +1336,13 @@ debuginfod_query_server (debuginfod_client *c, + + /* Only allow http:// + https:// + file:// so we aren't being + redirected to some unsupported protocol. */ ++#if CURL_AT_LEAST_VERSION(7, 85, 0) ++ curl_easy_setopt_ck(data[i].handle, CURLOPT_PROTOCOLS_STR, ++ "http,https,file"); ++#else + curl_easy_setopt_ck(data[i].handle, CURLOPT_PROTOCOLS, + (CURLPROTO_HTTP | CURLPROTO_HTTPS | CURLPROTO_FILE)); ++#endif + curl_easy_setopt_ck(data[i].handle, CURLOPT_URL, data[i].url); + if (vfd >= 0) + curl_easy_setopt_ck(data[i].handle, CURLOPT_ERRORBUFFER, +-- +2.39.1 +
Signature · 1 line
2.39.1
Hi Khem,
Quoted 54 lines · On Wed, 18 Jan 2023 20:27:22 -0800 "Khem Raj" <[email protected]> wrote:
Signed-off-by Khem Raj <[email protected]>---
v1 -> v2:
- Fix build on mingw
- Backport fix to build with --disable-gdbmeta/conf/distro/include/tcmode-default.inc | 2 +- .../{binutils-2.39.inc => binutils-2.40.inc} | 22 +- ....39.bb => binutils-cross-canadian_2.40.bb} | 0 ...39.bb => binutils-cross-testsuite_2.40.bb} | 0 ...s-cross_2.39.bb => binutils-cross_2.40.bb} | 0 ...ssdk_2.39.bb => binutils-crosssdk_2.40.bb} | 0 ...s-crosssdk-Generate-relocatable-SDKs.patch | 10 +- ...o-not-generate-linker-script-directo.patch | 4 +- ...dk-Search-for-alternative-ld.so.conf.patch | 18 +- ...004-Point-scripts-location-to-libdir.patch | 10 +- ...stro-compiler-point-to-the-wrong-ins.patch | 4 +- ...-system-directories-when-cross-linki.patch | 44 +- ...ect-assembling-for-ppc-wait-mnemonic.patch | 8 +- .../binutils/0008-Use-libtool-2.4.patch | 19254 ++++++++++------ ...h-in-libtool-when-sysroot-is-enabled.patch | 2 +- .../0010-sync-with-OE-libtool-changes.patch | 2 +- ...or-clang-before-checking-gcc-version.patch | 10 +- ...-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | 4 +- .../binutils/0013-CVE-2022-38533.patch | 36 - ...sing-_Alignof-when-using-C11-or-newe.patch | 48 + .../binutils/0014-CVE-2022-38128-1.patch | 350 - .../binutils/0014-CVE-2022-38128-2.patch | 536 - .../binutils/0014-CVE-2022-38128-3.patch | 95 - ...-dependencies-on-gmp-and-mpfr-when-g.patch | 56 + .../binutils/0015-CVE-2022-4285.patch | 37 - ...-pe-dll.o-entry-deom-targ_extra_ofil.patch | 41 + .../{binutils_2.39.bb => binutils_2.40.bb} | 0 27 files changed, 11820 insertions(+), 8773 deletions(-) rename meta/recipes-devtools/binutils/{binutils-2.39.inc => binutils-2.40.inc} (71%) rename meta/recipes-devtools/binutils/{binutils-cross-canadian_2.39.bb => binutils-cross-canadian_2.40.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-cross-testsuite_2.39.bb => binutils-cross-testsuite_2.40.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-cross_2.39.bb => binutils-cross_2.40.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-crosssdk_2.39.bb => binutils-crosssdk_2.40.bb} (100%) delete mode 100644 meta/recipes-devtools/binutils/binutils/0013-CVE-2022-38533.patch create mode 100644 meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-1.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-2.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-3.patch create mode 100644 meta/recipes-devtools/binutils/binutils/0014-configure-remove-dependencies-on-gmp-and-mpfr-when-g.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/0015-CVE-2022-4285.patch create mode 100644 meta/recipes-devtools/binutils/binutils/0015-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch rename meta/recipes-devtools/binutils/{binutils_2.39.bb => binutils_2.40.bb} (100%)meta/conf/distro/include/tcmode-default.inc +0
-0
meta/conf/distro/include/tcmode-default.inc PREFERRED_PROVIDER_virtual/gettext ??= "gettext" · line 24
Quoted 8 lines
meta/conf/distro/include/tcmode-default.inc +1
-1@@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "12.%" SDKGCCVERSION ?= "${GCCVERSION}" -BINUVERSION ?= "2.39%" +BINUVERSION ?= "2.40%" GDBVERSION ?= "12.%" GLIBCVERSION ?= "2.37" LINUXLIBCVERSION ?= "6.1%"
Applying this patch on an oe-core repository fails with 'git am':
error: sha1 information is lacking or useless (meta/conf/distro/include/tcmode-default.inc).
error: could not build fake ancestor
Patch failed at 0001 binutils: Upgrade to 2.40 release
And also with 'git apply'
error: patch failed: meta/conf/distro/include/tcmode-default.inc:18
error: meta/conf/distro/include/tcmode-default.inc: patch does not apply
I noticed you prepared the patch in a poky repository, so I did apply it there, re-extracted it via 'git format-patch' and the resulting patch applied perfectly on my oe-core. This happened with your v1 as well a couple days ago.
I don't understand the root cause and definitely there are no recent commits that create conflicts. However I'm wondering whether you could move to working on actual oe-core instead of poky. It would certainly help me.
Kind regards,
Luca
Signature · 3 lines
Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Quoted 71 lines · Luca Ceresoli
Hi Khem,
Quoted 54 lines · On Wed, 18 Jan 2023 20:27:22 -0800 "Khem Raj" <[email protected]> wrote:
Signed-off-by Khem Raj <[email protected]>---
v1 -> v2:
- Fix build on mingw
- Backport fix to build with --disable-gdbmeta/conf/distro/include/tcmode-default.inc | 2 +- .../{binutils-2.39.inc => binutils-2.40.inc} | 22 +- ....39.bb => binutils-cross-canadian_2.40.bb} | 0 ...39.bb => binutils-cross-testsuite_2.40.bb} | 0 ...s-cross_2.39.bb => binutils-cross_2.40.bb} | 0 ...ssdk_2.39.bb => binutils-crosssdk_2.40.bb} | 0 ...s-crosssdk-Generate-relocatable-SDKs.patch | 10 +- ...o-not-generate-linker-script-directo.patch | 4 +- ...dk-Search-for-alternative-ld.so.conf.patch | 18 +- ...004-Point-scripts-location-to-libdir.patch | 10 +- ...stro-compiler-point-to-the-wrong-ins.patch | 4 +- ...-system-directories-when-cross-linki.patch | 44 +- ...ect-assembling-for-ppc-wait-mnemonic.patch | 8 +- .../binutils/0008-Use-libtool-2.4.patch | 19254 ++++++++++------ ...h-in-libtool-when-sysroot-is-enabled.patch | 2 +- .../0010-sync-with-OE-libtool-changes.patch | 2 +- ...or-clang-before-checking-gcc-version.patch | 10 +- ...-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | 4 +- .../binutils/0013-CVE-2022-38533.patch | 36 - ...sing-_Alignof-when-using-C11-or-newe.patch | 48 + .../binutils/0014-CVE-2022-38128-1.patch | 350 - .../binutils/0014-CVE-2022-38128-2.patch | 536 - .../binutils/0014-CVE-2022-38128-3.patch | 95 - ...-dependencies-on-gmp-and-mpfr-when-g.patch | 56 + .../binutils/0015-CVE-2022-4285.patch | 37 - ...-pe-dll.o-entry-deom-targ_extra_ofil.patch | 41 + .../{binutils_2.39.bb => binutils_2.40.bb} | 0 27 files changed, 11820 insertions(+), 8773 deletions(-) rename meta/recipes-devtools/binutils/{binutils-2.39.inc => binutils-2.40.inc} (71%) rename meta/recipes-devtools/binutils/{binutils-cross-canadian_2.39.bb => binutils-cross-canadian_2.40.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-cross-testsuite_2.39.bb => binutils-cross-testsuite_2.40.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-cross_2.39.bb => binutils-cross_2.40.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-crosssdk_2.39.bb => binutils-crosssdk_2.40.bb} (100%) delete mode 100644 meta/recipes-devtools/binutils/binutils/0013-CVE-2022-38533.patch create mode 100644 meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-1.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-2.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-3.patch create mode 100644 meta/recipes-devtools/binutils/binutils/0014-configure-remove-dependencies-on-gmp-and-mpfr-when-g.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/0015-CVE-2022-4285.patch create mode 100644 meta/recipes-devtools/binutils/binutils/0015-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch rename meta/recipes-devtools/binutils/{binutils_2.39.bb => binutils_2.40.bb} (100%)meta/conf/distro/include/tcmode-default.inc +0
-0meta/conf/distro/include/tcmode-default.inc PREFERRED_PROVIDER_virtual/gettext ??= "gettext" · line 24
Quoted 8 lines
meta/conf/distro/include/tcmode-default.inc +1
-1@@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "12.%" SDKGCCVERSION ?= "${GCCVERSION}" -BINUVERSION ?= "2.39%" +BINUVERSION ?= "2.40%" GDBVERSION ?= "12.%" GLIBCVERSION ?= "2.37" LINUXLIBCVERSION ?= "6.1%"Applying this patch on an oe-core repository fails with 'git am':
Quoted 8 lines
error: sha1 information is lacking or useless (meta/conf/distro/include/tcmode-default.inc).
error: could not build fake ancestor
Patch failed at 0001 binutils: Upgrade to 2.40 releaseAnd also with 'git apply'
error: patch failed: meta/conf/distro/include/tcmode-default.inc:18
error: meta/conf/distro/include/tcmode-default.inc: patch does not apply
It might be due to glibc 2.37 upgrade which I have in my local tree staged as well.
you might edit it locally. If you want I can push it to a dedicated branch
Quoted 18 lines
I noticed you prepared the patch in a poky repository, so I did apply it there, re-extracted it via 'git format-patch' and the resulting patch applied perfectly on my oe-core. This happened with your v1 as well a couple days ago.
I don't understand the root cause and definitely there are no recent commits that create conflicts. However I'm wondering whether you could move to working on actual oe-core instead of poky. It would certainly help me.
Kind regards,
Luca--
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Hi Khem,
Quoted 8 lines · On Thu, 19 Jan 2023 08:52:09 -0800 "Khem Raj" <[email protected]> wrote:
Quoted 7 lines · Luca Ceresoli
Hi Khem,
Quoted 1 line · On Wed, 18 Jan 2023 20:27:22 -0800 "Khem Raj" <[email protected]> wrote:
Signed-off-by Khem Raj <[email protected]>
This version is failing too:
https://autobuilder.yoctoproject.org/typhoon/#/builders/65/builds/6592/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/122/builds/2263/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/6521/steps/14/logs/stdio
...
Quoted 1 line
Quoted 1 line
Review
Quoted 1 line
(quoted diff) +0
-0
b/meta/conf/distro/include/tcmode-default.inc
Quoted 19 lines
Quoted 19 lines
meta/conf/distro/include/tcmode-default.inc PREFERRED_PROVIDER_virtual/gettext ??= "gettext" · line 24
Quoted 12 lines
index
4d4929529a..bcc5f7ce1f100644meta/conf/distro/include/tcmode-default.inc +1
-1@@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "12.%" SDKGCCVERSION ?= "${GCCVERSION}" -BINUVERSION ?= "2.39%" +BINUVERSION ?= "2.40%" GDBVERSION ?= "12.%" GLIBCVERSION ?= "2.37" LINUXLIBCVERSION ?= "6.1%"Applying this patch on an oe-core repository fails with 'git am':
error: sha1 information is lacking or useless (meta/conf/distro/include/tcmode-default.inc).
error: could not build fake ancestor
Patch failed at 0001 binutils: Upgrade to 2.40 release
Quoted 8 lines
Quoted 4 lines
And also with 'git apply'
error: patch failed: meta/conf/distro/include/tcmode-default.inc:18
error: meta/conf/distro/include/tcmode-default.inc: patch does not applyIt might be due to glibc 2.37 upgrade which I have in my local tree staged as well.
you might edit it locally. If you want I can push it to a dedicated branch
Hm, maybe. I will try with your v3 I guess. :)
Not a big problem so far, but an annoyance.
Signature · 3 lines
Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Quoted 13 lines · Luca Ceresoli
Hi Khem,
Quoted 7 lines · On Thu, 19 Jan 2023 08:52:09 -0800 "Khem Raj" <[email protected]> wrote:
Quoted 6 lines · Luca Ceresoli
Hi Khem,
On Wed, 18 Jan 2023 20:27:22 -0800
"Khem Raj" <[email protected]> wrote:
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Signed-off-by Khem Raj <[email protected]>This version is failing too:
https://autobuilder.yoctoproject.org/typhoon/#/builders/65/builds/6592/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/122/builds/2263/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/6521/steps/14/logs/stdio
my bad. I have fixed the mingw32 patch and sent v3. Please try that patchset out.
Quoted 40 lines
...
Quoted 1 line
Quoted 1 line
Review
Quoted 1 line
(quoted diff) +0
-0b/meta/conf/distro/include/tcmode-default.inc
Quoted 19 lines
Quoted 19 lines
meta/conf/distro/include/tcmode-default.inc PREFERRED_PROVIDER_virtual/gettext ??= "gettext" · line 24
Quoted 12 lines
index
4d4929529a..bcc5f7ce1f100644meta/conf/distro/include/tcmode-default.inc +1
-1@@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "12.%" SDKGCCVERSION ?= "${GCCVERSION}" -BINUVERSION ?= "2.39%" +BINUVERSION ?= "2.40%" GDBVERSION ?= "12.%" GLIBCVERSION ?= "2.37" LINUXLIBCVERSION ?= "6.1%"Applying this patch on an oe-core repository fails with 'git am':
error: sha1 information is lacking or useless (meta/conf/distro/include/tcmode-default.inc).
error: could not build fake ancestor
Patch failed at 0001 binutils: Upgrade to 2.40 releaseQuoted 8 lines
Quoted 4 lines
And also with 'git apply'
error: patch failed: meta/conf/distro/include/tcmode-default.inc:18
error: meta/conf/distro/include/tcmode-default.inc: patch does not applyIt might be due to glibc 2.37 upgrade which I have in my local tree staged as well.
you might edit it locally. If you want I can push it to a dedicated branchHm, maybe. I will try with your v3 I guess. :)
Not a big problem so far, but an annoyance.
--
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Quoted 5 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>---
v1 -> v2:
- Fix build on mingw
- Backport fix to build with --disable-gdb
[ ... ]
Note I think this is going to run afoul of grub2 mkimage.
In binutils-2.40 the assembler for risc-v was changed to use CALL_PLT relocations rather than CALL relocations. grub2 does not handle CALL_PLT relocations which in turn will cause a failure when grub2-mkimage is used on risc-v.
As far as I can tell, the assembler change literally just changes the relocation number, they are otherwise treated the same. So I think grub2 can be fixed by just treating R_RISCV_CALL_PLT just like R_RISCV_CALL in kern/riscv/dl.c.
Nelson, can you confirm that all your assembler change did was change the relocation used in the resultant object?
Jeff
Quoted 11 lines · Jeff Law
Quoted 5 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>---
v1 -> v2:
- Fix build on mingw
- Backport fix to build with --disable-gdb[ ... ]
Note I think this is going to run afoul of grub2 mkimage.
Yes I am seeing that in local builds for both rv32 and rv64
Quoted 9 lines
In binutils-2.40 the assembler for risc-v was changed to use
CALL_PLTrelocations rather than CALL relocations. grub2 does not handleCALL_PLTrelocations which in turn will cause a failure when grub2-mkimage is used on risc-v.As far as I can tell, the assembler change literally just changes the relocation number, they are otherwise treated the same. So I think grub2 can be fixed by just treating
R_RISCV_CALL_PLTjust likeR_RISCV_CALLinkern/riscv/dl.c.
I will try this and let you know
Quoted 6 lines
Nelson, can you confirm that all your assembler change did was change the relocation used in the resultant object?
Jeff
Quoted 17 lines · Jeff Law
Quoted 5 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>---
v1 -> v2:
- Fix build on mingw
- Backport fix to build with --disable-gdb[ ... ]
Note I think this is going to run afoul of grub2 mkimage.In binutils-2.40 the assembler for risc-v was changed to use
CALL_PLTrelocations rather than CALL relocations. grub2 does not handleCALL_PLTrelocations which in turn will cause a failure when grub2-mkimage is used on risc-v.
Quoted 7 lines
As far as I can tell, the assembler change literally just changes the relocation number, they are otherwise treated the same. So I think grub2 can be fixed by just treating
R_RISCV_CALL_PLTjust likeR_RISCV_CALLinkern/riscv/dl.c.Nelson, can you confirm that all your assembler change did was change the relocation used in the resultant object?
The binutils change is here
https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=70f35d72ef04cd23771875c1661c9975044a749c
I tried something like this
I still get
| grub-mkimage: error: relocation 0x13 is not implemented yet.
need to look more.
Quoted 2 lines
Jeff
Quoted 29 lines · Khem Raj
Quoted 17 lines · Jeff Law
Quoted 5 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>---
v1 -> v2:
- Fix build on mingw
- Backport fix to build with --disable-gdb[ ... ]
Note I think this is going to run afoul of grub2 mkimage.In binutils-2.40 the assembler for risc-v was changed to use
CALL_PLTrelocations rather than CALL relocations. grub2 does not handleCALL_PLTrelocations which in turn will cause a failure when grub2-mkimage is used on risc-v.Quoted 7 lines
As far as I can tell, the assembler change literally just changes the relocation number, they are otherwise treated the same. So I think grub2 can be fixed by just treating
R_RISCV_CALL_PLTjust likeR_RISCV_CALLinkern/riscv/dl.c.Nelson, can you confirm that all your assembler change did was change the relocation used in the resultant object?
The binutils change is here
https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=70f35d72ef04cd23771875c1661c9975044a749c
Quoted 8 lines
I tried something like this
I still get
| grub-mkimage: error: relocation0x13is not implemented yet.need to look more.
That's what I would think the right fix ought to be. Weird.
I think mkimage is run as a host tool, so I'd dig into the build of that on the host.
jeff