diff --git a/binutils-revert-note-id-move.patch b/binutils-revert-note-id-move.patch index 89211b1..2763327 100644 --- a/binutils-revert-note-id-move.patch +++ b/binutils-revert-note-id-move.patch @@ -78,17 +78,6 @@ emit_text align_rodata -diff -rup binutils.orig/ld/testsuite/ld-elf/pr23658-1e.d binutils-2.43.50-22c62092858/ld/testsuite/ld-elf/pr23658-1e.d ---- binutils.orig/ld/testsuite/ld-elf/pr23658-1e.d 2024-11-01 13:56:39.565115093 +0000 -+++ binutils-2.43.50-22c62092858/ld/testsuite/ld-elf/pr23658-1e.d 2024-11-01 13:58:07.450365677 +0000 -@@ -15,6 +15,7 @@ - #xfail: cr16-* crx-* visium-* - # The following targets place .note.gnu.build-id in unusual places. - #xfail: *-*-hpux* arc*-* avr-* microblaze-*-* nds32*-* spu-*-* -+#xfail: *-*-* - - #... - +[0-9]+ +\.note.gnu.build-id + diff -rup binutils.orig/ld/testsuite/ld-i386/pr32191.d binutils-2.43.50-22c62092858/ld/testsuite/ld-i386/pr32191.d --- binutils.orig/ld/testsuite/ld-i386/pr32191.d 2024-11-01 13:56:39.584115148 +0000 +++ binutils-2.43.50-22c62092858/ld/testsuite/ld-i386/pr32191.d 2024-11-01 13:58:30.962432716 +0000 @@ -122,3 +111,14 @@ diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr32191.d binutils-2.43.50-22c620 #... +[0-9]+ +\.note\.gnu\.build-id \.text +diff -rup bin.orig/ld/testsuite/ld-elf/pr23658-1e.d binutils-2.43.50-55e32b3c682/ld/testsuite/ld-elf/pr23658-1e.d +--- bin.orig/ld/testsuite/ld-elf/pr23658-1e.d 2024-11-04 12:18:57.021055380 +0000 ++++ binutils-2.43.50-55e32b3c682/ld/testsuite/ld-elf/pr23658-1e.d 2024-11-04 12:19:06.522083958 +0000 +@@ -16,6 +16,7 @@ + #xfail: *-*-hpux* + #xfail: arc*-* avr-* m68hc1*-* microblaze*-* nds32*-* spu-*-* xstormy16-*-* + #noxfail: microblaze*-linux* ++#xfail: *-*-* + + #... + +[0-9]+ +\.note.gnu.build-id + diff --git a/binutils-testsuite-fixes.patch b/binutils-testsuite-fixes.patch index 55ac8a5..c05981d 100644 --- a/binutils-testsuite-fixes.patch +++ b/binutils-testsuite-fixes.patch @@ -1043,3 +1043,37 @@ diff -rup binutils.orig/ld/testsuite/ld-powerpc/tls32no.d binutils-2.42.50-6b19a < [list "Run pr20267b" \ < "-O2 -flto -fcommon tmpdir/pr20267a.o tmpdir/libpr20267b.a" "" \ < {dummy.c} "pr20267b" "pass.out" "-flto -O2 -fcommon" "c"] \ +diff -rup bin.orig/ld/testsuite/ld-x86-64/sframe-pltgot-1.d binutils-2.43.50-55e32b3c682/ld/testsuite/ld-x86-64/sframe-pltgot-1.d +--- bin.orig/ld/testsuite/ld-x86-64/sframe-pltgot-1.d 2024-11-04 13:34:33.522976068 +0000 ++++ binutils-2.43.50-55e32b3c682/ld/testsuite/ld-x86-64/sframe-pltgot-1.d 2024-11-04 13:37:17.985526186 +0000 +@@ -23,6 +23,6 @@ Contents of the SFrame section .sframe: + + func idx \[1\]: pc = 0x1010, size = 64 bytes + STARTPC\[m\] +CFA +FP +RA + +- 0+0000 +sp\+16 +u +f + ++ 0+0000 +sp\+[0-9]+ +u +f + + + #... +diff -rup bin.orig/ld/testsuite/ld-x86-64/sframe-pltgot-2.d binutils-2.43.50-55e32b3c682/ld/testsuite/ld-x86-64/sframe-pltgot-2.d +--- bin.orig/ld/testsuite/ld-x86-64/sframe-pltgot-2.d 2024-11-04 13:34:33.522976068 +0000 ++++ binutils-2.43.50-55e32b3c682/ld/testsuite/ld-x86-64/sframe-pltgot-2.d 2024-11-04 13:37:43.874611190 +0000 +@@ -23,6 +23,6 @@ Contents of the SFrame section .sframe: + + func idx \[1\]: pc = 0x1010, size = 32 bytes + STARTPC\[m\] +CFA +FP +RA + +- 0+0000 +sp\+16 +u +f + ++ 0+0000 +sp\+[0-9]+ +u +f + + + #... +diff -rup bin.orig/ld/testsuite/ld-x86-64/sframe-pltgot-2.d binutils-2.43.50-55e32b3c682/ld/testsuite/ld-x86-64/sframe-pltgot-2.d +--- bin.orig/ld/testsuite/ld-x86-64/sframe-pltgot-2.d 2024-11-04 14:26:07.983307843 +0000 ++++ binutils-2.43.50-55e32b3c682/ld/testsuite/ld-x86-64/sframe-pltgot-2.d 2024-11-04 14:26:18.781353913 +0000 +@@ -21,7 +21,7 @@ Contents of the SFrame section .sframe: + 0+1000 +sp\+16 +u +f + + 0+1006 +sp\+24 +u +f + + +- func idx \[1\]: pc = 0x1010, size = 32 bytes ++ func idx \[1\]: pc = 0x1010, size = [0-9]+ bytes + STARTPC\[m\] +CFA +FP +RA + + 0+0000 +sp\+[0-9]+ +u +f + + diff --git a/binutils.spec b/binutils.spec index 4800bc8..2051ee8 100644 --- a/binutils.spec +++ b/binutils.spec @@ -117,7 +117,7 @@ URL: https://sourceware.org/binutils # correctly. Note %%(echo) is used because you cannot directly set a # spec variable to a hexadecimal string value. -%define commit_id %(echo "22c62092858") +%define commit_id %(echo "55e32b3c682") #----End of Configure Options------------------------------------------------ @@ -1389,7 +1389,8 @@ exit 0 #---------------------------------------------------------------------------- %changelog -* Fri Nov 01 2024 Nick Clifton - 2.43.50-7 +* Mon Nov 04 2024 Nick Clifton - 2.43.50-7 +- Rebase to commit 55e32b3c682 - Revert commit 4f576180 which moves the .note.build-id section back to the start of the file. (PR 2321588) * Thu Oct 31 2024 Miro HronĨok - 2.43.50-6 diff --git a/sources b/sources index 9d411cf..e1c7ab3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (binutils-2.43.50-22c62092858.tar.xz) = 87faaf1f9c46a07604df014d807c53bb2377e9b6e73c89c3bd552f6d2677f8ab82ae4706490ef65dce4a3490f6a6ce2c4023a0ecbcf62bb69a468600ae6bf507 +SHA512 (binutils-2.43.50-55e32b3c682.tar.xz) = b59ea8303c4a4a344fab537a3208e488594800ef74ab99261b4bcc4214d235ee3d14495c3c8251684cff21f106012a831212d3f41429f387e27695bec876c179 SHA512 (binutils-2.19.50.0.1-output-format.sed) = 2f8686b0c8af13c98cda056824c2820416f6e2d003f70b78ccf5314525b9ee3684d421dfa83e638a2d42d06ea4d4bdaf5226b64d6ec26f7ff59c44ffb2a23dd2