daily update

[deliverable/binutils-gdb.git] / gas / write.c

diff --git a/gas/write.c b/gas/write.c
index c941ae6cb914c7debc2611c2c0ea1d070c6d7e50..1ded21f94fb51b80c639a3484f2d778cb055632c 100644 (file)
--- a/gas/write.c
+++ b/gas/write.c
@@ -156,7 +156,7 @@ fix_new_internal (fragS *frag,              /* Which frag?  */
 
   n_fixups++;
 
-  fixP = obstack_alloc (&notes, sizeof (fixS));
+  fixP = (fixS *) obstack_alloc (&notes, sizeof (fixS));
 
   fixP->fx_frag = frag;
   fixP->fx_where = where;
@@ -1170,7 +1170,7 @@ write_relocs (bfd *abfd, asection *sec, void *xxx ATTRIBUTE_UNUSED)
        rp = &r->next;
     }
 
-  relocs = xcalloc (n, sizeof (arelent *));
+  relocs = (arelent **) xcalloc (n, sizeof (arelent *));
 
   i = 0;
   for (fixp = seginfo->fix_root; fixp != (fixS *) NULL; fixp = fixp->fx_next)
@@ -1398,7 +1398,7 @@ set_symtab (void)
       int i;
       bfd_size_type amt = (bfd_size_type) nsyms * sizeof (asymbol *);
 
-      asympp = bfd_alloc (stdoutput, amt);
+      asympp = (asymbol **) bfd_alloc (stdoutput, amt);
       symp = symbol_rootP;
       for (i = 0; i < nsyms; i++, symp = symbol_next (symp))
        {
@@ -1787,22 +1787,24 @@ write_object_file (void)
          if (symbol_equated_reloc_p (symp)
              || S_IS_WEAKREFR (symp))
            {
-             const char *name = S_GET_NAME (symp);
+             const char *sname = S_GET_NAME (symp);
+
              if (S_IS_COMMON (symp)
-                 && !TC_FAKE_LABEL (name)
+                 && !TC_FAKE_LABEL (sname)
                  && !S_IS_WEAKREFR (symp)
                  && (!S_IS_EXTERNAL (symp) || S_IS_LOCAL (symp)))
                {
                  expressionS *e = symbol_get_value_expression (symp);
+
                  as_bad (_("Local symbol `%s' can't be equated to common symbol `%s'"),
-                         name, S_GET_NAME (e->X_add_symbol));
+                         sname, S_GET_NAME (e->X_add_symbol));
                }
              if (S_GET_SEGMENT (symp) == reg_section)
                {
                  /* Report error only if we know the symbol name.  */
                  if (S_GET_NAME (symp) != reg_section->name)
                    as_bad (_("can't make global register symbol `%s'"),
-                           name);
+                           sname);
                }
              symbol_remove (symp, &symbol_rootP, &symbol_lastP);
              continue;