Assorted x86 testsuite fixes.

I think HJ has already fixed the binutils and ld tests with his
2013-09-27 readelf change, but this allows them to pass with wider
address output as per Nick's 2013-09-12 readelf change.

binutils/testsuite/
	* binutils-all/x86-64/compressed-1a.d: Allow wide display of addresses.
gas/testsuite/
	* gas/cfi/cfi-x86_64.d: Match when lacking end of section padding.
ld/testsuite/
	* ld-pe/cfi.d: Allow wide display of addresses.

6 files changed, 16 insertions, 11 deletions

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index e11fbe1..94f0ce4 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,5 +1,7 @@
 2013-11-02  Alan Modra  <amodra@gmail.com>
 
+	* binutils-all/x86-64/compressed-1a.d: Allow wide display of addresses.
+
 	* binutils-all/dw2-1.S: Use .4byte rather than .int.
 	* binutils-all/dw2-2.S: Likewise.
 
diff --git a/binutils/testsuite/binutils-all/x86-64/compressed-1a.d b/binutils/testsuite/binutils-all/x86-64/compressed-1a.d
index f1e4bbc..19471ab 100644
--- a/binutils/testsuite/binutils-all/x86-64/compressed-1a.d
+++ b/binutils/testsuite/binutils-all/x86-64/compressed-1a.d
@@ -135,7 +135,7 @@ Contents of the .[z]?debug_str section:
 
 Contents of the .[z]?debug_frame section:
 
-00000000 0+014 ffffffff CIE
+0+ 0+14 0*ffffffff CIE
   Version:               1
   Augmentation:          ""
   Code alignment factor: 1
@@ -151,7 +151,7 @@ Contents of the .[z]?debug_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000018 0+014 00000000 FDE cie=00000000 pc=0+0000..0+0002
+0+18 0+14 0+ FDE cie=0+ pc=0+..0+2
 
-00000030 0+014 00000000 FDE cie=00000000 pc=0+0010..0+0015
+0+30 0+14 0+ FDE cie=0+ pc=0+10..0+15
 
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index f7cd119..9694b8a 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-02  Alan Modra  <amodra@gmail.com>
+
+	* gas/cfi/cfi-x86_64.d: Match when lacking end of section padding.
+
 2013-10-29  Jan Beulich <jbeulich@suse.com>
 
 	* gas/microblaze/relax_size.elf: Drop expectation of no longer
@@ -611,7 +615,6 @@
 
 2013-05-31  Catherine Moore  <clm@codesourcery.com>
 
-	gas/testsuite/
 	* gas/mips/ehword.d: New.
 	* gas/mips/ehword.s: New.
 	* gas/mips/mips.exp: Run ehword test.
diff --git a/gas/testsuite/gas/cfi/cfi-x86_64.d b/gas/testsuite/gas/cfi/cfi-x86_64.d
index 592416a..900a5e5 100644
--- a/gas/testsuite/gas/cfi/cfi-x86_64.d
+++ b/gas/testsuite/gas/cfi/cfi-x86_64.d
@@ -269,8 +269,4 @@ Contents of the .eh_frame section:
   DW_CFA_advance_loc: 1 to 0+00ae
   DW_CFA_undefined: r125 \(k7\)
   DW_CFA_nop
-  DW_CFA_nop
-  DW_CFA_nop
-  DW_CFA_nop
-  DW_CFA_nop
 #pass
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index cacaeaa..369333a 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-02  Alan Modra  <amodra@gmail.com>
+
+	* ld-pe/cfi.d: Allow wide display of addresses.
+
 2013-11-01  Roland McGrath  <mcgrathr@google.com>
 
 	* ld-x86-64/plt-nacl.pd: Update expected disassembly for PLT nop fix.
diff --git a/ld/testsuite/ld-pe/cfi.d b/ld/testsuite/ld-pe/cfi.d
index 6c5042b..55ebaca 100644
--- a/ld/testsuite/ld-pe/cfi.d
+++ b/ld/testsuite/ld-pe/cfi.d
@@ -4,7 +4,7 @@
 #objdump: -Wf
 
 #...
-00000004 00000014 ffffffff CIE
+0+4 0+14 0*ffffffff CIE
   Version:               1
   Augmentation:          ""
   Code alignment factor: 1
@@ -20,12 +20,12 @@
   DW_CFA_nop
   DW_CFA_nop
 
-0000001c 00000024 00000004 FDE cie=00000004 pc=.*
+0+1c 0+24 0+4 FDE cie=0+4 pc=.*
   DW_CFA_advance_loc: 4 to .*
   DW_CFA_def_cfa_offset: 16
   DW_CFA_offset: r6 \(rbp\) at cfa\-16
   DW_CFA_advance_loc: 4 to .*
-^  DW_CFA_def_cfa: r7 \(rsp\) ofs 8
+  DW_CFA_def_cfa: r7 \(rsp\) ofs 8
   DW_CFA_restore: r6 \(rbp\)
   DW_CFA_nop
   DW_CFA_nop