X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fcoff-aux.c;h=af1db03836dad232c08fba8837ee514216d69ce5;hb=3d44109a42a89679c587137641ff350775762eaf;hp=53822f04ed713920c92045e34c1572345aac5919;hpb=2ee563b53258d390d7446e90a67f465d504ae44c;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/coff-aux.c b/bfd/coff-aux.c
index 53822f04ed..af1db03836 100644
--- a/bfd/coff-aux.c
+++ b/bfd/coff-aux.c
@@ -1,22 +1,24 @@
 /* BFD back-end for Apple M68K COFF A/UX 3.x files.
-   Copyright 1996, 1997, 2000 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 2000, 2002, 2005, 2007, 2008
+   Free Software Foundation, Inc.
    Written by Richard Henderson <rth@tamu.edu>.
 
-This file is part of BFD, the Binary File Descriptor library.
+   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 2 of the License, or
-(at your option) any later version.
+   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.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
 
 #define TARGET_SYM	m68kaux_coff_vec
 #define TARGET_NAME	"coff-m68k-aux"
@@ -37,16 +39,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define COFF_COMMON_ADDEND
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 
-static boolean coff_m68k_aux_link_add_one_symbol
+static bfd_boolean coff_m68k_aux_link_add_one_symbol
   PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword,
-           asection *, bfd_vma, const char *, boolean, boolean,
+           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
 
+#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"
 
@@ -56,7 +62,7 @@ static boolean coff_m68k_aux_link_add_one_symbol
    shared libraries work here, but can work if you are careful with
    what you include in the shared object.  */
 
-static boolean
+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;
@@ -66,8 +72,8 @@ coff_m68k_aux_link_add_one_symbol (info, abfd, name, flags, section, value,
      asection *section;
      bfd_vma value;
      const char *string;
-     boolean copy;
-     boolean collect;
+     bfd_boolean copy;
+     bfd_boolean collect;
      struct bfd_link_hash_entry **hashp;
 {
   struct bfd_link_hash_entry *h;
@@ -86,21 +92,21 @@ coff_m68k_aux_link_add_one_symbol (info, abfd, name, flags, section, value,
 	}
       else
 	{
-	  h = bfd_link_hash_lookup (info->hash, name, true, copy, false);
+	  h = bfd_link_hash_lookup (info->hash, name, TRUE, copy, FALSE);
 	  if (h == NULL)
 	    {
 	      if (hashp != NULL)
 		*hashp = NULL;
-	      return false;
+	      return FALSE;
 	    }
 	}
 
       if (info->notice_hash != (struct bfd_hash_table *) NULL
-	  && (bfd_hash_lookup (info->notice_hash, name, false, false)
+	  && (bfd_hash_lookup (info->notice_hash, name, FALSE, FALSE)
 	      != (struct bfd_hash_entry *) NULL))
 	{
 	  if (! (*info->callbacks->notice) (info, name, abfd, section, value))
-	    return false;
+	    return FALSE;
 	}
 
       if (hashp != (struct bfd_link_hash_entry **) NULL)
@@ -121,10 +127,10 @@ coff_m68k_aux_link_add_one_symbol (info, abfd, name, flags, section, value,
 	    {
 	      h->u.def.section = section;
 	      h->u.def.value = value;
-	      return true;
+	      return TRUE;
 	    }
 	  else if (bfd_is_abs_section (section) && !bfd_is_abs_section (msec))
-	    return true;
+	    return TRUE;
 	}
     }