* dwarf.c (display_debug_frames): Change text for uniformity.

            (process_debug_info): Likewise.
            (display_debug_aranges): Likewise.  Indent address output.
            (display_debug_pubnames): Print offset in hex.

            * binutils-all/objdump.W: Update.

            * gas/cfi/cfi-alpha-1.d, gas/cfi/cfi-alpha-3.d,
            gas/cfi/cfi-arm-1.d, gas/cfi/cfi-common-1.d,
            gas/cfi/cfi-common-2.d, gas/cfi/cfi-common-3.d,
            gas/cfi/cfi-common-4.d, gas/cfi/cfi-common-5.d,
            gas/cfi/cfi-common-6.d, gas/cfi/cfi-hppa-1.d,
            gas/cfi/cfi-i386-2.d, gas/cfi/cfi-i386.d, gas/cfi/cfi-m68k.d,
            gas/cfi/cfi-mips-1.d, gas/cfi/cfi-ppc-1.d, gas/cfi/cfi-s390-1.d,
            gas/cfi/cfi-s390x-1.d, gas/cfi/cfi-sh-1.d, gas/cfi/cfi-sparc-1.d,
            gas/cfi/cfi-sparc64-1.d, gas/cfi/cfi-x86_64.d: Update for readelf
            change.

            * ld-elf/eh1.d, ld-elf/eh2.d, ld-elf/eh3.d, ld-elf/eh4.d,
            ld-elf/eh5.d, ld-elf/eh6.d, ld-mips-elf/eh-frame1-n32.d,
            ld-mips-elf/eh-frame1-n64.d, ld-mips-elf/eh-frame2-n32.d,
            ld-mips-elf/eh-frame2-n64.d, ld-mips-elf/eh-frame3.d,
            ld-mips-elf/eh-frame4.d: Update for readelf change.

22 files changed, 34 insertions, 21 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index ff9c7d0..91baf05 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,16 @@
+2008-10-06  Tom Tromey  <tromey@redhat.com>
+
+	* gas/cfi/cfi-alpha-1.d, gas/cfi/cfi-alpha-3.d,
+	gas/cfi/cfi-arm-1.d, gas/cfi/cfi-common-1.d,
+	gas/cfi/cfi-common-2.d, gas/cfi/cfi-common-3.d,
+	gas/cfi/cfi-common-4.d, gas/cfi/cfi-common-5.d,
+	gas/cfi/cfi-common-6.d, gas/cfi/cfi-hppa-1.d,
+	gas/cfi/cfi-i386-2.d, gas/cfi/cfi-i386.d, gas/cfi/cfi-m68k.d,
+	gas/cfi/cfi-mips-1.d, gas/cfi/cfi-ppc-1.d, gas/cfi/cfi-s390-1.d,
+	gas/cfi/cfi-s390x-1.d, gas/cfi/cfi-sh-1.d, gas/cfi/cfi-sparc-1.d,
+	gas/cfi/cfi-sparc64-1.d, gas/cfi/cfi-x86_64.d: Update for readelf
+	change.
+
 2008-10-04  Hans-Peter Nilsson  <hp@axis.com>
 
 	* gas/cris/rd-tls-1.s, gas/cris/rd-tls-1.d, gas/cris/rd-tls-2.s,
diff --git a/gas/testsuite/gas/cfi/cfi-alpha-1.d b/gas/testsuite/gas/cfi/cfi-alpha-1.d
index 5703c9c..c132f89 100644
--- a/gas/testsuite/gas/cfi/cfi-alpha-1.d
+++ b/gas/testsuite/gas/cfi/cfi-alpha-1.d
@@ -1,6 +1,6 @@
 #readelf: -wf
 #name: CFI on alpha
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 00000010 00000000 CIE
   Version:               1
diff --git a/gas/testsuite/gas/cfi/cfi-alpha-3.d b/gas/testsuite/gas/cfi/cfi-alpha-3.d
index 61ab78b..3c84ce7 100644
--- a/gas/testsuite/gas/cfi/cfi-alpha-3.d
+++ b/gas/testsuite/gas/cfi/cfi-alpha-3.d
@@ -1,6 +1,6 @@
 #readelf: -wf
 #name: CFI on alpha, 3
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 00000010 00000000 CIE
   Version:               1
diff --git a/gas/testsuite/gas/cfi/cfi-arm-1.d b/gas/testsuite/gas/cfi/cfi-arm-1.d
index 8474e20..e3b534c 100644
--- a/gas/testsuite/gas/cfi/cfi-arm-1.d
+++ b/gas/testsuite/gas/cfi/cfi-arm-1.d
@@ -1,7 +1,7 @@
 #readelf: -wf
 #name: CFI on ARM
 
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 00000010 00000000 CIE
   Version:               1
diff --git a/gas/testsuite/gas/cfi/cfi-common-1.d b/gas/testsuite/gas/cfi/cfi-common-1.d
index 32eaf4b..01303d3 100644
--- a/gas/testsuite/gas/cfi/cfi-common-1.d
+++ b/gas/testsuite/gas/cfi/cfi-common-1.d
@@ -1,6 +1,6 @@
 #readelf: -wf
 #name: CFI common 1
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 00000010 00000000 CIE
   Version:               1
diff --git a/gas/testsuite/gas/cfi/cfi-common-2.d b/gas/testsuite/gas/cfi/cfi-common-2.d
index e929f87..c702fb3 100644
--- a/gas/testsuite/gas/cfi/cfi-common-2.d
+++ b/gas/testsuite/gas/cfi/cfi-common-2.d
@@ -1,6 +1,6 @@
 #readelf: -wf
 #name: CFI common 2
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 00000010 00000000 CIE
   Version:               1
diff --git a/gas/testsuite/gas/cfi/cfi-common-3.d b/gas/testsuite/gas/cfi/cfi-common-3.d
index 70055aa..fb7495b 100644
--- a/gas/testsuite/gas/cfi/cfi-common-3.d
+++ b/gas/testsuite/gas/cfi/cfi-common-3.d
@@ -1,6 +1,6 @@
 #readelf: -wf
 #name: CFI common 3
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 00000010 00000000 CIE
   Version:               1
diff --git a/gas/testsuite/gas/cfi/cfi-common-4.d b/gas/testsuite/gas/cfi/cfi-common-4.d
index 9d65270..c69224e 100644
--- a/gas/testsuite/gas/cfi/cfi-common-4.d
+++ b/gas/testsuite/gas/cfi/cfi-common-4.d
@@ -1,6 +1,6 @@
 #readelf: -wf
 #name: CFI common 4
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 00000010 00000000 CIE
   Version:               1
diff --git a/gas/testsuite/gas/cfi/cfi-common-5.d b/gas/testsuite/gas/cfi/cfi-common-5.d
index ba21e2f..81fc212 100644
--- a/gas/testsuite/gas/cfi/cfi-common-5.d
+++ b/gas/testsuite/gas/cfi/cfi-common-5.d
@@ -1,6 +1,6 @@
 #readelf: -wf
 #name: CFI common 5
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 00000010 00000000 CIE
   Version:               1
diff --git a/gas/testsuite/gas/cfi/cfi-common-6.d b/gas/testsuite/gas/cfi/cfi-common-6.d
index 3ae356e..35f221e 100644
--- a/gas/testsuite/gas/cfi/cfi-common-6.d
+++ b/gas/testsuite/gas/cfi/cfi-common-6.d
@@ -1,6 +1,6 @@
 #readelf: -wf
 #name: CFI common 6
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 00000018 00000000 CIE
   Version:               1
diff --git a/gas/testsuite/gas/cfi/cfi-hppa-1.d b/gas/testsuite/gas/cfi/cfi-hppa-1.d
index be8bf39..cbb0767 100644
--- a/gas/testsuite/gas/cfi/cfi-hppa-1.d
+++ b/gas/testsuite/gas/cfi/cfi-hppa-1.d
@@ -1,6 +1,6 @@
 #readelf: -wf
 #name: CFI on hppa
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 00000010 00000000 CIE
   Version:               1
diff --git a/gas/testsuite/gas/cfi/cfi-i386-2.d b/gas/testsuite/gas/cfi/cfi-i386-2.d
index a42e088..339b47b 100644
--- a/gas/testsuite/gas/cfi/cfi-i386-2.d
+++ b/gas/testsuite/gas/cfi/cfi-i386-2.d
@@ -1,6 +1,6 @@
 #readelf: -wf
 #name: CFI on i386, 2
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 00000014 00000000 CIE
   Version:               1
diff --git a/gas/testsuite/gas/cfi/cfi-i386.d b/gas/testsuite/gas/cfi/cfi-i386.d
index ef477d3..77918ba 100644
--- a/gas/testsuite/gas/cfi/cfi-i386.d
+++ b/gas/testsuite/gas/cfi/cfi-i386.d
@@ -1,6 +1,6 @@
 #readelf: -wf
 #name: CFI on i386
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 00000014 00000000 CIE
   Version:               1
diff --git a/gas/testsuite/gas/cfi/cfi-m68k.d b/gas/testsuite/gas/cfi/cfi-m68k.d
index e6b4ec8..4bced7a 100644
--- a/gas/testsuite/gas/cfi/cfi-m68k.d
+++ b/gas/testsuite/gas/cfi/cfi-m68k.d
@@ -1,6 +1,6 @@
 #readelf: -wf
 #name: CFI on m68k
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 00000014 00000000 CIE
   Version:               1
diff --git a/gas/testsuite/gas/cfi/cfi-mips-1.d b/gas/testsuite/gas/cfi/cfi-mips-1.d
index 22d74f6..bd37752 100644
--- a/gas/testsuite/gas/cfi/cfi-mips-1.d
+++ b/gas/testsuite/gas/cfi/cfi-mips-1.d
@@ -1,6 +1,6 @@
 #readelf: -wf
 #name: CFI on mips, 1
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 00000014 00000000 CIE
   Version:               1
diff --git a/gas/testsuite/gas/cfi/cfi-ppc-1.d b/gas/testsuite/gas/cfi/cfi-ppc-1.d
index cb1f55e..4fa4131 100644
--- a/gas/testsuite/gas/cfi/cfi-ppc-1.d
+++ b/gas/testsuite/gas/cfi/cfi-ppc-1.d
@@ -2,7 +2,7 @@
 #name: CFI on ppc
 #as: -a32
 
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 00000010 00000000 CIE
   Version:               1
diff --git a/gas/testsuite/gas/cfi/cfi-s390-1.d b/gas/testsuite/gas/cfi/cfi-s390-1.d
index 5cf3694..4ba11d4 100644
--- a/gas/testsuite/gas/cfi/cfi-s390-1.d
+++ b/gas/testsuite/gas/cfi/cfi-s390-1.d
@@ -2,7 +2,7 @@
 #name: CFI on s390
 #as: -m31 -march=g5
 
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 00000010 00000000 CIE
   Version:               1
diff --git a/gas/testsuite/gas/cfi/cfi-s390x-1.d b/gas/testsuite/gas/cfi/cfi-s390x-1.d
index c515f38..af076ab 100644
--- a/gas/testsuite/gas/cfi/cfi-s390x-1.d
+++ b/gas/testsuite/gas/cfi/cfi-s390x-1.d
@@ -2,7 +2,7 @@
 #name: CFI on s390x
 #as: -m64 -march=z900
 
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 00000014 00000000 CIE
   Version:               1
diff --git a/gas/testsuite/gas/cfi/cfi-sh-1.d b/gas/testsuite/gas/cfi/cfi-sh-1.d
index 8f22243..b2ee634 100644
--- a/gas/testsuite/gas/cfi/cfi-sh-1.d
+++ b/gas/testsuite/gas/cfi/cfi-sh-1.d
@@ -1,6 +1,6 @@
 #readelf: -wf
 #name: CFI on SH
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 00000010 00000000 CIE
   Version:               1
diff --git a/gas/testsuite/gas/cfi/cfi-sparc-1.d b/gas/testsuite/gas/cfi/cfi-sparc-1.d
index fa24c82..b4cd68d 100644
--- a/gas/testsuite/gas/cfi/cfi-sparc-1.d
+++ b/gas/testsuite/gas/cfi/cfi-sparc-1.d
@@ -2,7 +2,7 @@
 #name: CFI on SPARC 32-bit
 #as: -32
 
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 00000010 00000000 CIE
   Version:               1
diff --git a/gas/testsuite/gas/cfi/cfi-sparc64-1.d b/gas/testsuite/gas/cfi/cfi-sparc64-1.d
index d126f50..26dbe16 100644
--- a/gas/testsuite/gas/cfi/cfi-sparc64-1.d
+++ b/gas/testsuite/gas/cfi/cfi-sparc64-1.d
@@ -2,7 +2,7 @@
 #name: CFI on SPARC 64-bit
 #as: -64
 
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 00000014 00000000 CIE
   Version:               1
diff --git a/gas/testsuite/gas/cfi/cfi-x86_64.d b/gas/testsuite/gas/cfi/cfi-x86_64.d
index 3fc7d53..36b441c 100644
--- a/gas/testsuite/gas/cfi/cfi-x86_64.d
+++ b/gas/testsuite/gas/cfi/cfi-x86_64.d
@@ -1,6 +1,6 @@
 #readelf: -wf
 #name: CFI on x86-64
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 00000014 00000000 CIE
   Version:               1