From b8be9aea5c62124373c739234fc36d7d85ab4dc4 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 31 May 2022 14:55:41 -0700 Subject: [PATCH] i386: Ajdust more tests for opcodes/i386: remove trailing whitespace This fixes: FAIL: Build ifunc-1a with -z ibtplt FAIL: Build ifunc-1a with PIE -z ibtplt FAIL: Build libno-plt-1b.so FAIL: No PLT (dynamic 1a) FAIL: No PLT (dynamic 1b) FAIL: No PLT (dynamic 1c) FAIL: No PLT (static 1d) FAIL: No PLT (PIE 1e) FAIL: No PLT (PIE 1f) FAIL: No PLT (PIE 1g) FAIL: No PLT (dynamic 1h) FAIL: No PLT (dynamic 1i) FAIL: No PLT (static 1j) * ld-i386/libno-plt-1b.dd: Remove trailing whitespaces. * ld-i386/no-plt-1a.dd: Likewise. * ld-i386/no-plt-1b.dd: Likewise. * ld-i386/no-plt-1c.dd: Likewise. * ld-i386/no-plt-1d.dd: Likewise. * ld-i386/no-plt-1e.dd: Likewise. * ld-i386/no-plt-1f.dd: Likewise. * ld-i386/no-plt-1g.dd: Likewise. * ld-i386/no-plt-1h.dd: Likewise. * ld-i386/no-plt-1i.dd: Likewise. * ld-i386/no-plt-1j.dd: Likewise. * ld-i386/plt-main-ibt.dd: Likewise. * ld-i386/plt-pie-ibt.dd: Likewise. --- ld/testsuite/ld-i386/libno-plt-1b.dd | 2 +- ld/testsuite/ld-i386/no-plt-1a.dd | 4 ++-- ld/testsuite/ld-i386/no-plt-1b.dd | 2 +- ld/testsuite/ld-i386/no-plt-1c.dd | 2 +- ld/testsuite/ld-i386/no-plt-1d.dd | 4 ++-- ld/testsuite/ld-i386/no-plt-1e.dd | 4 ++-- ld/testsuite/ld-i386/no-plt-1f.dd | 2 +- ld/testsuite/ld-i386/no-plt-1g.dd | 2 +- ld/testsuite/ld-i386/no-plt-1h.dd | 4 ++-- ld/testsuite/ld-i386/no-plt-1i.dd | 4 ++-- ld/testsuite/ld-i386/no-plt-1j.dd | 4 ++-- ld/testsuite/ld-i386/plt-main-ibt.dd | 2 +- ld/testsuite/ld-i386/plt-pie-ibt.dd | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ld/testsuite/ld-i386/libno-plt-1b.dd b/ld/testsuite/ld-i386/libno-plt-1b.dd index 507ed16217f..eec9d4ac45a 100644 --- a/ld/testsuite/ld-i386/libno-plt-1b.dd +++ b/ld/testsuite/ld-i386/libno-plt-1b.dd @@ -10,7 +10,7 @@ Disassembly of section .text: +[a-f0-9]+: e8 ([0-9a-f]{2} ){4}[ ]+call +[a-f0-9]+ <__x86.get_pc_thunk.ax> +[a-f0-9]+: 05 ([0-9a-f]{2} ){4}[ ]+add +\$0x[a-f0-9]+,%eax +[a-f0-9]+: 8b 80 ([0-9a-f]{2} ){4}[ ]+mov +-0x[a-f0-9]+\(%eax\),%eax - +[a-f0-9]+: c3 ret + +[a-f0-9]+: c3 ret #... [0-9a-f]+ : +[a-f0-9]+: e8 ([0-9a-f]{2} ){4}[ ]+call +[a-f0-9]+ <__x86.get_pc_thunk.ax> diff --git a/ld/testsuite/ld-i386/no-plt-1a.dd b/ld/testsuite/ld-i386/no-plt-1a.dd index e5bd9bdcd1e..8c76d9b5e37 100644 --- a/ld/testsuite/ld-i386/no-plt-1a.dd +++ b/ld/testsuite/ld-i386/no-plt-1a.dd @@ -29,14 +29,14 @@ Disassembly of section .text: +[a-f0-9]+: ff 93 ([0-9a-f]{2} ){4}[ ]+call +\*-0x[0-9a-f]+\(%ebx\) +[a-f0-9]+: 83 c4 18 add \$0x18,%esp +[a-f0-9]+: 5b pop %ebx - +[a-f0-9]+: c3 ret + +[a-f0-9]+: c3 ret +[a-f0-9]+: ff 93 ([0-9a-f]{2} ){4}[ ]+call +\*-0x[0-9a-f]+\(%ebx\) #... [0-9a-f]+ : +[a-f0-9]+: e8 ([0-9a-f]{2} ){4}[ ]+call +[a-f0-9]+ <__x86.get_pc_thunk.ax> +[a-f0-9]+: 05 ([0-9a-f]{2} ){4}[ ]+add +\$0x[a-f0-9]+,%eax +[a-f0-9]+: c7 c0 ([0-9a-f]{2} ){4}[ ]+mov +\$0x[a-f0-9]+,%eax - +[a-f0-9]+: c3 ret + +[a-f0-9]+: c3 ret #... [0-9a-f]+ : +[a-f0-9]+: e8 ([0-9a-f]{2} ){4}[ ]+call +[a-f0-9]+ <__x86.get_pc_thunk.ax> diff --git a/ld/testsuite/ld-i386/no-plt-1b.dd b/ld/testsuite/ld-i386/no-plt-1b.dd index 2d35336945e..431011cf2cd 100644 --- a/ld/testsuite/ld-i386/no-plt-1b.dd +++ b/ld/testsuite/ld-i386/no-plt-1b.dd @@ -29,6 +29,6 @@ Disassembly of section .text: +[a-f0-9]+: ff 93 ([0-9a-f]{2} ){4}[ ]+call +\*-0x[0-9a-f]+\(%ebx\) +[a-f0-9]+: 83 c4 18 add \$0x18,%esp +[a-f0-9]+: 5b pop %ebx - +[a-f0-9]+: c3 ret + +[a-f0-9]+: c3 ret +[a-f0-9]+: ff 93 ([0-9a-f]{2} ){4}[ ]+call +\*-0x[0-9a-f]+\(%ebx\) #pass diff --git a/ld/testsuite/ld-i386/no-plt-1c.dd b/ld/testsuite/ld-i386/no-plt-1c.dd index cc5fc1738a0..ae317427562 100644 --- a/ld/testsuite/ld-i386/no-plt-1c.dd +++ b/ld/testsuite/ld-i386/no-plt-1c.dd @@ -29,6 +29,6 @@ Disassembly of section .text: +[a-f0-9]+: ff 93 ([0-9a-f]{2} ){4}[ ]+call +\*-0x[0-9a-f]+\(%ebx\) +[a-f0-9]+: 83 c4 18 add \$0x18,%esp +[a-f0-9]+: 5b pop %ebx - +[a-f0-9]+: c3 ret + +[a-f0-9]+: c3 ret +[a-f0-9]+: ff 93 ([0-9a-f]{2} ){4}[ ]+call +\*-0x[0-9a-f]+\(%ebx\) #pass diff --git a/ld/testsuite/ld-i386/no-plt-1d.dd b/ld/testsuite/ld-i386/no-plt-1d.dd index 396dbf390c6..e97c8c43111 100644 --- a/ld/testsuite/ld-i386/no-plt-1d.dd +++ b/ld/testsuite/ld-i386/no-plt-1d.dd @@ -29,14 +29,14 @@ Disassembly of section .text: +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr16 call [0-9a-f]+ <.*puts.*> +[a-f0-9]+: 83 c4 18 add \$0x18,%esp +[a-f0-9]+: 5b pop %ebx - +[a-f0-9]+: c3 ret + +[a-f0-9]+: c3 ret +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr16 call [0-9a-f]+ #... [0-9a-f]+ : +[a-f0-9]+: e8 ([0-9a-f]{2} ){4}[ ]+call +[a-f0-9]+ <__x86.get_pc_thunk.ax> +[a-f0-9]+: 05 ([0-9a-f]{2} ){4}[ ]+add +\$0x[a-f0-9]+,%eax +[a-f0-9]+: c7 c0 ([0-9a-f]{2} ){4}[ ]+mov +\$0x[a-f0-9]+,%eax - +[a-f0-9]+: c3 ret + +[a-f0-9]+: c3 ret #... [0-9a-f]+ : +[a-f0-9]+: e8 ([0-9a-f]{2} ){4}[ ]+call +[a-f0-9]+ <__x86.get_pc_thunk.ax> diff --git a/ld/testsuite/ld-i386/no-plt-1e.dd b/ld/testsuite/ld-i386/no-plt-1e.dd index 6f271992f90..56b1a762944 100644 --- a/ld/testsuite/ld-i386/no-plt-1e.dd +++ b/ld/testsuite/ld-i386/no-plt-1e.dd @@ -29,14 +29,14 @@ Disassembly of section .text: +[a-f0-9]+: ff 93 ([0-9a-f]{2} ){4}[ ]+call +\*-0x[0-9a-f]+\(%ebx\) +[a-f0-9]+: 83 c4 18 add \$0x18,%esp +[a-f0-9]+: 5b pop %ebx - +[a-f0-9]+: c3 ret + +[a-f0-9]+: c3 ret +[a-f0-9]+: ff 93 ([0-9a-f]{2} ){4}[ ]+call +\*-0x[0-9a-f]+\(%ebx\) #... [0-9a-f]+ : +[a-f0-9]+: e8 ([0-9a-f]{2} ){4}[ ]+call +[a-f0-9]+ <__x86.get_pc_thunk.ax> +[a-f0-9]+: 05 ([0-9a-f]{2} ){4}[ ]+add +\$0x[a-f0-9]+,%eax +[a-f0-9]+: 8d 80 ([0-9a-f]{2} ){4}[ ]+lea +-0x[a-f0-9]+\(%eax\),%eax - +[a-f0-9]+: c3 ret + +[a-f0-9]+: c3 ret #... [0-9a-f]+ : +[a-f0-9]+: e8 ([0-9a-f]{2} ){4}[ ]+call +[a-f0-9]+ <__x86.get_pc_thunk.ax> diff --git a/ld/testsuite/ld-i386/no-plt-1f.dd b/ld/testsuite/ld-i386/no-plt-1f.dd index 2d35336945e..431011cf2cd 100644 --- a/ld/testsuite/ld-i386/no-plt-1f.dd +++ b/ld/testsuite/ld-i386/no-plt-1f.dd @@ -29,6 +29,6 @@ Disassembly of section .text: +[a-f0-9]+: ff 93 ([0-9a-f]{2} ){4}[ ]+call +\*-0x[0-9a-f]+\(%ebx\) +[a-f0-9]+: 83 c4 18 add \$0x18,%esp +[a-f0-9]+: 5b pop %ebx - +[a-f0-9]+: c3 ret + +[a-f0-9]+: c3 ret +[a-f0-9]+: ff 93 ([0-9a-f]{2} ){4}[ ]+call +\*-0x[0-9a-f]+\(%ebx\) #pass diff --git a/ld/testsuite/ld-i386/no-plt-1g.dd b/ld/testsuite/ld-i386/no-plt-1g.dd index f9464e7135c..4f184533cbe 100644 --- a/ld/testsuite/ld-i386/no-plt-1g.dd +++ b/ld/testsuite/ld-i386/no-plt-1g.dd @@ -29,6 +29,6 @@ Disassembly of section .text: +[a-f0-9]+: ff 93 ([0-9a-f]{2} ){4}[ ]+call +\*-0x[0-9a-f]+\(%ebx\) +[a-f0-9]+: 83 c4 18 add \$0x18,%esp +[a-f0-9]+: 5b pop %ebx - +[a-f0-9]+: c3 ret + +[a-f0-9]+: c3 ret +[a-f0-9]+: ff 93 ([0-9a-f]{2} ){4}[ ]+call +\*-0x[0-9a-f]+\(%ebx\) #pass diff --git a/ld/testsuite/ld-i386/no-plt-1h.dd b/ld/testsuite/ld-i386/no-plt-1h.dd index 0d662c930d7..b24697aa429 100644 --- a/ld/testsuite/ld-i386/no-plt-1h.dd +++ b/ld/testsuite/ld-i386/no-plt-1h.dd @@ -24,12 +24,12 @@ Disassembly of section .text: +[a-f0-9]+: 68 ([0-9a-f]{2} ){4}[ ]+push +\$0x[0-9a-f]+ +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+call +\*0x[0-9a-f]+ +[a-f0-9]+: 83 c4 1c add \$0x1c,%esp - +[a-f0-9]+: c3 ret + +[a-f0-9]+: c3 ret +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+call +\*0x[0-9a-f]+ #... [0-9a-f]+ : +[a-f0-9]+: c7 c0 ([0-9a-f]{2} ){4}[ ]+mov +\$0x[a-f0-9]+,%eax - +[a-f0-9]+: c3 ret + +[a-f0-9]+: c3 ret #... [0-9a-f]+ : +[a-f0-9]+: e9 ([0-9a-f]{2} ){4}[ ]+jmp +[0-9a-f]+ diff --git a/ld/testsuite/ld-i386/no-plt-1i.dd b/ld/testsuite/ld-i386/no-plt-1i.dd index 05e2d6de4d3..e86d21c1e3d 100644 --- a/ld/testsuite/ld-i386/no-plt-1i.dd +++ b/ld/testsuite/ld-i386/no-plt-1i.dd @@ -24,12 +24,12 @@ Disassembly of section .text: +[a-f0-9]+: 68 ([0-9a-f]{2} ){4}[ ]+push +\$0x[0-9a-f]+ +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+call +\*0x[0-9a-f]+ +[a-f0-9]+: 83 c4 1c add \$0x1c,%esp - +[a-f0-9]+: c3 ret + +[a-f0-9]+: c3 ret +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+call +\*0x[0-9a-f]+ #... [0-9a-f]+ : +[a-f0-9]+: 8b 05 ([0-9a-f]{2} ){4}[ ]+mov +0x[a-f0-9]+,%eax - +[a-f0-9]+: c3 ret + +[a-f0-9]+: c3 ret #... [0-9a-f]+ : +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmp +\*0x[0-9a-f]+ diff --git a/ld/testsuite/ld-i386/no-plt-1j.dd b/ld/testsuite/ld-i386/no-plt-1j.dd index 258b0a04d64..eaeaf188373 100644 --- a/ld/testsuite/ld-i386/no-plt-1j.dd +++ b/ld/testsuite/ld-i386/no-plt-1j.dd @@ -24,12 +24,12 @@ Disassembly of section .text: +[a-f0-9]+: 68 ([0-9a-f]{2} ){4}[ ]+push +\$0x[0-9a-f]+ +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr16 call [0-9a-f]+ <.*puts.*> +[a-f0-9]+: 83 c4 1c add \$0x1c,%esp - +[a-f0-9]+: c3 ret + +[a-f0-9]+: c3 ret +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr16 call [0-9a-f]+ #... [0-9a-f]+ : +[a-f0-9]+: c7 c0 ([0-9a-f]{2} ){4}[ ]+mov +\$0x[a-f0-9]+,%eax - +[a-f0-9]+: c3 ret + +[a-f0-9]+: c3 ret #... [0-9a-f]+ : +[a-f0-9]+: e9 ([0-9a-f]{2} ){4}[ ]+jmp +[0-9a-f]+ diff --git a/ld/testsuite/ld-i386/plt-main-ibt.dd b/ld/testsuite/ld-i386/plt-main-ibt.dd index 6a1d4bf979d..9140deed884 100644 --- a/ld/testsuite/ld-i386/plt-main-ibt.dd +++ b/ld/testsuite/ld-i386/plt-main-ibt.dd @@ -2,6 +2,6 @@ Disassembly of section .plt.(sec|got): [a-f0-9]+ <[_a-z]+@plt>: -[ ]*[a-f0-9]+: f3 0f 1e fb endbr32 +[ ]*[a-f0-9]+: f3 0f 1e fb endbr32 [ ]*[a-f0-9]+: ff 25 .. .. .. .. jmp +\*0x[a-f0-9]+ #pass diff --git a/ld/testsuite/ld-i386/plt-pie-ibt.dd b/ld/testsuite/ld-i386/plt-pie-ibt.dd index 2dc016c3b24..4cc37cbb56a 100644 --- a/ld/testsuite/ld-i386/plt-pie-ibt.dd +++ b/ld/testsuite/ld-i386/plt-pie-ibt.dd @@ -2,6 +2,6 @@ Disassembly of section .plt.got: [a-f0-9]+ <[_a-z]+@plt>: -[ ]*[a-f0-9]+: f3 0f 1e fb endbr32 +[ ]*[a-f0-9]+: f3 0f 1e fb endbr32 [ ]*[a-f0-9]+: ff a3 .. .. .. .. jmp +\*\-0x[a-f0-9]+\(%ebx\) #pass -- 2.30.2