opcodes/

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

diff --git a/gas/symbols.c b/gas/symbols.c
index 5cad5c8ef62800fa903f738bd188415379260130..7b5e514a315f9805e00a556db7d30a5d49ba1162 100644 (file)
--- a/gas/symbols.c
+++ b/gas/symbols.c
@@ -1,13 +1,13 @@
 /* symbols.c -symbol table-
    Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
 /* symbols.c -symbol table-
    Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,

-   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009

    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    GAS is distributed in the hope that it will be useful,
    any later version.
 
    GAS is distributed in the hope that it will be useful,


@@ -59,7 +59,7 @@ symbolS abs_symbol;
 #define LOCAL_LABEL_CHAR       '\002'
 
 struct obstack notes;
 #define LOCAL_LABEL_CHAR       '\002'
 
 struct obstack notes;

-#ifdef USE_UNIQUE
+#ifdef TE_PE

 /* The name of an external symbol which is
    used to make weak PE symbol names unique.  */
 const char * an_external_name;
 /* The name of an external symbol which is
    used to make weak PE symbol names unique.  */
 const char * an_external_name;


@@ -109,7 +109,7 @@ save_symbol_name (const char *name)
 
   name_length = strlen (name) + 1;     /* +1 for \0.  */
   obstack_grow (&notes, name, name_length);
 
   name_length = strlen (name) + 1;     /* +1 for \0.  */
   obstack_grow (&notes, name, name_length);

-  ret = obstack_finish (&notes);
+  ret = (char *) obstack_finish (&notes);

 
 #ifdef tc_canonicalize_symbol_name
   ret = tc_canonicalize_symbol_name (ret);
 
 #ifdef tc_canonicalize_symbol_name
   ret = tc_canonicalize_symbol_name (ret);


@@ -188,7 +188,7 @@ static unsigned long local_symbol_conversion_count;
 /* Create a local symbol and insert it into the local hash table.  */
 
 static struct local_symbol *
 /* Create a local symbol and insert it into the local hash table.  */
 
 static struct local_symbol *

-local_symbol_make (const char *name, segT section, valueT value, fragS *frag)
+local_symbol_make (const char *name, segT section, valueT val, fragS *frag)

 {
   char *name_copy;
   struct local_symbol *ret;
 {
   char *name_copy;
   struct local_symbol *ret;


@@ -202,9 +202,9 @@ local_symbol_make (const char *name, segT section, valueT value, fragS *frag)
   ret->lsy_name = name_copy;
   ret->lsy_section = section;
   local_symbol_set_frag (ret, frag);
   ret->lsy_name = name_copy;
   ret->lsy_section = section;
   local_symbol_set_frag (ret, frag);

-  ret->lsy_value = value;
+  ret->lsy_value = val;

 
 

-  hash_jam (local_hash, name_copy, (PTR) ret);
+  hash_jam (local_hash, name_copy, (void *) ret);

 
   return ret;
 }
 
   return ret;
 }


@@ -217,7 +217,7 @@ local_symbol_convert (struct local_symbol *locsym)
 {
   symbolS *ret;
 
 {
   symbolS *ret;
 

-  assert (locsym->lsy_marker == NULL);
+  gas_assert (locsym->lsy_marker == NULL);

   if (local_symbol_converted_p (locsym))
     return local_symbol_get_real_symbol (locsym);
 
   if (local_symbol_converted_p (locsym))
     return local_symbol_get_real_symbol (locsym);
 


@@ -246,6 +246,17 @@ local_symbol_convert (struct local_symbol *locsym)
   return ret;
 }
 \f
   return ret;
 }
 \f

+static void
+define_sym_at_dot (symbolS *symbolP)
+{
+  symbolP->sy_frag = frag_now;
+#ifdef OBJ_VMS
+  S_SET_OTHER (symbolP, const_flag);
+#endif
+  S_SET_VALUE (symbolP, (valueT) frag_now_fix ());
+  S_SET_SEGMENT (symbolP, now_seg);
+}
+

 /* We have just seen "<name>:".
    Creates a struct symbol unless it already exists.
 
 /* We have just seen "<name>:".
    Creates a struct symbol unless it already exists.
 


@@ -343,12 +354,7 @@ colon (/* Just seen "x:" - rattle symbols & frags.  */
            }
          if (S_GET_VALUE (symbolP) == 0)
            {
            }
          if (S_GET_VALUE (symbolP) == 0)
            {

-             symbolP->sy_frag = frag_now;
-#ifdef OBJ_VMS
-             S_SET_OTHER (symbolP, const_flag);
-#endif
-             S_SET_VALUE (symbolP, (valueT) frag_now_fix ());
-             S_SET_SEGMENT (symbolP, now_seg);
+             define_sym_at_dot (symbolP);

 #ifdef N_UNDF
              know (N_UNDF == 0);
 #endif /* if we have one, it better be zero.  */
 #ifdef N_UNDF
              know (N_UNDF == 0);
 #endif /* if we have one, it better be zero.  */


@@ -393,12 +399,7 @@ colon (/* Just seen "x:" - rattle symbols & frags.  */
                    {
                      /* It is a .comm/.lcomm being converted to initialized
                         data.  */
                    {
                      /* It is a .comm/.lcomm being converted to initialized
                         data.  */

-                     symbolP->sy_frag = frag_now;
-#ifdef OBJ_VMS
-                     S_SET_OTHER (symbolP, const_flag);
-#endif
-                     S_SET_VALUE (symbolP, (valueT) frag_now_fix ());
-                     S_SET_SEGMENT (symbolP, now_seg); /* Keep N_EXT bit.  */
+                     define_sym_at_dot (symbolP);

                    }
                }
              else
                    }
                }
              else


@@ -431,6 +432,7 @@ colon (/* Just seen "x:" - rattle symbols & frags.  */
            {
              as_bad (_("symbol `%s' is already defined"), sym_name);
              symbolP = symbol_clone (symbolP, 0);
            {
              as_bad (_("symbol `%s' is already defined"), sym_name);
              symbolP = symbol_clone (symbolP, 0);

+             define_sym_at_dot (symbolP);

            }
        }
 
            }
        }
 


@@ -489,14 +491,14 @@ symbol_table_insert (symbolS *symbolP)
   if (LOCAL_SYMBOL_CHECK (symbolP))
     {
       error_string = hash_jam (local_hash, S_GET_NAME (symbolP),
   if (LOCAL_SYMBOL_CHECK (symbolP))
     {
       error_string = hash_jam (local_hash, S_GET_NAME (symbolP),

-                              (PTR) symbolP);
+                              (void *) symbolP);

       if (error_string != NULL)
        as_fatal (_("inserting \"%s\" into symbol table failed: %s"),
                  S_GET_NAME (symbolP), error_string);
       return;
     }
 
       if (error_string != NULL)
        as_fatal (_("inserting \"%s\" into symbol table failed: %s"),
                  S_GET_NAME (symbolP), error_string);
       return;
     }
 

-  if ((error_string = hash_jam (sy_hash, S_GET_NAME (symbolP), (PTR) symbolP)))
+  if ((error_string = hash_jam (sy_hash, S_GET_NAME (symbolP), (void *) symbolP)))

     {
       as_fatal (_("inserting \"%s\" into symbol table failed: %s"),
                S_GET_NAME (symbolP), error_string);
     {
       as_fatal (_("inserting \"%s\" into symbol table failed: %s"),
                S_GET_NAME (symbolP), error_string);


@@ -563,17 +565,15 @@ symbol_clone (symbolS *orgsymP, int replace)
     orgsymP = local_symbol_convert ((struct local_symbol *) orgsymP);
   bsymorg = orgsymP->bsym;
 
     orgsymP = local_symbol_convert ((struct local_symbol *) orgsymP);
   bsymorg = orgsymP->bsym;
 

-  know (S_IS_DEFINED (orgsymP));
-
-  newsymP = obstack_alloc (&notes, sizeof (*newsymP));
+  newsymP = (symbolS *) obstack_alloc (&notes, sizeof (*newsymP));

   *newsymP = *orgsymP;
   bsymnew = bfd_make_empty_symbol (bfd_asymbol_bfd (bsymorg));
   if (bsymnew == NULL)
     as_fatal ("bfd_make_empty_symbol: %s", bfd_errmsg (bfd_get_error ()));
   newsymP->bsym = bsymnew;
   bsymnew->name = bsymorg->name;
   *newsymP = *orgsymP;
   bsymnew = bfd_make_empty_symbol (bfd_asymbol_bfd (bsymorg));
   if (bsymnew == NULL)
     as_fatal ("bfd_make_empty_symbol: %s", bfd_errmsg (bfd_get_error ()));
   newsymP->bsym = bsymnew;
   bsymnew->name = bsymorg->name;

-  bsymnew->flags =  bsymorg->flags;
-  bsymnew->section =  bsymorg->section;
+  bsymnew->flags = bsymorg->flags & ~BSF_SECTION_SYM;
+  bsymnew->section = bsymorg->section;

   bfd_copy_private_symbol_data (bfd_asymbol_bfd (bsymorg), bsymorg,
                                bfd_asymbol_bfd (bsymnew), bsymnew);
 
   bfd_copy_private_symbol_data (bfd_asymbol_bfd (bsymorg), bsymorg,
                                bfd_asymbol_bfd (bsymnew), bsymnew);
 


@@ -598,13 +598,20 @@ symbol_clone (symbolS *orgsymP, int replace)
        symbol_lastP = newsymP;
       else if (orgsymP->sy_next)
        orgsymP->sy_next->sy_previous = newsymP;
        symbol_lastP = newsymP;
       else if (orgsymP->sy_next)
        orgsymP->sy_next->sy_previous = newsymP;

+
+      /* Symbols that won't be output can't be external.  */
+      S_CLEAR_EXTERNAL (orgsymP);

       orgsymP->sy_previous = orgsymP->sy_next = orgsymP;
       debug_verify_symchain (symbol_rootP, symbol_lastP);
 
       symbol_table_insert (newsymP);
     }
   else
       orgsymP->sy_previous = orgsymP->sy_next = orgsymP;
       debug_verify_symchain (symbol_rootP, symbol_lastP);
 
       symbol_table_insert (newsymP);
     }
   else

-    newsymP->sy_previous = newsymP->sy_next = newsymP;
+    {
+      /* Symbols that won't be output can't be external.  */
+      S_CLEAR_EXTERNAL (newsymP);
+      newsymP->sy_previous = newsymP->sy_next = newsymP;
+    }

 
   return newsymP;
 }
 
   return newsymP;
 }


@@ -874,11 +881,11 @@ verify_symbol_chain (symbolS *rootP, symbolS *lastP)
 
   for (; symbol_next (symbolP) != NULL; symbolP = symbol_next (symbolP))
     {
 
   for (; symbol_next (symbolP) != NULL; symbolP = symbol_next (symbolP))
     {

-      assert (symbolP->bsym != NULL);
-      assert (symbolP->sy_next->sy_previous == symbolP);
+      gas_assert (symbolP->bsym != NULL);
+      gas_assert (symbolP->sy_next->sy_previous == symbolP);

     }
 
     }
 

-  assert (lastP == symbolP);
+  gas_assert (lastP == symbolP);

 }
 
 #ifdef OBJ_COMPLEX_RELC
 }
 
 #ifdef OBJ_COMPLEX_RELC


@@ -1123,6 +1130,9 @@ resolve_symbol_value (symbolS *symp)
          final_val += symp->sy_frag->fr_address / OCTETS_PER_BYTE;
          if (final_seg == expr_section)
            final_seg = absolute_section;
          final_val += symp->sy_frag->fr_address / OCTETS_PER_BYTE;
          if (final_seg == expr_section)
            final_seg = absolute_section;

+         /* Fall through.  */
+
+       case O_register:

          resolved = 1;
          break;
 
          resolved = 1;
          break;
 


@@ -1136,13 +1146,13 @@ resolve_symbol_value (symbolS *symp)
        do_symbol:
          if (S_IS_WEAKREFR (symp))
            {
        do_symbol:
          if (S_IS_WEAKREFR (symp))
            {

-             assert (final_val == 0);
+             gas_assert (final_val == 0);

              if (S_IS_WEAKREFR (add_symbol))
                {
              if (S_IS_WEAKREFR (add_symbol))
                {

-                 assert (add_symbol->sy_value.X_op == O_symbol
+                 gas_assert (add_symbol->sy_value.X_op == O_symbol

                          && add_symbol->sy_value.X_add_number == 0);
                  add_symbol = add_symbol->sy_value.X_add_symbol;
                          && add_symbol->sy_value.X_add_number == 0);
                  add_symbol = add_symbol->sy_value.X_add_symbol;

-                 assert (! S_IS_WEAKREFR (add_symbol));
+                 gas_assert (! S_IS_WEAKREFR (add_symbol));

                  symp->sy_value.X_add_symbol = add_symbol;
                }
            }
                  symp->sy_value.X_add_symbol = add_symbol;
                }
            }


@@ -1400,7 +1410,6 @@ resolve_symbol_value (symbolS *symp)
                      && symbol_resolved_p (op_symbol));
          break;
 
                      && symbol_resolved_p (op_symbol));
          break;
 

-       case O_register:

        case O_big:
        case O_illegal:
          /* Give an error (below) if not in expr_section.  We don't
        case O_big:
        case O_illegal:
          /* Give an error (below) if not in expr_section.  We don't


@@ -1438,15 +1447,15 @@ exit_dont_set_value:
   return final_val;
 }
 
   return final_val;
 }
 

-static void resolve_local_symbol (const char *, PTR);
+static void resolve_local_symbol (const char *, void *);

 
 /* A static function passed to hash_traverse.  */
 
 static void
 
 /* A static function passed to hash_traverse.  */
 
 static void

-resolve_local_symbol (const char *key ATTRIBUTE_UNUSED, PTR value)
+resolve_local_symbol (const char *key ATTRIBUTE_UNUSED, void *value)

 {
   if (value != NULL)
 {
   if (value != NULL)

-    resolve_symbol_value (value);
+    resolve_symbol_value ((symbolS *) value);

 }
 
 /* Resolve all local symbols.  */
 }
 
 /* Resolve all local symbols.  */


@@ -1475,21 +1484,21 @@ snapshot_symbol (symbolS **symbolPP, valueT *valueP, segT *segP, fragS **fragPP)
     }
   else
     {
     }
   else
     {

-      expressionS expr = symbolP->sy_value;
+      expressionS exp = symbolP->sy_value;

 
 

-      if (!symbolP->sy_resolved && expr.X_op != O_illegal)
+      if (!symbolP->sy_resolved && exp.X_op != O_illegal)

        {
          int resolved;
 
          if (symbolP->sy_resolving)
            return 0;
          symbolP->sy_resolving = 1;
        {
          int resolved;
 
          if (symbolP->sy_resolving)
            return 0;
          symbolP->sy_resolving = 1;

-         resolved = resolve_expression (&expr);
+         resolved = resolve_expression (&exp);

          symbolP->sy_resolving = 0;
          if (!resolved)
            return 0;
 
          symbolP->sy_resolving = 0;
          if (!resolved)
            return 0;
 

-         switch (expr.X_op)
+         switch (exp.X_op)

            {
            case O_constant:
            case O_register:
            {
            case O_constant:
            case O_register:


@@ -1498,23 +1507,20 @@ snapshot_symbol (symbolS **symbolPP, valueT *valueP, segT *segP, fragS **fragPP)
              /* Fall thru.  */
            case O_symbol:
            case O_symbol_rva:
              /* Fall thru.  */
            case O_symbol:
            case O_symbol_rva:

-             symbolP = expr.X_add_symbol;
+             symbolP = exp.X_add_symbol;

              break;
            default:
              return 0;
            }
        }
 
              break;
            default:
              return 0;
            }
        }
 

-      /* Never change a defined symbol.  */
-      if (symbolP->bsym->section == undefined_section
-         || symbolP->bsym->section == expr_section)
-       *symbolPP = symbolP;
-      *valueP = expr.X_add_number;
+      *symbolPP = symbolP;
+      *valueP = exp.X_add_number;

       *segP = symbolP->bsym->section;
       *fragPP = symbolP->sy_frag;
 
       if (*segP == expr_section)
       *segP = symbolP->bsym->section;
       *fragPP = symbolP->sy_frag;
 
       if (*segP == expr_section)

-       switch (expr.X_op)
+       switch (exp.X_op)

          {
          case O_constant: *segP = absolute_section; break;
          case O_register: *segP = reg_section; break;
          {
          case O_constant: *segP = absolute_section; break;
          case O_register: *segP = reg_section; break;


@@ -1596,7 +1602,7 @@ define_dollar_label (long label)
     {
       dollar_labels = (long *) xmalloc (DOLLAR_LABEL_BUMP_BY * sizeof (long));
       dollar_label_instances = (long *) xmalloc (DOLLAR_LABEL_BUMP_BY * sizeof (long));
     {
       dollar_labels = (long *) xmalloc (DOLLAR_LABEL_BUMP_BY * sizeof (long));
       dollar_label_instances = (long *) xmalloc (DOLLAR_LABEL_BUMP_BY * sizeof (long));

-      dollar_label_defines = xmalloc (DOLLAR_LABEL_BUMP_BY);
+      dollar_label_defines = (char *) xmalloc (DOLLAR_LABEL_BUMP_BY);

       dollar_label_max = DOLLAR_LABEL_BUMP_BY;
       dollar_label_count = 0;
     }
       dollar_label_max = DOLLAR_LABEL_BUMP_BY;
       dollar_label_count = 0;
     }


@@ -1607,7 +1613,7 @@ define_dollar_label (long label)
                                         dollar_label_max * sizeof (long));
       dollar_label_instances = (long *) xrealloc ((char *) dollar_label_instances,
                                          dollar_label_max * sizeof (long));
                                         dollar_label_max * sizeof (long));
       dollar_label_instances = (long *) xrealloc ((char *) dollar_label_instances,
                                          dollar_label_max * sizeof (long));

-      dollar_label_defines = xrealloc (dollar_label_defines, dollar_label_max);
+      dollar_label_defines = (char *) xrealloc (dollar_label_defines, dollar_label_max);

     }                          /* if we needed to grow  */
 
   dollar_labels[dollar_label_count] = label;
     }                          /* if we needed to grow  */
 
   dollar_labels[dollar_label_count] = label;


@@ -1856,17 +1862,17 @@ decode_local_label_name (char *s)
   int instance_number;
   char *type;
   const char *message_format;
   int instance_number;
   char *type;
   const char *message_format;

-  int index = 0;
+  int lindex = 0;

 
 #ifdef LOCAL_LABEL_PREFIX
 
 #ifdef LOCAL_LABEL_PREFIX

-  if (s[index] == LOCAL_LABEL_PREFIX)
-    ++index;
+  if (s[lindex] == LOCAL_LABEL_PREFIX)
+    ++lindex;

 #endif
 
 #endif
 

-  if (s[index] != 'L')
+  if (s[lindex] != 'L')

     return s;
 
     return s;
 

-  for (label_number = 0, p = s + index + 1; ISDIGIT (*p); ++p)
+  for (label_number = 0, p = s + lindex + 1; ISDIGIT (*p); ++p)

     label_number = (10 * label_number) + *p - '0';
 
   if (*p == DOLLAR_LABEL_CHAR)
     label_number = (10 * label_number) + *p - '0';
 
   if (*p == DOLLAR_LABEL_CHAR)


@@ -1880,7 +1886,7 @@ decode_local_label_name (char *s)
     instance_number = (10 * instance_number) + *p - '0';
 
   message_format = _("\"%d\" (instance number %d of a %s label)");
     instance_number = (10 * instance_number) + *p - '0';
 
   message_format = _("\"%d\" (instance number %d of a %s label)");

-  symbol_decode = obstack_alloc (&notes, strlen (message_format) + 30);
+  symbol_decode = (char *) obstack_alloc (&notes, strlen (message_format) + 30);

   sprintf (symbol_decode, message_format, label_number, instance_number, type);
 
   return symbol_decode;
   sprintf (symbol_decode, message_format, label_number, instance_number, type);
 
   return symbol_decode;


@@ -1941,12 +1947,17 @@ copy_symbol_attributes (symbolS *dest, symbolS *src)
 
   /* In an expression, transfer the settings of these flags.
      The user can override later, of course.  */
 
   /* In an expression, transfer the settings of these flags.
      The user can override later, of course.  */

-#define COPIED_SYMFLAGS        (BSF_FUNCTION | BSF_OBJECT)
+#define COPIED_SYMFLAGS        (BSF_FUNCTION | BSF_OBJECT \
+                        | BSF_GNU_INDIRECT_FUNCTION)

   dest->bsym->flags |= src->bsym->flags & COPIED_SYMFLAGS;
 
 #ifdef OBJ_COPY_SYMBOL_ATTRIBUTES
   OBJ_COPY_SYMBOL_ATTRIBUTES (dest, src);
 #endif
   dest->bsym->flags |= src->bsym->flags & COPIED_SYMFLAGS;
 
 #ifdef OBJ_COPY_SYMBOL_ATTRIBUTES
   OBJ_COPY_SYMBOL_ATTRIBUTES (dest, src);
 #endif

+
+#ifdef TC_COPY_SYMBOL_ATTRIBUTES
+  TC_COPY_SYMBOL_ATTRIBUTES (dest, src);
+#endif

 }
 
 int
 }
 
 int


@@ -2041,6 +2052,7 @@ S_FORCE_RELOC (symbolS *s, int strict)
 
   return ((strict
           && ((s->bsym->flags & BSF_WEAK) != 0
 
   return ((strict
           && ((s->bsym->flags & BSF_WEAK) != 0

+              || (s->bsym->flags & BSF_GNU_INDIRECT_FUNCTION) != 0

               || (EXTERN_FORCE_RELOC
                   && (s->bsym->flags & BSF_GLOBAL) != 0)))
          || s->bsym->section == undefined_section
               || (EXTERN_FORCE_RELOC
                   && (s->bsym->flags & BSF_GLOBAL) != 0)))
          || s->bsym->section == undefined_section


@@ -2180,10 +2192,18 @@ S_SET_EXTERNAL (symbolS *s)
                     _("section symbols are already global"));
       return;
     }
                     _("section symbols are already global"));
       return;
     }

+#ifndef TC_GLOBAL_REGISTER_SYMBOL_OK
+  if (S_GET_SEGMENT (s) == reg_section)
+    {
+      as_bad ("can't make register symbol `%s' global",
+             S_GET_NAME (s));
+      return;
+    }
+#endif

   s->bsym->flags |= BSF_GLOBAL;
   s->bsym->flags &= ~(BSF_LOCAL | BSF_WEAK);
 
   s->bsym->flags |= BSF_GLOBAL;
   s->bsym->flags &= ~(BSF_LOCAL | BSF_WEAK);
 

-#ifdef USE_UNIQUE
+#ifdef TE_PE

   if (! an_external_name && S_GET_NAME(s)[0] != '.')
     an_external_name = S_GET_NAME (s);
 #endif
   if (! an_external_name && S_GET_NAME(s)[0] != '.')
     an_external_name = S_GET_NAME (s);
 #endif


@@ -2365,6 +2385,20 @@ symbol_set_value_expression (symbolS *s, const expressionS *exp)
   S_CLEAR_WEAKREFR (s);
 }
 
   S_CLEAR_WEAKREFR (s);
 }
 

+/* Return whether 2 symbols are the same.  */
+
+int
+symbol_same_p (symbolS *s1, symbolS *s2)
+{
+  if (s1->bsym == NULL
+      && local_symbol_converted_p ((struct local_symbol *) s1))
+    s1 = local_symbol_get_real_symbol ((struct local_symbol *) s1);
+  if (s2->bsym == NULL
+      && local_symbol_converted_p ((struct local_symbol *) s2))
+    s2 = local_symbol_get_real_symbol ((struct local_symbol *) s2);
+  return s1 == s2;
+}
+

 /* Return a pointer to the X_add_number component of a symbol.  */
 
 offsetT *
 /* Return a pointer to the X_add_number component of a symbol.  */
 
 offsetT *


@@ -2724,14 +2758,20 @@ print_symbol_value_1 (FILE *file, symbolS *sym)
   const char *name = S_GET_NAME (sym);
   if (!name || !name[0])
     name = "(unnamed)";
   const char *name = S_GET_NAME (sym);
   if (!name || !name[0])
     name = "(unnamed)";

-  fprintf (file, "sym %lx %s", (unsigned long) sym, name);
+  fprintf (file, "sym ");
+  fprintf_vma (file, (bfd_vma) ((bfd_hostptr_t) sym));
+  fprintf (file, " %s", name);

 
   if (LOCAL_SYMBOL_CHECK (sym))
     {
       struct local_symbol *locsym = (struct local_symbol *) sym;
 
   if (LOCAL_SYMBOL_CHECK (sym))
     {
       struct local_symbol *locsym = (struct local_symbol *) sym;

-      if (local_symbol_get_frag (locsym) != &zero_address_frag
+
+      if (local_symbol_get_frag (locsym) != & zero_address_frag

          && local_symbol_get_frag (locsym) != NULL)
          && local_symbol_get_frag (locsym) != NULL)

-       fprintf (file, " frag %lx", (long) local_symbol_get_frag (locsym));
+       {
+         fprintf (file, " frag ");
+         fprintf_vma (file, (bfd_vma) ((bfd_hostptr_t) local_symbol_get_frag (locsym)));
+        }

       if (local_symbol_resolved_p (locsym))
        fprintf (file, " resolved");
       fprintf (file, " local");
       if (local_symbol_resolved_p (locsym))
        fprintf (file, " resolved");
       fprintf (file, " local");


@@ -2739,7 +2779,10 @@ print_symbol_value_1 (FILE *file, symbolS *sym)
   else
     {
       if (sym->sy_frag != &zero_address_frag)
   else
     {
       if (sym->sy_frag != &zero_address_frag)

-       fprintf (file, " frag %lx", (long) sym->sy_frag);
+       {
+         fprintf (file, " frag ");
+         fprintf_vma (file, (bfd_vma) ((bfd_hostptr_t) sym->sy_frag));
+       }

       if (sym->written)
        fprintf (file, " written");
       if (sym->sy_resolved)
       if (sym->written)
        fprintf (file, " written");
       if (sym->sy_resolved)


@@ -2772,7 +2815,7 @@ print_symbol_value_1 (FILE *file, symbolS *sym)
 
       if (s != undefined_section
          && s != expr_section)
 
       if (s != undefined_section
          && s != expr_section)

-       fprintf (file, " %lx", (long) S_GET_VALUE (sym));
+       fprintf (file, " %lx", (unsigned long) S_GET_VALUE (sym));

     }
   else if (indent_level < max_indent_level
           && S_GET_SEGMENT (sym) != undefined_section)
     }
   else if (indent_level < max_indent_level
           && S_GET_SEGMENT (sym) != undefined_section)


@@ -2781,7 +2824,7 @@ print_symbol_value_1 (FILE *file, symbolS *sym)
       fprintf (file, "\n%*s<", indent_level * 4, "");
       if (LOCAL_SYMBOL_CHECK (sym))
        fprintf (file, "constant %lx",
       fprintf (file, "\n%*s<", indent_level * 4, "");
       if (LOCAL_SYMBOL_CHECK (sym))
        fprintf (file, "constant %lx",

-                (long) ((struct local_symbol *) sym)->lsy_value);
+                (unsigned long) ((struct local_symbol *) sym)->lsy_value);

       else
        print_expr_1 (file, &sym->sy_value);
       fprintf (file, ">");
       else
        print_expr_1 (file, &sym->sy_value);
       fprintf (file, ">");


@@ -2813,7 +2856,9 @@ print_binary (FILE *file, const char *name, expressionS *exp)
 void
 print_expr_1 (FILE *file, expressionS *exp)
 {
 void
 print_expr_1 (FILE *file, expressionS *exp)
 {

-  fprintf (file, "expr %lx ", (long) exp);
+  fprintf (file, "expr ");
+  fprintf_vma (file, (bfd_vma) ((bfd_hostptr_t) exp));
+  fprintf (file, " ");

   switch (exp->X_op)
     {
     case O_illegal:
   switch (exp->X_op)
     {
     case O_illegal:


@@ -2823,7 +2868,7 @@ print_expr_1 (FILE *file, expressionS *exp)
       fprintf (file, "absent");
       break;
     case O_constant:
       fprintf (file, "absent");
       break;
     case O_constant:

-      fprintf (file, "constant %lx", (long) exp->X_add_number);
+      fprintf (file, "constant %lx", (unsigned long) exp->X_add_number);

       break;
     case O_symbol:
       indent_level++;
       break;
     case O_symbol:
       indent_level++;


@@ -2833,7 +2878,7 @@ print_expr_1 (FILE *file, expressionS *exp)
     maybe_print_addnum:
       if (exp->X_add_number)
        fprintf (file, "\n%*s%lx", indent_level * 4, "",
     maybe_print_addnum:
       if (exp->X_add_number)
        fprintf (file, "\n%*s%lx", indent_level * 4, "",

-                (long) exp->X_add_number);
+                (unsigned long) exp->X_add_number);

       indent_level--;
       break;
     case O_register:
       indent_level--;
       break;
     case O_register:


@@ -2955,7 +3000,7 @@ symbol_relc_make_sym (symbolS * sym)
   char typetag;
   int sname_len;
 
   char typetag;
   int sname_len;
 

-  assert (sym != NULL);
+  gas_assert (sym != NULL);

 
   /* Recurse to symbol_relc_make_expr if this symbol
      is defined as an expression or a plain value.  */
 
   /* Recurse to symbol_relc_make_expr if this symbol
      is defined as an expression or a plain value.  */


@@ -3000,7 +3045,7 @@ symbol_relc_make_value (offsetT val)
   char * terminal = xmalloc (28);  /* Enough for long long.  */
 
   terminal[0] = '#';
   char * terminal = xmalloc (28);  /* Enough for long long.  */
 
   terminal[0] = '#';

-  sprintf_vma (& terminal[1], val);
+  bfd_sprintf_vma (stdoutput, terminal + 1, val);

   return terminal;
 }
 
   return terminal;
 }
 


@@ -3020,7 +3065,7 @@ symbol_relc_make_expr (expressionS * exp)
 
   operands[0] = operands[1] = operands[2] = NULL;
 
 
   operands[0] = operands[1] = operands[2] = NULL;
 

-  assert (exp != NULL);
+  gas_assert (exp != NULL);

 
   /* Match known operators -> fill in opstr, arity, operands[] and fall
      through to construct subexpression fragments; may instead return 
 
   /* Match known operators -> fill in opstr, arity, operands[] and fall
      through to construct subexpression fragments; may instead return 


@@ -3133,7 +3178,7 @@ symbol_relc_make_expr (expressionS * exp)
                               + (arity >= 2 ? (strlen (operands[1]) + 1 ) : 0)
                               + (arity >= 3 ? (strlen (operands[2]) + 0 ) : 0)
                               + 1);
                               + (arity >= 2 ? (strlen (operands[1]) + 1 ) : 0)
                               + (arity >= 3 ? (strlen (operands[2]) + 0 ) : 0)
                               + 1);

-      assert (concat_string != NULL);
+      gas_assert (concat_string != NULL);

       
       /* Format the thing.  */
       sprintf (concat_string, 
       
       /* Format the thing.  */
       sprintf (concat_string,