Merge branch 'master' into merge-job

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

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 685d9962978ccf665d5d1f35593c7d4bc07a5155..d6a758e4d70365bb282754626cf03fb8dc36bdf2 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -15487,7 +15487,7 @@ is_valid_DW_AT_defaulted (ULONGEST value)
       return true;
     }
 
-  complaint (_("unrecognized DW_AT_defaulted value (%lu)"), value);
+  complaint (_("unrecognized DW_AT_defaulted value (%s)"), pulongest (value));
   return false;
 }
 
@@ -15867,7 +15867,7 @@ is_valid_DW_AT_calling_convention_for_type (ULONGEST value)
 
     default:
       complaint (_("unrecognized DW_AT_calling_convention value "
-                  "(%lu) for a type"), value);
+                  "(%s) for a type"), pulongest (value));
       return false;
     }
 }
@@ -15893,7 +15893,7 @@ is_valid_DW_AT_calling_convention_for_subroutine (ULONGEST value)
 
     default:
       complaint (_("unrecognized DW_AT_calling_convention value "
-                  "(%lu) for a subroutine"), value);
+                  "(%s) for a subroutine"), pulongest (value));
       return false;
     }
 }
@@ -21752,7 +21752,7 @@ dwarf2_cu::start_symtab (const char *name, const char *comp_dir,
 
   list_in_scope = get_builder ()->get_file_symbols ();
 
-  get_builder ()->record_debugformat ("DWARF 2");
+  get_builder ()->record_debugformat (xstrprintf ("DWARF %d", this->header.version));
   get_builder ()->record_producer (producer);
 
   processing_has_namespace_info = false;