diff options
author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2025-01-01 23:25:56 -0600 |
---|---|---|
committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2025-01-01 23:25:56 -0600 |
commit | f45ebc2a8aa4ea6f1ff7aebe5a0e288ed7c7098e (patch) | |
tree | dec0a07e02fcacb7ad013302332037d43d2b49b8 | |
parent | 27988609c853711cd2cb6050575cafb8155a2946 (diff) | |
download | packages-awilfox/system-next.tar.gz packages-awilfox/system-next.tar.bz2 packages-awilfox/system-next.tar.xz packages-awilfox/system-next.zip |
system/binutils: Update to 2.43.1awilfox/system-next
-rw-r--r-- | system/binutils/APKBUILD | 18 | ||||
-rw-r--r-- | system/binutils/ar-deterministic-tests.patch | 67 | ||||
-rw-r--r-- | system/binutils/binutils-ld-fix-static-linking.patch | 6 | ||||
-rw-r--r-- | system/binutils/disable-mbind2b.patch | 2 | ||||
-rw-r--r-- | system/binutils/disable-preinit-array-tests.patch | 6 | ||||
-rw-r--r-- | system/binutils/x86_64-mark-plt.patch | 37 | ||||
-rw-r--r-- | system/binutils/x86_64-missing-test.patch | 91 |
7 files changed, 12 insertions, 215 deletions
diff --git a/system/binutils/APKBUILD b/system/binutils/APKBUILD index 06f7c4cb6..c8b31315c 100644 --- a/system/binutils/APKBUILD +++ b/system/binutils/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org> pkgname=binutils -pkgver=2.42 +pkgver=2.43.1 pkgrel=0 pkgdesc="Tools necessary to build programs" url="https://www.gnu.org/software/binutils/" @@ -13,7 +13,6 @@ makedepends="$makedepends_build $makedepends_host" checkdepends="dejagnu" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs" source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz - ar-deterministic-tests.patch binutils-ld-fix-static-linking.patch disable-ifunc-tests.patch disable-mbind2b.patch @@ -21,7 +20,6 @@ source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz disable-preinit-array-tests.patch disable-relr-glibc-tests.patch disable-sframe-tests.patch - libctf-32bit-test.patch musl-preinit-array.patch musl-versioned-syms.patch pr25749-test-size.patch @@ -30,8 +28,6 @@ source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz remove-pr19553c-test.patch visibility-musl.patch vsb-hammer.patch - x86_64-mark-plt.patch - x86_64-missing-test.patch BTS-170.patch BTS-196.patch fix-deprecated-egrep-usage.patch @@ -142,16 +138,14 @@ libs() { mv "$pkgdir"/usr/lib/lib*.so "$subpkgdir"/usr/lib/ } -sha512sums="155f3ba14cd220102f4f29a4f1e5cfee3c48aa03b74603460d05afb73c70d6657a9d87eee6eb88bf13203fe6f31177a5c9addc04384e956e7da8069c8ecd20a6 binutils-2.42.tar.xz -07a9a47c5955a1911cab5387134cfacfff82f5521066bb61f671c7e0d07ce64c31c4162a57234604b470d24f27093cb23202ad05bebc34479957c6fe64dbc8fb ar-deterministic-tests.patch -3736ea519eab417bc05f9851954e644a4d1b44f4641fb5685ff2238bd2da775f20611edfdcd3a72eb1f2a31ba2a98e3fd97fe9d57714b7d9846553eb881a3435 binutils-ld-fix-static-linking.patch +sha512sums="20977ad17729141a2c26d358628f44a0944b84dcfefdec2ba029c2d02f40dfc41cc91c0631044560d2bd6f9a51e1f15846b4b311befbe14f1239f14ff7d57824 binutils-2.43.1.tar.xz +161c131799f8a8b16ef911f327506c5a040cc0e9c0baef9d5614bfe596e704ec434aad7cf5751a4f89e4c2ec6cf2889e474db9d16514c88c2e05d05ee0bd8f6a binutils-ld-fix-static-linking.patch 5eef9c29066f906fc133736efdfb9c94a897f08650bb741dc0ea8b5614563166d2afa9018c045569c853ae7cabe08ef5ec3539eb7b53df55b39b8c659a8c8b72 disable-ifunc-tests.patch -b9f5c09aec2e6423f31fae48a26b8138f65569e63f28dc2190cb73abc2493832cc33362443ec0f24e7833bf2eb0f14ce78045d82fd8ebb4097eafd1f1a34a3fe disable-mbind2b.patch +18052b9698da2a66cd47bd1f1a8fb4aa7be9f1f8fea97d92392690639ebb7e56f13ad5f9c51b26cf0f3d88326caf7f708bd0349348eefbeb7790994e416abb01 disable-mbind2b.patch 086f97e52c536e68b082716d054d32be50b0947cab9c62d87b1959efbf8f99423b6dc52f79da4a6dedc588a577132cb062a071928cd2b85449a107b89c3771de disable-pr26580-test.patch -6568983766b0b9e947c21fc12f29d41b79a2a0c0c162e0d2c00120713da76bec7b6369333dbdca9d53dd0c81e2cd438c20e30076893742bfb8e14dbc89301c57 disable-preinit-array-tests.patch +356c5024b40fc623505776527c7ab74b7e834e4250fe0c1fd99c826854cabc387d946a9fbafe10da1c75a1cf7d92fd21cbd2b3057819e411d9a601d39d28d2f3 disable-preinit-array-tests.patch 4b0089f72c676fadbbcffbd87d2715ca010a4a87392d677b0887b86ce5c2ba446fb45e079bcd4492c47d1479b91b4a2c5b2466746166081e04f4b24191239625 disable-relr-glibc-tests.patch e8ebb984e9b13b75114c8092d1ad2d0c1b3bb59bf10e66ca250151e79844125a23f74b8c4142210c8e574785c35e0ee1df0499e0cfd6ef59e8e80d58121963e1 disable-sframe-tests.patch -4948b963906a72075873f2988289294f6c1eb60297ac2bdee5d8646ad8a23f8f16d98b3e4f048fb625d347be28028a87247241a8dca030b4847450951b7aca32 libctf-32bit-test.patch 1f22d31b4bc1ed96d9aa1fc49c4328c6516cbb196c0d86db3f68665b948a4950911bb23d53c6f3b82703cddf9380f706355177842f12aa7fc11dd0124feadd3e musl-preinit-array.patch ad38c37ae67f60cf3091bf5012dbdaba0982a3e4eac5f3be400d989fb3f7400a4be2db0b8658357ec1e8be71eaddf012e9608ae8540f28fe9fa3af3d87e90fa3 musl-versioned-syms.patch c76733b76daf5d4af17464777cb753c68063fdc6040d943962c78182ca65f46a2744d4437f6cc3b8ff5f09ff8c0f582690b7dc89eaaf4da48f9300a81b8b3803 pr25749-test-size.patch @@ -160,8 +154,6 @@ b4bd7b5d2ad3705c7db0924c73bd91d5f8ef07e73f146c250af7d794387ab219b02254b1b61060a5 06f9df891a4ae0e9f6f8b3282d3691ede7cc0f08d63bf722f942f3c94dd4d7f3907b7bb5a8087e63639569e61aed6c39b5f5da7ad6566e7ef278524aa32ada63 remove-pr19553c-test.patch 075565f9bc85c0fc4bd36c7a848f6b876b71fbbe0f572b5c21961687ab4e2cd00c784fba09fe92b214c4b1df871ebd6409e6c93dde5a0a6c1ef6e41a30b24520 visibility-musl.patch 55bdb08f93563449b170ba8623cd7d4409c8f22abb15fca23bc87f23cc43cd580fa149e68271e65fdf2c29ddb0a15cd78d6f0de1a50332fdc026ea1b7d0ec7b8 vsb-hammer.patch -fcd71dc0e664bce0d1066b6adec9b8eebb85eb589061ad7e88934dbda4d5f8849ff6db97299a8026840515e44a73de5e131e3209052be45e807706e79ef8a045 x86_64-mark-plt.patch -f524acb49e7ce14133a11b237858aaadc84f4c3290b6e59335ec293fc6cc0e65c9bdd47c2b68bf75bb3a39ebe2e61df4f7bf941acec69d79968aa68915ade4d5 x86_64-missing-test.patch c62365110dd0a550e55f1445b197f1f968849b1079439cda0d44778772964779b4ab1142ccc662ba75ebb040e09ef4b4bfc253f4632db24ed783155be2f5f3b1 BTS-170.patch ab7d0c1fa74862bf9364d5e2228200054a2c5c4351c979dc7a9850f630d74034edffba740b468e009c5419a3cec110322364303f8af28dcdbfbe672c3c16f450 BTS-196.patch 95f2063ecb902148e53603211452ca21d4dec215c32a07c2eebc5881dbdc7cba34a7a49177fedf4db1d7d8542708af673a31930fd7d49a6a2eb00b47dbe6eeb9 fix-deprecated-egrep-usage.patch" diff --git a/system/binutils/ar-deterministic-tests.patch b/system/binutils/ar-deterministic-tests.patch deleted file mode 100644 index f3f63b937..000000000 --- a/system/binutils/ar-deterministic-tests.patch +++ /dev/null @@ -1,67 +0,0 @@ -From: Stephen Kitt <steve@sk2.org> -Date: Mon, 11 Mar 2024 07:21:47 +0000 (+0100) -Subject: tests: force non-deterministic mode in non-deterministic tests -X-Git-Tag: gdb-15-branchpoint~761 -X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=64e215c15bc316f673161c76db93a50bda45666a;hp=5790996072837620a8fd3756dda5138eb2f2781b - -tests: force non-deterministic mode in non-deterministic tests - -Since ar can be built defaulting to deterministic mode, tests which -expect non-deterministic behaviour need to explicitly set the U flag. - -The non-deterministic member test expects SOURCE_DATE_EPOCH to not be -set; this documents that. Unconditionally unsetting the variable -causes issues in test infrastructure (which expects unsetenv to only -be called on variables which are already set). - -Signed-off-by: Stephen Kitt <steve@sk2.org> ---- - -diff --git a/binutils/testsuite/binutils-all/ar.exp b/binutils/testsuite/binutils-all/ar.exp -index d4e4f64b42e..998cbe1f0a9 100644 ---- a/binutils/testsuite/binutils-all/ar.exp -+++ b/binutils/testsuite/binutils-all/ar.exp -@@ -538,6 +538,7 @@ proc replacing_deterministic_member { } { - } - - # Test replacing a member of a non-deterministic archive. -+# This test expects SOURCE_DATE_EPOCH to not be set in the environment. - - proc replacing_non_deterministic_member { } { - global AR -@@ -581,7 +582,7 @@ proc replacing_non_deterministic_member { } { - - # Build the archive with the *newer* object file. - -- set got [binutils_run $AR "rc $archive ${newer_objfile}"] -+ set got [binutils_run $AR "rcU $archive ${newer_objfile}"] - if ![string match "" $got] { - fail "$testname: (could not build archive)" - return -@@ -589,7 +590,7 @@ proc replacing_non_deterministic_member { } { - - # Now try to replace the newer file with the older one. This should not work. - -- set got [binutils_run $AR "ru $archive $older_objfile"] -+ set got [binutils_run $AR "ruU $archive $older_objfile"] - if ![string match "" $got] { - fail "$testname: (failed to replace file)" - return -@@ -651,7 +652,7 @@ proc replacing_sde_deterministic_member { } { - # Build the archive with the *newer* object file. - setenv SOURCE_DATE_EPOCH "1000" - -- set got [binutils_run $AR "rc $archive ${newer_objfile}"] -+ set got [binutils_run $AR "rcU $archive ${newer_objfile}"] - if ![string match "" $got] { - fail "$testname: (could not build archive)" - unsetenv SOURCE_DATE_EPOCH -@@ -662,7 +663,7 @@ proc replacing_sde_deterministic_member { } { - # archive this will not work, but one created to be deterministic - # should always replace its members. - -- set got [binutils_run $AR "ru $archive $older_objfile"] -+ set got [binutils_run $AR "ruU $archive $older_objfile"] - if ![string match "" $got] { - fail "$testname: (failed to replace file)" - unsetenv SOURCE_DATE_EPOCH diff --git a/system/binutils/binutils-ld-fix-static-linking.patch b/system/binutils/binutils-ld-fix-static-linking.patch index d1bbe41a4..12046fcad 100644 --- a/system/binutils/binutils-ld-fix-static-linking.patch +++ b/system/binutils/binutils-ld-fix-static-linking.patch @@ -3,7 +3,7 @@ diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc index e8126cb..9532bfb 100644 --- a/ld/scripttempl/elf.sc +++ b/ld/scripttempl/elf.sc -@@ -269,8 +269,8 @@ test "${LARGE_SECTIONS}" = "yes" && LARGE_SECTIONS=" +@@ -271,8 +271,8 @@ test "${LARGE_SECTIONS}" = "yes" && LARGE_SECTIONS=" if test "${ENABLE_INITFINI_ARRAY}" = "yes"; then SORT_INIT_ARRAY="KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))" SORT_FINI_ARRAY="KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))" @@ -14,7 +14,7 @@ index e8126cb..9532bfb 100644 else SORT_INIT_ARRAY="KEEP (*(SORT(.init_array.*)))" SORT_FINI_ARRAY="KEEP (*(SORT(.fini_array.*)))" -@@ -310,15 +310,14 @@ CTOR=".ctors ${CONSTRUCTING-0} : +@@ -312,15 +312,14 @@ CTOR=".ctors ${CONSTRUCTING-0} : doesn't matter which directory crtbegin.o is in. */ @@ -32,7 +32,7 @@ index e8126cb..9532bfb 100644 KEEP (*(SORT(.ctors.*))) KEEP (*(.ctors)) ${CONSTRUCTING+${CTOR_END}} -@@ -326,9 +325,8 @@ CTOR=".ctors ${CONSTRUCTING-0} : +@@ -328,9 +327,8 @@ CTOR=".ctors ${CONSTRUCTING-0} : DTOR=".dtors ${CONSTRUCTING-0} : { ${CONSTRUCTING+${DTOR_START}} diff --git a/system/binutils/disable-mbind2b.patch b/system/binutils/disable-mbind2b.patch index dee8690f1..ab456af56 100644 --- a/system/binutils/disable-mbind2b.patch +++ b/system/binutils/disable-mbind2b.patch @@ -2,7 +2,7 @@ XXX working upstream with musl, trying to push to other arches for testing --- binutils-2.41/ld/testsuite/ld-elf/elf.exp.old 2023-09-22 22:22:00.860304785 -0500 +++ binutils-2.41/ld/testsuite/ld-elf/elf.exp 2023-09-22 23:43:12.163396014 -0500 -@@ -493,15 +493,6 @@ +@@ -508,15 +508,6 @@ "pass.out" \ "-O2 -I../bfd" \ ] \ diff --git a/system/binutils/disable-preinit-array-tests.patch b/system/binutils/disable-preinit-array-tests.patch index 5693d4bbd..f947c4dfd 100644 --- a/system/binutils/disable-preinit-array-tests.patch +++ b/system/binutils/disable-preinit-array-tests.patch @@ -1,6 +1,6 @@ --- binutils-2.29/ld/testsuite/ld-elf/elf.exp.old 2017-07-04 08:43:21.000000000 +0000 +++ binutils-2.29/ld/testsuite/ld-elf/elf.exp 2017-08-19 04:46:32.214460537 +0000 -@@ -392,8 +392,6 @@ +@@ -407,8 +407,6 @@ } set array_tests { @@ -9,7 +9,7 @@ {"init array" "" "" {init.c} "init" "init.out"} {"fini array" "" "" -@@ -402,8 +400,6 @@ +@@ -417,8 +415,6 @@ {init-mixed.c} "init-mixed" "init-mixed.out" "-I."} } set array_tests_pie { @@ -18,7 +18,7 @@ {"PIE init array" "-pie" "" {init.c} "init" "init.out" "-fPIE"} {"PIE fini array" "-pie" "" -@@ -414,8 +410,6 @@ +@@ -429,8 +425,6 @@ {pr14525.c} "pr14525" "pr14525.out" "-fPIE"} } set array_tests_static { diff --git a/system/binutils/x86_64-mark-plt.patch b/system/binutils/x86_64-mark-plt.patch deleted file mode 100644 index 29e1bd3bc..000000000 --- a/system/binutils/x86_64-mark-plt.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6ef47613129c9251a5b8d5fa15ce6ea3ebe81ec1 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" <hjl.tools@gmail.com> -Date: Wed, 10 Jul 2024 15:19:23 -0700 -Subject: [PATCH] x86-64: Skip -z mark-plt tests on MUSL - -Skip -z mark-plt tests, which are specific to glibc, on MUSL. - - PR ld/31970 - * ld/testsuite/ld-x86-64/x86-64.exp: Skip -z mark-plt tests on - MUSL. - -Signed-off-by: H.J. Lu <hjl.tools@gmail.com> ---- - ld/testsuite/ld-x86-64/x86-64.exp | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp -index dddac4375e1..57a1cc44e2c 100644 ---- a/ld/testsuite/ld-x86-64/x86-64.exp -+++ b/ld/testsuite/ld-x86-64/x86-64.exp -@@ -2274,6 +2274,13 @@ run_dump_test "ibt-plt-3a-x32" - run_dump_test "ibt-plt-3b-x32" - run_dump_test "ibt-plt-3c-x32" - run_dump_test "ibt-plt-3d-x32" -+ -+# Skip -z mark-plt tests on MUSL. -+if { [istarget "x86_64-*-musl*"]} { -+ set ASFLAGS "$saved_ASFLAGS" -+ return -+} -+ - run_dump_test "mark-plt-1a" - run_dump_test "mark-plt-1b" - run_dump_test "mark-plt-1c" --- -2.45.2 - diff --git a/system/binutils/x86_64-missing-test.patch b/system/binutils/x86_64-missing-test.patch deleted file mode 100644 index e6544c1a1..000000000 --- a/system/binutils/x86_64-missing-test.patch +++ /dev/null @@ -1,91 +0,0 @@ -From: Indu Bhagat <indu.bhagat@oracle.com> -Date: Tue, 30 Jan 2024 08:35:04 +0000 (-0800) -Subject: gas: scfi: add missing ginsn-cofi-1 testcase files -X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=48942a586ebc056bd059d3f63a5eed3a2fa46ab3;hp=7586594c484bbc2a1fb472b988c7e9cbc08c8416 - -gas: scfi: add missing ginsn-cofi-1 testcase files - -Previous commit a58dc5427f0 intended to bring the following two commits -from master branch: - - 91cdbed4d7b gas: scfi: untraceable control flow should be a hard error - 16cbeae1b27 x86: testsuite: scfi: adjust COFI testcase - -But missed adding the testcase files. Fix the failure by adding the -missing files. - -gas/testsuite/ - * gas/scfi/x86_64/ginsn-cofi-1.l: New test. - * gas/scfi/x86_64/ginsn-cofi-1.s: Likewise. ---- - -diff --git a/gas/testsuite/gas/scfi/x86_64/ginsn-cofi-1.l b/gas/testsuite/gas/scfi/x86_64/ginsn-cofi-1.l -new file mode 100644 -index 00000000000..ab6b50d47e8 ---- /dev/null -+++ b/gas/testsuite/gas/scfi/x86_64/ginsn-cofi-1.l -@@ -0,0 +1,38 @@ -+.*: Assembler messages: -+.*:20: Error: untraceable control flow for func 'foo' -+GAS LISTING .* -+ -+ -+ 1 # Testcase with a variety of "change of flow instructions" -+ 2 # -+ 3 # This test does not have much going on wrt synthesis of CFI; -+ 4 # it just aims to ensure x8_64 -> ginsn decoding behaves -+ 5 # gracefully for these "change of flow instructions" -+ 6 .text -+ 7 .globl foo -+ 8 .type foo, @function -+ 8 ginsn: SYM FUNC_BEGIN -+ 9 foo: -+ 9 ginsn: SYM foo -+ 10 \?\?\?\? 4801D0 addq %rdx, %rax -+ 10 ginsn: ADD %r1, %r0, %r0 -+ 11 \?\?\?\? E200 loop foo -+ 11 ginsn: JCC -+ 12 \?\?\?\? 3EFFE0 notrack jmp \*%rax -+ 12 ginsn: JMP %r0, -+ 13 \?\?\?\? 41FFD0 call \*%r8 -+ 13 ginsn: CALL -+ 14 \?\?\?\? 67E305 jecxz .L179 -+ 14 ginsn: JCC -+ 15 \?\?\?\? FF6730 jmp \*48\(%rdi\) -+ 15 ginsn: JMP %r5, -+ 16 \?\?\?\? 7000 jo .L179 -+ 16 ginsn: JCC -+ 17 .L179: -+ 17 ginsn: SYM .L179 -+ 18 \?\?\?\? C3 ret -+ 18 ginsn: RET -+ 19 .LFE0: -+ 19 ginsn: SYM .LFE0 -+ 20 .size foo, .-foo -+ 20 ginsn: SYM FUNC_END -diff --git a/gas/testsuite/gas/scfi/x86_64/ginsn-cofi-1.s b/gas/testsuite/gas/scfi/x86_64/ginsn-cofi-1.s -new file mode 100644 -index 00000000000..0a63910e046 ---- /dev/null -+++ b/gas/testsuite/gas/scfi/x86_64/ginsn-cofi-1.s -@@ -0,0 +1,20 @@ -+# Testcase with a variety of "change of flow instructions" -+# -+# This test does not have much going on wrt synthesis of CFI; -+# it just aims to ensure x8_64 -> ginsn decoding behaves -+# gracefully for these "change of flow instructions" -+ .text -+ .globl foo -+ .type foo, @function -+foo: -+ addq %rdx, %rax -+ loop foo -+ notrack jmp *%rax -+ call *%r8 -+ jecxz .L179 -+ jmp *48(%rdi) -+ jo .L179 -+.L179: -+ ret -+.LFE0: -+ .size foo, .-foo |