binutils: Update to 2.45.1

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/aarch64/binutils b/config/rootfiles/common/aarch64/binutils
index e961f8a8872e73db913c9f482cbf47c54da82088..2e8fcdefeac9e1ea776af8f991feffce9cb4cd47 100644 (file)
--- a/config/rootfiles/common/aarch64/binutils
+++ b/config/rootfiles/common/aarch64/binutils
@@ -426,7 +426,7 @@ usr/lib/bfd-plugins/libdep.so
 #usr/lib/ldscripts/armelfb_linux_eabi.xwe
 #usr/lib/ldscripts/armelfb_linux_eabi.xwer
 #usr/lib/ldscripts/stamp
-usr/lib/libbfd-2.45.so
+usr/lib/libbfd-2.45.1.so
 #usr/lib/libbfd.a
 #usr/lib/libbfd.la
 #usr/lib/libbfd.so
@@ -445,7 +445,7 @@ usr/lib/libctf.so.0.0.0
 #usr/lib/libgprofng.so
 usr/lib/libgprofng.so.0
 usr/lib/libgprofng.so.0.0.0
-usr/lib/libopcodes-2.45.so
+usr/lib/libopcodes-2.45.1.so
 #usr/lib/libopcodes.a
 #usr/lib/libopcodes.la
 #usr/lib/libopcodes.so

diff --git a/config/rootfiles/common/riscv64/binutils b/config/rootfiles/common/riscv64/binutils
index 06025b088f9d401db652f2b1bd0893024c8d6441..aeadbaca9b6bd459bb7e75378674438361699065 100644 (file)
--- a/config/rootfiles/common/riscv64/binutils
+++ b/config/rootfiles/common/riscv64/binutils
@@ -426,7 +426,7 @@ usr/bin/strings
 #usr/lib/ldscripts/elf64lriscv_lp64f.xwe
 #usr/lib/ldscripts/elf64lriscv_lp64f.xwer
 #usr/lib/ldscripts/stamp
-usr/lib/libbfd-2.45.so
+usr/lib/libbfd-2.45.1.so
 #usr/lib/libbfd.a
 #usr/lib/libbfd.la
 #usr/lib/libbfd.so
@@ -445,7 +445,7 @@ usr/lib/libctf.so.0.0.0
 #usr/lib/libgprofng.so
 #usr/lib/libgprofng.so.0
 #usr/lib/libgprofng.so.0.0.0
-usr/lib/libopcodes-2.45.so
+usr/lib/libopcodes-2.45.1.so
 #usr/lib/libopcodes.a
 #usr/lib/libopcodes.la
 #usr/lib/libopcodes.so

diff --git a/config/rootfiles/common/x86_64/binutils b/config/rootfiles/common/x86_64/binutils
index 08f4bea04c8a180fb732594dd7df1fa0dcaecb51..838d1e588dc7b030fa7e5b8737a086c784453520 100644 (file)
--- a/config/rootfiles/common/x86_64/binutils
+++ b/config/rootfiles/common/x86_64/binutils
@@ -178,7 +178,7 @@ usr/bin/strings
 #usr/lib/ldscripts/elf_x86_64.xwe
 #usr/lib/ldscripts/elf_x86_64.xwer
 #usr/lib/ldscripts/stamp
-usr/lib/libbfd-2.45.so
+usr/lib/libbfd-2.45.1.so
 #usr/lib/libbfd.a
 #usr/lib/libbfd.la
 #usr/lib/libbfd.so
@@ -197,7 +197,7 @@ usr/lib/libctf.so.0.0.0
 #usr/lib/libgprofng.so
 usr/lib/libgprofng.so.0
 usr/lib/libgprofng.so.0.0.0
-usr/lib/libopcodes-2.45.so
+usr/lib/libopcodes-2.45.1.so
 #usr/lib/libopcodes.a
 #usr/lib/libopcodes.la
 #usr/lib/libopcodes.so

diff --git a/lfs/binutils b/lfs/binutils
index 1b2b5f3b3f60a06c7b4577f5cfcb411d784cdb60..efa1ea855843a23dbeb858a159bf997e6f814876 100644 (file)
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.45
+VER        = 2.45.1
 
 THISAPP    = binutils-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -96,7 +96,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 1ce72346b1f531c89feb86b407e2c649151b506ffbd1a02d413411d36f7ede98fa9a1adf75dd941c01df5fe7e6bf151828b269eeb7c278315ca8004bff22eb7f
+$(DL_FILE)_BLAKE2 = 1ccab38659ec47f9100b61322627345fe79ebd04ed0b1e872c988edded4d292d7c9ac33d9f6ea47bf265ec823dfba60da0e84374900c15ec89e3aa9280ac020c
 
 install : $(TARGET)
 
@@ -128,6 +128,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) $(DIR_SRC)/binutils-build && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        @mkdir $(DIR_SRC)/binutils-build
 
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/binutils-2.45.1-gprofng-FTBFS.patch
+
        # Prevent installing libiberty to lib64.
        cd $(DIR_APP) && sed -i 's%\(^MULTIOSDIR = \).*%\1 ../lib%' libiberty/Makefile.in
 

diff --git a/src/patches/binutils-2.45.1-gprofng-FTBFS.patch b/src/patches/binutils-2.45.1-gprofng-FTBFS.patch
new file mode 100644 (file)
index 0000000..0a89c5c
--- /dev/null
+++ b/src/patches/binutils-2.45.1-gprofng-FTBFS.patch
@@ -0,0 +1,31 @@
+From 5f66aee7f4bec7a2d8378034116f5e5c3dc50f41 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@suse.de>
+Date: Sat, 22 Nov 2025 11:29:43 +0100
+Subject: [PATCH] gprofng: protect against standard library macros
+
+The CALL_UTIL macro can expand to an unparsable expression of the argument
+is a macro, like with the new const-preserving standard library macros in
+C23.
+
+       * gprofng/src/collector_module.h (CALL_UTIL): Add parens to not
+       expand its argument if it is a function-like macro.
+---
+ gprofng/src/collector_module.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gprofng/src/collector_module.h b/gprofng/src/collector_module.h
+index b64d69c45ab..859a6dd1f7d 100644
+--- a/gprofng/src/collector_module.h
++++ b/gprofng/src/collector_module.h
+@@ -119,7 +119,7 @@ typedef struct CollectorUtilFuncs
+ extern CollectorUtilFuncs __collector_util_funcs;
+ extern int __collector_dlsym_guard;
+ 
+-#define CALL_UTIL(x) __collector_util_funcs.x
++#define CALL_UTIL(x) (__collector_util_funcs.x)
+ 
+ /* The following constants define the meaning of the "void *arg"
+  * argument of getFrameInfo().
+-- 
+2.47.3
+