Pass offset_size to print_dwarf_vma for cie_id

binutils/

	* dwarf.c (display_debug_frames): Pass offset_size to
	print_dwarf_vma for cie_id.

binutils/testsuite/

	* binutils-all/x86-64/compressed-1a.d: Updated for 64-bit addresses.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 5f64635da23daf30d28981ea3e69fffe57a6b733..95ada6f7b2fc803c21fa8bdce12d0645dba59e2c 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * dwarf.c (display_debug_frames): Pass offset_size to
+       print_dwarf_vma for cie_id.
+
 2013-09-20  Alan Modra  <amodra@gmail.com>
 
        * configure: Regenerate.

diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index 8a233aa10ff4389630b7e76ae2a5f20330fcc124..bd736477c38bc89e5275f883fdcf6987e5d85f97 100644 (file)
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -5249,7 +5249,7 @@ display_debug_frames (struct dwarf_section *section,
 
          printf ("\n%08lx ", (unsigned long) (saved_start - section_start));
          print_dwarf_vma (length, fc->ptr_size);
-         print_dwarf_vma (cie_id, fc->ptr_size);
+         print_dwarf_vma (cie_id, offset_size);
 
          if (do_debug_frames_interp)
            {
@@ -5385,7 +5385,7 @@ display_debug_frames (struct dwarf_section *section,
          printf ("\n%08lx %s %s FDE cie=%08lx pc=",
                  (unsigned long)(saved_start - section_start),
                  dwarf_vmatoa_1 (NULL, length, fc->ptr_size),
-                 dwarf_vmatoa_1 (NULL, cie_id, fc->ptr_size),
+                 dwarf_vmatoa_1 (NULL, cie_id, offset_size),
                  (unsigned long)(cie->chunk_start - section_start));
 
          if (fc->segment_size)

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index ac2de1f2708654f6847e6913d3bc66ac5fa23e45..6c98a1376b3a27be6bbc9bec61594b76298f48c0 100644 (file)
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * binutils-all/x86-64/compressed-1a.d: Updated for 64-bit addresses.
+
 2013-09-12  Nick Clifton  <nickc@redhat.com>
 
        * binutils-all/x86-64/compressed-1a.d: Update expected output to

diff --git a/binutils/testsuite/binutils-all/x86-64/compressed-1a.d b/binutils/testsuite/binutils-all/x86-64/compressed-1a.d
index 0dfbdc1b047832913eef8d522ab2592b215d9e1d..f1e4bbcd88f88508d70f469b50adeae899a6df72 100644 (file)
--- 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 00000014 ffffffff CIE
+00000000 0+014 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 00000014 00000000 FDE cie=00000000 pc=0+0000..0+0002
+00000018 0+014 00000000 FDE cie=00000000 pc=0+0000..0+0002
 
-00000030 00000014 00000000 FDE cie=00000000 pc=0+0010..0+0015
+00000030 0+014 00000000 FDE cie=00000000 pc=0+0010..0+0015