2013-10-03 Phil Muldoon <pmuldoon@redhat.com>

[deliverable/binutils-gdb.git] / binutils / dwarf.c

diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index 8a233aa10ff4389630b7e76ae2a5f20330fcc124..283aceb4958417970fa985b818552b654b867800 100644 (file)
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -288,7 +288,7 @@ read_uleb128 (unsigned char * data,
 #define SAFE_BYTE_GET(VAL, PTR, AMOUNT, END)   \
   do                                           \
     {                                          \
-      int dummy [sizeof (VAL) < (AMOUNT) ? -1 : 0] ATTRIBUTE_UNUSED ; \
+      int dummy [sizeof (VAL) < (AMOUNT) ? -1 : 1] ATTRIBUTE_UNUSED ; \
       unsigned int amount = (AMOUNT);          \
       if (((PTR) + amount) >= (END))           \
        {                                       \
@@ -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)