* hppa.h (pa_opcodes): Use "cX" completer instead of "cx" in fstqx

[external/binutils.git] / gas / config / obj-aout.c

diff --git a/gas/config/obj-aout.c b/gas/config/obj-aout.c
index 0c89ba2..ce72135 100644 (file)
--- a/gas/config/obj-aout.c
+++ b/gas/config/obj-aout.c
@@ -1,6 +1,7 @@
 /* a.out object file format
    Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
+   2001, 2002, 2003, 2004, 2005, 2007, 2009, 2010, 2012
+   Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -31,19 +32,17 @@ obj_aout_frob_symbol (symbolS *sym, int *punt ATTRIBUTE_UNUSED)
 {
   flagword flags;
   asection *sec;
-  int desc, type, other;
+  int type;
 
   flags = symbol_get_bfdsym (sym)->flags;
-  desc = aout_symbol (symbol_get_bfdsym (sym))->desc;
   type = aout_symbol (symbol_get_bfdsym (sym))->type;
-  other = aout_symbol (symbol_get_bfdsym (sym))->other;
   sec = S_GET_SEGMENT (sym);
 
   /* Only frob simple symbols this way right now.  */
   if (! (type & ~ (N_TYPE | N_EXT)))
     {
       if (type == (N_UNDF | N_EXT)
-         && sec == &bfd_abs_section)
+         && sec == bfd_abs_section_ptr)
        {
          sec = bfd_und_section_ptr;
          S_SET_SEGMENT (sym, sec);
@@ -55,8 +54,8 @@ obj_aout_frob_symbol (symbolS *sym, int *punt ATTRIBUTE_UNUSED)
          && (type & N_TYPE) != N_SETD
          && (type & N_TYPE) != N_SETB
          && type != N_WARNING
-         && (sec == &bfd_abs_section
-             || sec == &bfd_und_section))
+         && (sec == bfd_abs_section_ptr
+             || sec == bfd_und_section_ptr))
        return;
       if (flags & BSF_EXPORT)
        type |= N_EXT;
@@ -310,7 +309,9 @@ const struct format_ops aout_format_ops =
   aout_pop_insert,
   0,   /* ecoff_set_ext.  */
   0,   /* read_begin_hook.  */
-  0    /* symbol_new_hook.  */
+  0,   /* symbol_new_hook.  */
+  0,   /* symbol_clone_hook.  */
+  0    /* adjust_symtab.  */
 };
 
 const pseudo_typeS aout_pseudo_table[] =