daily update

[binutils.git] / bfd / hp300hpux.c

diff --git a/bfd/hp300hpux.c b/bfd/hp300hpux.c
index d4eb3aad1e31afb7142b49f0dcf56e85bf873247..d016e3a9c2ee389bb38dd250a58c15542f7ef31c 100644 (file)
--- a/bfd/hp300hpux.c
+++ b/bfd/hp300hpux.c
@@ -1,26 +1,27 @@
 /* BFD backend for hp-ux 9000/300
-   Copyright 1990, 1991, 1993, 1994, 1995, 1997, 2000, 2001, 2002
-   Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002,
+   2003, 2004, 2007 Free Software Foundation, Inc.
    Written by Glenn Engel.
 
-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.  */
 
-/*
-    hpux native  ------------> |               |
+
+/*  hpux native  ------------> |               |
                                | hp300hpux bfd | ----------> hpux w/gnu ext
     hpux w/gnu extension ----> |               |
 
@@ -93,7 +94,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
        slurp_symbol_table
        swap_std_reloc_in
        slurp_reloc_table
-       get_symtab
+       canonicalize_symtab
        get_symtab_upper_bound
        canonicalize_reloc
        mkobject
@@ -129,7 +130,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* these don't use MY because that causes problems within JUMP_TABLE
    (CONCAT2 winds up being expanded recursively, which ANSI C compilers
    will not do).  */
-#define MY_get_symtab hp300hpux_get_symtab
+#define MY_canonicalize_symtab hp300hpux_canonicalize_symtab
 #define MY_get_symtab_upper_bound hp300hpux_get_symtab_upper_bound
 #define MY_canonicalize_reloc hp300hpux_canonicalize_reloc
 #define MY_write_object_contents hp300hpux_write_object_contents
@@ -208,7 +209,7 @@ void MY (swap_std_reloc_in)
           bfd_size_type));
 bfd_boolean MY (slurp_reloc_table)
   PARAMS ((bfd *, sec_ptr, asymbol **));
-long MY (get_symtab)
+long MY (canonicalize_symtab)
   PARAMS ((bfd *, asymbol **));
 long MY (get_symtab_upper_bound)
   PARAMS ((bfd *));
@@ -232,7 +233,7 @@ MY (callback) (abfd)
   struct internal_exec *execp = exec_hdr (abfd);
 
   /* Calculate the file positions of the parts of a newly read aout header */
-  obj_textsec (abfd)->_raw_size = N_TXTSIZE (*execp);
+  obj_textsec (abfd)->size = N_TXTSIZE (*execp);
 
   /* The virtual memory addresses of the sections */
   obj_textsec (abfd)->vma = N_TXTADDR (*execp);
@@ -475,7 +476,7 @@ NAME (aout,swap_exec_header_in) (abfd, raw_bytes, execp)
 
   /***************************************************************/
   /* check the header to see if it was generated by a bfd output */
-  /* this is detected rather bizarely by requiring a bunch of    */
+  /* this is detected rather bizarrely by requiring a bunch of   */
   /* header fields to be zero and an old unused field (now used) */
   /* to be set.                                                  */
   /***************************************************************/
@@ -588,7 +589,7 @@ MY (slurp_symbol_table) (abfd)
      assignment to the strings pointer is done after we're thru using
      the nlist so we don't overwrite anything important. */
 
-  /* OK, now walk the new symtable, cacheing symbol properties */
+  /* OK, now walk the new symtable, caching symbol properties */
   {
     aout_symbol_type *cache_ptr = cached;
     aout_symbol_type cache_save;
@@ -611,7 +612,7 @@ MY (slurp_symbol_table) (abfd)
          return FALSE;
 
        /********************************************************/
-       /* for hpux, the 'lenght' value indicates the length of */
+       /* for hpux, the 'length' value indicates the length of */
        /* the symbol name which follows the nlist entry.       */
        /********************************************************/
        if (length)
@@ -802,7 +803,7 @@ doit:
 /* call aout_32 versions if the input file was generated by gcc         */
 /************************************************************************/
 
-long aout_32_get_symtab
+long aout_32_canonicalize_symtab
   PARAMS ((bfd * abfd, asymbol ** location));
 long aout_32_get_symtab_upper_bound
   PARAMS ((bfd * abfd));
@@ -811,7 +812,7 @@ long aout_32_canonicalize_reloc
           asymbol ** symbols));
 
 long
-MY (get_symtab) (abfd, location)
+MY (canonicalize_symtab) (abfd, location)
      bfd *abfd;
      asymbol **location;
 {
@@ -819,7 +820,7 @@ MY (get_symtab) (abfd, location)
   aout_symbol_type *symbase;
 
   if (obj_aout_subformat (abfd) == gnu_encap_format)
-    return aout_32_get_symtab (abfd, location);
+    return aout_32_canonicalize_symtab (abfd, location);
 
   if (!MY (slurp_symbol_table) (abfd))
     return -1;