Re: Avoid unaligned pointer reads in PEP .idata section

Fix testsuite fallout.

	* testsuite/ld-pe/cfi.d: Adjust for changed .idata padding.
	* testsuite/ld-pe/secidx_64.d: Likewise.
	* testsuite/ld-pe/secrel_64.d: Likewise.

diff --git a/ld/testsuite/ld-pe/cfi.d b/ld/testsuite/ld-pe/cfi.d
index 55ebaca1aef325dd7e622275e4c6c016fa5f47fe..9ae0ec77881f887cf45fe7526f340e4b3daa48df 100644 (file)
--- a/ld/testsuite/ld-pe/cfi.d
+++ b/ld/testsuite/ld-pe/cfi.d
@@ -4,7 +4,7 @@
 #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 ddf4aec74f91b8c74188e768d7d95108cb65ed62..63b4a589c704796c569f4fc06e6458ecfcad5356 100644 (file)
--- a/ld/testsuite/ld-pe/secidx_64.d
+++ b/ld/testsuite/ld-pe/secidx_64.d
@@ -2,26 +2,26 @@
 tmpdir/secidx\.x: +file format pei-.*
 
 Contents of section \.text:
- .*1000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c  >>>><<<<>>>>><<<
- .*1010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c  >>>>>><<>>>>>>><
- .*1020 3c3c3c3c 3e3e3e3e 3e909090 90909090  <<<<>>>>>.......
- .*1030 ffffffff ffffffff 00000000 00000000  ................
- .*1040 ffffffff ffffffff 00000000 00000000  ................
+ .*1000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c  .*
+ .*1010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c  .*
+ .*1020 3c3c3c3c 3e3e3e3e 3e909090 90909090  .*
+ .*1030 ffffffff ffffffff 00000000 00000000  .*
+ .*1040 ffffffff ffffffff 00000000 00000000  .*
 Contents of section \.data:
- .*2000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c  >>>><<<<>>>>><<<
- .*2010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c  >>>>>><<>>>>>>><
- .*2020 3e3e3e3e 01001101 00110100 11010011  >>>>............
- .*2030 3c3c3c3c 3c3c3c3c 3e3e3e3e 02001102  <<<<<<<<>>>>....
- .*2040 00110200 11020011 3c3c3c3c 3c3c3c3c  ........<<<<<<<<
- .*2050 3e3e3e3e 03001103 00110300 11030011  >>>>............
- .*2060 3c3c3c3c 3c3c3c3c 3e3e3e3e 01001102  <<<<<<<<>>>>....
- .*2070 00110300 113c3c3c 3c3c3c3c 3c000000  .....<<<<<<<<...
- .*2080 3c3c3c3e 3e3e3e3e 3e000000 00000000  <<<>>>>>>.......
+ .*2000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c  .*
+ .*2010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c  .*
+ .*2020 3e3e3e3e 01001101 00110100 11010011  .*
+ .*2030 3c3c3c3c 3c3c3c3c 3e3e3e3e 02001102  .*
+ .*2040 00110200 11020011 3c3c3c3c 3c3c3c3c  .*
+ .*2050 3e3e3e3e 03001103 00110300 11030011  .*
+ .*2060 3c3c3c3c 3c3c3c3c 3e3e3e3e 01001102  .*
+ .*2070 00110300 113c3c3c 3c3c3c3c 3c000000  .*
+ .*2080 3c3c3c3e 3e3e3e3e 3e000000 00000000  .*
 Contents of section \.rdata:
- .*3000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c  >>>><<<<>>>>><<<
- .*3010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c  >>>>>><<>>>>>>><
- .*3020 3e3e3e3e 00000000 00000000 00000000  >>>>............
- .*3030 3c3c3c3e 3e3e3e3e 3e000000 00000000  <<<>>>>>>.......
+ .*3000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c  .*
+ .*3010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c  .*
+ .*3020 3e3e3e3e 00000000 00000000 00000000  .*
+ .*3030 3c3c3c3e 3e3e3e3e 3e000000 00000000  .*
 Contents of section \.idata:
- .*4000 00000000 00000000 00000000 00000000  ................
- .*4010 00000000                             ....            
+ .*4000 00000000 00000000 00000000 00000000  .*
+ .*4010 00000000 00000000                    .*

diff --git a/ld/testsuite/ld-pe/secrel_64.d b/ld/testsuite/ld-pe/secrel_64.d
index aba1bf11c69cb40d9bd103b71afd5ba6c77ca698..82284f9cf624d76ad273fcfa61095be238f20780 100644 (file)
--- a/ld/testsuite/ld-pe/secrel_64.d
+++ b/ld/testsuite/ld-pe/secrel_64.d
@@ -1,28 +1,28 @@
-\r
-tmpdir/secrel\.x: +file format pei-.*\r
-\r
-Contents of section \.text:\r
- .*1000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c  >>>><<<<>>>>><<<\r
- .*1010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c  >>>>>><<>>>>>>><\r
- .*1020 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c  >>>><<<<>>>>><<<\r
- .*1030 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c  >>>>>><<>>>>>>><\r
- .*1040 ffffffff ffffffff 00000000 00000000  ................\r
- .*1050 ffffffff ffffffff 00000000 00000000  ................\r
-Contents of section \.data:\r
- .*2000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c  >>>><<<<>>>>><<<\r
- .*2010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c  >>>>>><<>>>>>>><\r
- .*2020 3e3e3e3e 04000000 110d0000 00111600  >>>>............\r
- .*2030 0000111f 00000011 3c3c3c3c 3c3c3c3c  ........<<<<<<<<\r
- .*2040 3e3e3e3e 04000000 110d0000 00111600  >>>>............\r
- .*2050 0000111f 00000011 3c3c3c3c 3c3c3c3c  ........<<<<<<<<\r
- .*2060 3e3e3e3e 04000000 110d0000 00111600  >>>>............\r
- .*2070 0000111f 00000011 3c3c3c3c 3c3c3c3c  ........<<<<<<<<\r
- .*2080 3e3e3e3e 24000000 112d0000 00113600  >>>>\$....-....6.\r
- .*2090 0000113f 00000011 3c3c3c3c 3c3c3c3c  ...\?....<<<<<<<<\r
-Contents of section \.rdata:\r
- .*3000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c  >>>><<<<>>>>><<<\r
- .*3010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c  >>>>>><<>>>>>>><\r
- .*3020 3e3e3e3e 00000000 00000000 00000000  >>>>............\r
-Contents of section \.idata:\r
- .*4000 00000000 00000000 00000000 00000000  ................\r
- .*4010 00000000                             ....            \r
+
+tmpdir/secrel\.x: +file format pei-.*
+
+Contents of section \.text:
+ .*1000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c  .*
+ .*1010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c  .*
+ .*1020 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c  .*
+ .*1030 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c  .*
+ .*1040 ffffffff ffffffff 00000000 00000000  .*
+ .*1050 ffffffff ffffffff 00000000 00000000  .*
+Contents of section \.data:
+ .*2000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c  .*
+ .*2010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c  .*
+ .*2020 3e3e3e3e 04000000 110d0000 00111600  .*
+ .*2030 0000111f 00000011 3c3c3c3c 3c3c3c3c  .*
+ .*2040 3e3e3e3e 04000000 110d0000 00111600  .*
+ .*2050 0000111f 00000011 3c3c3c3c 3c3c3c3c  .*
+ .*2060 3e3e3e3e 04000000 110d0000 00111600  .*
+ .*2070 0000111f 00000011 3c3c3c3c 3c3c3c3c  .*
+ .*2080 3e3e3e3e 24000000 112d0000 00113600  .*
+ .*2090 0000113f 00000011 3c3c3c3c 3c3c3c3c  .*
+Contents of section \.rdata:
+ .*3000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c  .*
+ .*3010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c  .*
+ .*3020 3e3e3e3e 00000000 00000000 00000000  .*
+Contents of section \.idata:
+ .*4000 00000000 00000000 00000000 00000000  .*
+ .*4010 00000000 00000000                    .*