Merge GDB 7.5.1

bfd/coff-aux.c

 /* BFD back-end for Apple M68K COFF A/UX 3.x files.
-   Copyright 1996, 1997, 2000, 2002, 2005, 2007, 2008, 2011
+   Copyright 1996, 1997, 2000, 2002, 2005, 2007, 2008, 2011, 2012
    Free Software Foundation, Inc.
    Written by Richard Henderson <rth@tamu.edu>.
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program 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 3 of the License, or
    (at your option) any later version.
 
@@ skipping 22 matching lines @@
 /* On AUX, a STYP_NOLOAD|STYP_BSS section is part of a shared library.  */
 #define BSS_NOLOAD_IS_SHARED_LIBRARY
 
 #define STATIC_RELOCS
 
 #define COFF_COMMON_ADDEND
 
 #include "sysdep.h"
 #include "bfd.h"
 
-static bfd_boolean coff_m68k_aux_link_add_one_symbol
-  PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword,
-           asection *, bfd_vma, const char *, bfd_boolean, bfd_boolean,
-           struct bfd_link_hash_entry **));
-
 #define coff_link_add_one_symbol coff_m68k_aux_link_add_one_symbol
+static bfd_boolean
+coff_m68k_aux_link_add_one_symbol
+  (struct bfd_link_info *, bfd *, const char *, flagword, asection *,
+   bfd_vma, const char *, bfd_boolean, bfd_boolean,
+   struct bfd_link_hash_entry **);
 
 #ifndef bfd_pe_print_pdata
 #define bfd_pe_print_pdata      NULL
 #endif
 
 #include "coff/aux-coff.h"  /* override coff/internal.h and coff/m68k.h */
 #include "coff-m68k.c"
 
 /* We need non-absolute symbols to override absolute symbols.  This
    mirrors Apple's "solution" to let a static library symbol override
    a shared library symbol.  On the whole not a good thing, given how
    shared libraries work here, but can work if you are careful with
    what you include in the shared object.  */
 
 static bfd_boolean
-coff_m68k_aux_link_add_one_symbol (info, abfd, name, flags, section, value,
-                                   string, copy, collect, hashp)
-     struct bfd_link_info *info;
-     bfd *abfd;
-     const char *name;
-     flagword flags;
-     asection *section;
-     bfd_vma value;
-     const char *string;
-     bfd_boolean copy;
-     bfd_boolean collect;
-     struct bfd_link_hash_entry **hashp;
+coff_m68k_aux_link_add_one_symbol (struct bfd_link_info *info,
+                                   bfd *abfd,
+                                   const char *name,
+                                   flagword flags,
+                                   asection *section,
+                                   bfd_vma value,
+                                   const char *string,
+                                   bfd_boolean copy,
+                                   bfd_boolean collect,
+                                   struct bfd_link_hash_entry **hashp)
 {
   struct bfd_link_hash_entry *h;
 
   if ((flags & (BSF_WARNING | BSF_CONSTRUCTOR | BSF_WEAK)) == 0 &&
       !bfd_is_und_section (section) &&
       !bfd_is_com_section (section))
     {
       /* The new symbol is a definition or an indirect definition */
 
       /* This bit copied from linker.c */
@@ skipping 45 matching lines @@
           else if (bfd_is_abs_section (section) && !bfd_is_abs_section (msec))
             return TRUE;
         }
     }
 
   /* If we didn't exit early, finish processing in the generic routine */
   return _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section,
                                            value, string, copy, collect,
                                            hashp);
 }