commit: c0ada7cf5326b17ffd2a4f8e6e9699f83e8e9b04 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Tue Jan 3 23:02:41 2023 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Tue Jan 3 23:02:41 2023 +0000 URL: https://gitweb.gentoo.org/proj/toolchain/binutils-patches.git/commit/?id=c0ada7cf
Fix tests on aarch64 (submitted upstream) Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> ...e-relax-regexps-to-make-tests-pass-on-aar.patch | 52 ++++++++++++++++++++++ ...e-un-xfail-pr19719-tests-on-aarch64-seems.patch | 26 +++++++++++ 2 files changed, 78 insertions(+) diff --git a/9999/0007-ld-testsuite-relax-regexps-to-make-tests-pass-on-aar.patch b/9999/0007-ld-testsuite-relax-regexps-to-make-tests-pass-on-aar.patch new file mode 100644 index 0000000..d129d85 --- /dev/null +++ b/9999/0007-ld-testsuite-relax-regexps-to-make-tests-pass-on-aar.patch @@ -0,0 +1,52 @@ +From 80c4388424197f5994fa71646fe81ba77b69d996 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <[email protected]> +Date: Tue, 3 Jan 2023 22:23:02 +0100 +Subject: [PATCH 1/2] ld testsuite: relax regexps to make tests pass on + aarch64, bug 29843 + +--- + ld/testsuite/ld-aarch64/bti-plt-5.d | 8 ++++---- + ld/testsuite/ld-aarch64/tls-relax-gdesc-le-now.d | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/ld/testsuite/ld-aarch64/bti-plt-5.d b/ld/testsuite/ld-aarch64/bti-plt-5.d +index 12abbc2e055..ed0029b8de1 100644 +--- a/ld/testsuite/ld-aarch64/bti-plt-5.d ++++ b/ld/testsuite/ld-aarch64/bti-plt-5.d +@@ -13,8 +13,8 @@ Disassembly of section \.plt: + .*: d503245f bti c + .*: a9bf7bf0 stp x16, x30, \[sp, #-16\]! + .*: 90000090 adrp x16, 410000 <.*> +-.*: f9421611 ldr x17, \[x16, #1064\] +-.*: 9110a210 add x16, x16, #0x428 ++.*: f9...... ldr x17, \[x16, #....\] ++.*: 91...... add x16, x16, #0x... + .*: d61f0220 br x17 + .*: d503201f nop + .*: d503201f nop +@@ -22,7 +22,7 @@ Disassembly of section \.plt: + [0-9a-f]+ <.*>: + .*: d503245f bti c + .*: 90000090 adrp x16, 410000 <.*> +-.*: f9421a11 ldr x17, \[x16, #1072\] +-.*: 9110c210 add x16, x16, #0x430 ++.*: f9...... ldr x17, \[x16, #....\] ++.*: 91...... add x16, x16, #0x... + .*: d61f0220 br x17 + .*: d503201f nop +diff --git a/ld/testsuite/ld-aarch64/tls-relax-gdesc-le-now.d b/ld/testsuite/ld-aarch64/tls-relax-gdesc-le-now.d +index 8b6dceff81b..dcf913428fb 100644 +--- a/ld/testsuite/ld-aarch64/tls-relax-gdesc-le-now.d ++++ b/ld/testsuite/ld-aarch64/tls-relax-gdesc-le-now.d +@@ -11,7 +11,7 @@ + 0x.+ \(PLTRELSZ\) \s+.+ \(bytes\) + 0x.+ \(PLTREL\) \s+RELA + 0x.+ \(JMPREL\) \s+0x.+ +- 0x.+ \(BIND_NOW\) \s+ ++ 0x.+ (\(BIND_NOW\) \s+|\(FLAGS\) \s+ BIND_NOW) + 0x.+ \(FLAGS_1\) \s+ Flags: NOW + 0x.+ \(NULL\) \s+ 0x0 + +-- +2.38.2 + diff --git a/9999/0008-ld-testsuite-un-xfail-pr19719-tests-on-aarch64-seems.patch b/9999/0008-ld-testsuite-un-xfail-pr19719-tests-on-aarch64-seems.patch new file mode 100644 index 0000000..7168d7e --- /dev/null +++ b/9999/0008-ld-testsuite-un-xfail-pr19719-tests-on-aarch64-seems.patch @@ -0,0 +1,26 @@ +From 0564593ab415665b6de8089debf4a0205582d8ef Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <[email protected]> +Date: Tue, 3 Jan 2023 22:39:24 +0100 +Subject: [PATCH 2/2] ld testsuite: un-xfail pr19719 tests on aarch64, seems to + succeed now + +--- + ld/testsuite/ld-elf/shared.exp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ld/testsuite/ld-elf/shared.exp b/ld/testsuite/ld-elf/shared.exp +index 6dd99bb5c9d..db9d71398de 100644 +--- a/ld/testsuite/ld-elf/shared.exp ++++ b/ld/testsuite/ld-elf/shared.exp +@@ -1656,7 +1656,7 @@ proc mix_pic_and_non_pic {xfails cflags ldflags exe} { + } + } + +-mix_pic_and_non_pic [list "arm*-*-*" "aarch64*-*-*"] "" "" "pr19719" ++mix_pic_and_non_pic [list "arm*-*-*"] "" "" "pr19719" + mix_pic_and_non_pic [] "-fPIE" "-pie" "pr19719pie" + + set AFLAGS_PIE "" +-- +2.38.2 +
