[PATCH] ld/testsuite: Fix test failures in pe.exp caused by 8819b236
Mark Harmstone
mark@harmstone.com
Thu Jan 5 00:27:43 GMT 2023
This fixes three test failures caused by the change in .idata alignment
on x86_64-w64-mingw32.
The secrel and secidx tests were dumping .idata, so this is easy enough
to solve - it's irrelevant to the tests anyway.
As for the CFI test, it looks like the debug_frame code inserts an empty
entry at the beginning to pad this to an 8-byte boundary, so I've
changed the section alignment for the test to fix this.
---
ld/testsuite/ld-pe/cfi.d | 6 +++---
ld/testsuite/ld-pe/secidx_64.d | 2 +-
ld/testsuite/ld-pe/secrel_64.d | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ld/testsuite/ld-pe/cfi.d b/ld/testsuite/ld-pe/cfi.d
index 55ebaca1aef..c4d9b6ef2c3 100644
--- a/ld/testsuite/ld-pe/cfi.d
+++ b/ld/testsuite/ld-pe/cfi.d
@@ -1,10 +1,10 @@
#source: cfia.s
#source: cfib.s
-#ld: --file-align 1 --section-align 1
+#ld: --file-align 8 --section-align 8
#objdump: -Wf
#...
-0+4 0+14 0*ffffffff CIE
+0+ 0+14 0*ffffffff CIE
Version: 1
Augmentation: ""
Code alignment factor: 1
@@ -20,7 +20,7 @@
DW_CFA_nop
DW_CFA_nop
-0+1c 0+24 0+4 FDE cie=0+4 pc=.*
+0+18 0+24 0+ FDE cie=0+ pc=.*
DW_CFA_advance_loc: 4 to .*
DW_CFA_def_cfa_offset: 16
DW_CFA_offset: r6 \(rbp\) at cfa\-16
diff --git a/ld/testsuite/ld-pe/secidx_64.d b/ld/testsuite/ld-pe/secidx_64.d
index ddf4aec74f9..6f034f7ac9e 100644
--- a/ld/testsuite/ld-pe/secidx_64.d
+++ b/ld/testsuite/ld-pe/secidx_64.d
@@ -24,4 +24,4 @@ Contents of section \.rdata:
.*3030 3c3c3c3e 3e3e3e3e 3e000000 00000000 <<<>>>>>>.......
Contents of section \.idata:
.*4000 00000000 00000000 00000000 00000000 ................
- .*4010 00000000 ....
+ .*4010 00000000 .*
diff --git a/ld/testsuite/ld-pe/secrel_64.d b/ld/testsuite/ld-pe/secrel_64.d
index aba1bf11c69..2997cac691f 100644
--- a/ld/testsuite/ld-pe/secrel_64.d
+++ b/ld/testsuite/ld-pe/secrel_64.d
@@ -25,4 +25,4 @@ Contents of section \.rdata:
.*3020 3e3e3e3e 00000000 00000000 00000000 >>>>............
Contents of section \.idata:
.*4000 00000000 00000000 00000000 00000000 ................
- .*4010 00000000 ....
+ .*4010 00000000 .*
\ No newline at end of file
--
2.37.4
More information about the Binutils
mailing list