* 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.

39 files changed, 71 insertions, 38 deletions

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 6801b88..2733543 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-06  Tom Tromey  <tromey@redhat.com>
+
+	* 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.
+
 2008-10-02  Andrew Paprocki  <andrew@ishiboo.com>
 
 	PR 6934
diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index 983a3c7..f6a5a53 100644
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -1839,7 +1839,7 @@ process_debug_info (struct dwarf_section *section,
 
   if (!do_loc)
     {
-      printf (_("The section %s contains:\n\n"), section->name);
+      printf (_("Contents of the %s section:\n\n"), section->name);
 
       load_debug_section (str, file);
     }
@@ -2904,7 +2904,7 @@ display_debug_pubnames (struct dwarf_section *section,
 	  if (offset != 0)
 	    {
 	      data += offset_size;
-	      printf ("    %-6ld\t\t%s\n", offset, data);
+	      printf ("    %-6lx\t%s\n", offset, data);
 	      data += strlen ((char *) data) + 1;
 	    }
 	}
@@ -3322,7 +3322,7 @@ display_debug_aranges (struct dwarf_section *section,
   unsigned char *start = section->start;
   unsigned char *end = start + section->size;
 
-  printf (_("The section %s contains:\n\n"), section->name);
+  printf (_("Contents of the %s section:\n\n"), section->name);
 
   /* It does not matter if this load fails,
      we test for that later on.  */
@@ -3423,6 +3423,7 @@ display_debug_aranges (struct dwarf_section *section,
 
 	  ranges += address_size;
 
+	  printf ("    ");
 	  print_dwarf_vma (address, address_size);
 	  print_dwarf_vma (length, address_size);
 	  putchar ('\n');
@@ -3814,7 +3815,7 @@ display_debug_frames (struct dwarf_section *section,
   unsigned int length_return;
   int max_regs = 0;
 
-  printf (_("The section %s contains:\n"), section->name);
+  printf (_("Contents of the %s section:\n"), section->name);
 
   while (start < end)
     {
diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index acb2bdc..b8cee24b 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-06  Tom Tromey  <tromey@redhat.com>
+
+	* binutils-all/objdump.W: Update.
+
 2008-10-03  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* binutils-all/group.s: Updated.
diff --git a/binutils/testsuite/binutils-all/objdump.W b/binutils/testsuite/binutils-all/objdump.W
index dfca562..7617470 100644
--- a/binutils/testsuite/binutils-all/objdump.W
+++ b/binutils/testsuite/binutils-all/objdump.W
@@ -1,7 +1,7 @@
 
 tmpdir/dw2-compressed.o:     file format .*
 
-The section .debug_info contains:
+Contents of the .debug_info section:
 
   Compilation Unit @ offset 0x0:
    Length:        0x4e \(32-bit\)
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
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 6503d07..eca0c79 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-06  Tom Tromey  <tromey@redhat.com>
+
+	* 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.
+
 2008-10-04  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR ld/6931
diff --git a/ld/testsuite/ld-elf/eh1.d b/ld/testsuite/ld-elf/eh1.d
index a672f5b..f0874f7 100644
--- a/ld/testsuite/ld-elf/eh1.d
+++ b/ld/testsuite/ld-elf/eh1.d
@@ -4,7 +4,7 @@
 #readelf: -wf
 #target: x86_64-*-*
 
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 00000014 00000000 CIE
   Version:               1
diff --git a/ld/testsuite/ld-elf/eh2.d b/ld/testsuite/ld-elf/eh2.d
index 788d23d..1a05d7f 100644
--- a/ld/testsuite/ld-elf/eh2.d
+++ b/ld/testsuite/ld-elf/eh2.d
@@ -4,7 +4,7 @@
 #readelf: -wf
 #target: x86_64-*-*
 
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 00000014 00000000 CIE
   Version:               1
diff --git a/ld/testsuite/ld-elf/eh3.d b/ld/testsuite/ld-elf/eh3.d
index 6816313..1f76b8c 100644
--- a/ld/testsuite/ld-elf/eh3.d
+++ b/ld/testsuite/ld-elf/eh3.d
@@ -4,7 +4,7 @@
 #readelf: -wf
 #target: x86_64-*-*
 
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 00000014 00000000 CIE
   Version:               1
diff --git a/ld/testsuite/ld-elf/eh4.d b/ld/testsuite/ld-elf/eh4.d
index 5efecab..b8f9865 100644
--- a/ld/testsuite/ld-elf/eh4.d
+++ b/ld/testsuite/ld-elf/eh4.d
@@ -4,7 +4,7 @@
 #readelf: -wf
 #target: x86_64-*-*
 
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 00000014 00000000 CIE
   Version:               1
diff --git a/ld/testsuite/ld-elf/eh5.d b/ld/testsuite/ld-elf/eh5.d
index 051eaca..48ab7d7 100644
--- a/ld/testsuite/ld-elf/eh5.d
+++ b/ld/testsuite/ld-elf/eh5.d
@@ -6,7 +6,7 @@
 #target: cfi
 #notarget: alpha*
 
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 0000001[04] 00000000 CIE
   Version:               1
diff --git a/ld/testsuite/ld-elf/eh6.d b/ld/testsuite/ld-elf/eh6.d
index 7f4e47a..67c6a06 100644
--- a/ld/testsuite/ld-elf/eh6.d
+++ b/ld/testsuite/ld-elf/eh6.d
@@ -3,7 +3,7 @@
 #readelf: -wf
 #target: x86_64-*-linux-gnu i?86-*-linux-gnu
 
-The section .eh_frame contains:
+Contents of the .eh_frame section:
 
 00000000 0000001[4c] 00000000 CIE
   Version:               1
diff --git a/ld/testsuite/ld-mips-elf/eh-frame1-n32.d b/ld/testsuite/ld-mips-elf/eh-frame1-n32.d
index 3924016..6adb355 100644
--- a/ld/testsuite/ld-mips-elf/eh-frame1-n32.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame1-n32.d
@@ -17,7 +17,7 @@ Relocation section '\.rel\.dyn' .*:
 0003008b  [0-9a-f]+ R_MIPS_REL32      00000000   foo
 000300d0  [0-9a-f]+ R_MIPS_REL32      00000000   foo
 0003010e  [0-9a-f]+ R_MIPS_REL32      00000000   foo
-The section \.eh_frame contains:
+Contents of the section \.eh_frame:
 
 00000000 00000010 00000000 CIE
   Version:               1
diff --git a/ld/testsuite/ld-mips-elf/eh-frame1-n64.d b/ld/testsuite/ld-mips-elf/eh-frame1-n64.d
index f0925b9..1512b4a 100644
--- a/ld/testsuite/ld-mips-elf/eh-frame1-n64.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame1-n64.d
@@ -33,7 +33,7 @@ Relocation section '\.rel\.dyn' .*:
 000000030192  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-The section \.eh_frame contains:
+Contents of the section \.eh_frame:
 
 00000000 00000014 00000000 CIE
   Version:               1
diff --git a/ld/testsuite/ld-mips-elf/eh-frame2-n32.d b/ld/testsuite/ld-mips-elf/eh-frame2-n32.d
index ce2aa1d..d831d26 100644
--- a/ld/testsuite/ld-mips-elf/eh-frame2-n32.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame2-n32.d
@@ -17,7 +17,7 @@ Relocation section '\.rel\.dyn' .*:
 0003008b  [0-9a-f]+ R_MIPS_REL32      00000000   foo
 000300cc  [0-9a-f]+ R_MIPS_REL32      00000000   foo
 0003010a  [0-9a-f]+ R_MIPS_REL32      00000000   foo
-The section \.eh_frame contains:
+Contents of the section \.eh_frame:
 
 00000000 00000010 00000000 CIE
   Version:               1
diff --git a/ld/testsuite/ld-mips-elf/eh-frame2-n64.d b/ld/testsuite/ld-mips-elf/eh-frame2-n64.d
index 50394f5..8e741f3 100644
--- a/ld/testsuite/ld-mips-elf/eh-frame2-n64.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame2-n64.d
@@ -33,7 +33,7 @@ Relocation section '\.rel\.dyn' .*:
 00000003018a  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-The section \.eh_frame contains:
+Contents of the section \.eh_frame:
 
 00000000 00000014 00000000 CIE
   Version:               1
diff --git a/ld/testsuite/ld-mips-elf/eh-frame3.d b/ld/testsuite/ld-mips-elf/eh-frame3.d
index 4c91d2c..80f13d9 100644
--- a/ld/testsuite/ld-mips-elf/eh-frame3.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame3.d
@@ -9,7 +9,7 @@
 # combination of 32-bit objects and 64-bit FDE addresses.
 #
 
-The section \.eh_frame contains:
+Contents of the section \.eh_frame:
 
 00000000 0000000c 00000000 CIE
   Version:               1
diff --git a/ld/testsuite/ld-mips-elf/eh-frame4.d b/ld/testsuite/ld-mips-elf/eh-frame4.d
index e04d5fc..c4b7e5c 100644
--- a/ld/testsuite/ld-mips-elf/eh-frame4.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame4.d
@@ -8,7 +8,7 @@
 # This test is for the semi-official ILP32 variation of EABI64.
 #
 
-The section \.eh_frame contains:
+Contents of the section \.eh_frame:
 
 00000000 0000000c 00000000 CIE
   Version:               1