X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Foasys.c;h=b1ca5271aab1fd80ef99da884a3889ce5abdb6d4;hb=32866df75ece22ec1fd88e99e3c5effe9238e072;hp=a8cb34198c9e98ee4e03688dc54bf7d81dc18e6f;hpb=116c20d240af833e0a1f1f959951f57b6e465782;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/oasys.c b/bfd/oasys.c
index a8cb34198c..b1ca5271aa 100644
--- a/bfd/oasys.c
+++ b/bfd/oasys.c
@@ -1,13 +1,13 @@
 /* BFD back-end for oasys objects.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2001,
-   2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
    Written by Steve Chamberlain of Cygnus Support, <sac@cygnus.com>.
 
    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
+   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,
@@ -17,11 +17,12 @@
 
    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.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
 
 #define UNDERSCORE_HACK 1
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "safe-ctype.h"
 #include "libbfd.h"
 #include "oasys.h"
@@ -384,11 +385,13 @@ oasys_slurp_section_data (bfd *const abfd)
 
 	    if (! per->initialized)
 	      {
+		arelent **relpp;
+
 		per->data = bfd_zalloc (abfd, section->size);
 		if (!per->data)
 		  return FALSE;
-		per->reloc_tail_ptr
-		  = (oasys_reloc_type **) &section->relocation;
+		relpp = &section->relocation;
+		per->reloc_tail_ptr = (oasys_reloc_type **) relpp;
 		per->had_vma = FALSE;
 		per->initialized = TRUE;
 		section->reloc_count = 0;
@@ -683,9 +686,13 @@ oasys_print_symbol (bfd *abfd, void * afile, asymbol *symbol, bfd_print_symbol_t
 static bfd_boolean
 oasys_new_section_hook (bfd *abfd, asection *newsect)
 {
-  newsect->used_by_bfd = bfd_alloc (abfd, (bfd_size_type) sizeof (oasys_per_section_type));
   if (!newsect->used_by_bfd)
-    return FALSE;
+    {
+      newsect->used_by_bfd
+	= bfd_alloc (abfd, (bfd_size_type) sizeof (oasys_per_section_type));
+      if (!newsect->used_by_bfd)
+	return FALSE;
+    }
   oasys_per_section (newsect)->data = NULL;
   oasys_per_section (newsect)->section = newsect;
   oasys_per_section (newsect)->offset = 0;
@@ -695,7 +702,7 @@ oasys_new_section_hook (bfd *abfd, asection *newsect)
   /* Turn the section string into an index.  */
   sscanf (newsect->name, "%u", &newsect->target_index);
 
-  return TRUE;
+  return _bfd_generic_new_section_hook (abfd, newsect);
 }
 
 
@@ -1132,6 +1139,15 @@ oasys_find_nearest_line (bfd *abfd ATTRIBUTE_UNUSED,
   return FALSE;
 }
 
+static bfd_boolean
+oasys_find_inliner_info (bfd *abfd ATTRIBUTE_UNUSED,
+			 const char **filename_ptr ATTRIBUTE_UNUSED,
+			 const char **functionname_ptr ATTRIBUTE_UNUSED,
+			 unsigned int *line_ptr ATTRIBUTE_UNUSED)
+{
+  return FALSE;
+}
+
 static int
 oasys_generic_stat_arch_elt (bfd *abfd, struct stat *buf)
 {
@@ -1149,7 +1165,8 @@ oasys_generic_stat_arch_elt (bfd *abfd, struct stat *buf)
 }
 
 static int
-oasys_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED, bfd_boolean exec ATTRIBUTE_UNUSED)
+oasys_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
+		      struct bfd_link_info *info ATTRIBUTE_UNUSED)
 {
   return 0;
 }
@@ -1171,6 +1188,7 @@ oasys_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED, bfd_boolean exec ATTRIBUTE_UNU
 #define oasys_read_minisymbols                     _bfd_generic_read_minisymbols
 #define oasys_minisymbol_to_symbol                 _bfd_generic_minisymbol_to_symbol
 #define oasys_bfd_reloc_type_lookup                _bfd_norelocs_bfd_reloc_type_lookup
+#define oasys_bfd_reloc_name_lookup          _bfd_norelocs_bfd_reloc_name_lookup
 #define oasys_set_arch_mach                        bfd_default_set_arch_mach
 #define oasys_get_section_contents_in_window       _bfd_generic_get_section_contents_in_window
 #define oasys_bfd_get_relocated_section_contents   bfd_generic_get_relocated_section_contents