Merge commit 'upstream/2.20'

[msp430-binutils.git] / gas / config / obj-som.c

diff --git a/gas/config/obj-som.c b/gas/config/obj-som.c
index 250fa57661f0040abaf5cda875b43aadebbd13b9..9598e10eebbdbebacbfb12474b79d20a320b3ae3 100644 (file)
--- a/gas/config/obj-som.c
+++ b/gas/config/obj-som.c
@@ -1,6 +1,6 @@
 /* SOM object file format.
    Copyright 1993, 1994, 1998, 2000, 2002, 2003, 2004, 2005, 2006,
-   2007  Free Software Foundation, Inc.
+   2007, 2008, 2009  Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -55,7 +55,7 @@ obj_som_compiler (int unused ATTRIBUTE_UNUSED)
 
   if (compiler_seen)
     {
-      as_bad ("Only one .compiler pseudo-op per file!");
+      as_bad (_("Only one .compiler pseudo-op per file!"));
       ignore_rest_of_line ();
       return;
     }
@@ -72,7 +72,7 @@ obj_som_compiler (int unused ATTRIBUTE_UNUSED)
     }
   else
     {
-      as_bad ("Expected quoted string");
+      as_bad (_("Expected quoted string"));
       ignore_rest_of_line ();
       return;
     }
@@ -85,7 +85,7 @@ obj_som_compiler (int unused ATTRIBUTE_UNUSED)
     p++;
   if (*p == '\000')
     {
-      as_bad (".compiler directive missing language and version");
+      as_bad (_(".compiler directive missing language and version"));
       return;
     }
   *p = '\000';
@@ -95,7 +95,7 @@ obj_som_compiler (int unused ATTRIBUTE_UNUSED)
     p++;
   if (*p == '\000')
     {
-      as_bad (".compiler directive missing version");
+      as_bad (_(".compiler directive missing version"));
       return;
     }
   *p = '\000';
@@ -111,7 +111,7 @@ obj_som_compiler (int unused ATTRIBUTE_UNUSED)
                                         "GNU Tools", version_id))
     {
       bfd_perror (stdoutput->filename);
-      as_fatal ("FATAL: Attaching compiler header %s", stdoutput->filename);
+      as_fatal (_("FATAL: Attaching compiler header %s"), stdoutput->filename);
     }
   *input_line_pointer = c;
   demand_empty_rest_of_line ();
@@ -263,7 +263,7 @@ obj_som_init_stab_section (segT seg)
 /* Fill in the counts in the first entry in a .stabs section.  */
 
 static void
-adjust_stab_sections (bfd *abfd, asection *sec, PTR xxx ATTRIBUTE_UNUSED)
+adjust_stab_sections (bfd *abfd, asection *sec, void *xxx ATTRIBUTE_UNUSED)
 {
   asection *strsec;
   char *p;
@@ -280,7 +280,7 @@ adjust_stab_sections (bfd *abfd, asection *sec, PTR xxx ATTRIBUTE_UNUSED)
   nsyms = bfd_section_size (abfd, sec) / 12 - 1;
 
   p = seg_info (sec)->stabu.p;
-  assert (p != 0);
+  gas_assert (p != 0);
 
   bfd_h_put_16 (abfd, (bfd_vma) nsyms, (bfd_byte *) p + 6);
   bfd_h_put_32 (abfd, (bfd_vma) strsz, (bfd_byte *) p + 8);
@@ -292,7 +292,7 @@ adjust_stab_sections (bfd *abfd, asection *sec, PTR xxx ATTRIBUTE_UNUSED)
 void
 som_frob_file (void)
 {
-  bfd_map_over_sections (stdoutput, adjust_stab_sections, (PTR) 0);
+  bfd_map_over_sections (stdoutput, adjust_stab_sections, (void *) 0);
 }
 
 static void