X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fsparclynx.c;h=81aa5548153d6759f7c8b3f10d68f10fcb6e1320;hb=66f338c7b9bf573cdd96e827eb9fef079ac55720;hp=4da604f489a70692e93a102868e19da949999a8e;hpb=2ee563b53258d390d7446e90a67f465d504ae44c;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/sparclynx.c b/bfd/sparclynx.c
index 4da604f489..81aa554815 100644
--- a/bfd/sparclynx.c
+++ b/bfd/sparclynx.c
@@ -1,6 +1,6 @@
 /* BFD support for Sparc binaries under LynxOS.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1998, 2000,
-   2001 Free Software Foundation, Inc.
+   2001, 2002, 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -16,18 +16,7 @@ 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.  */
-
-#if 0
-#define BYTES_IN_WORD 4
-#define N_SHARED_LIB(x) 0
-
-#define TEXT_START_ADDR 0
-#define TARGET_PAGE_SIZE 4096
-#define SEGMENT_SIZE TARGET_PAGE_SIZE
-#define DEFAULT_ARCH bfd_arch_sparc
-
-#endif
+Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
@@ -48,7 +37,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 void NAME (lynx,set_arch_mach) PARAMS ((bfd *, unsigned long));
 static void choose_reloc_size PARAMS ((bfd *));
-static boolean NAME (aout,sparclynx_write_object_contents) PARAMS ((bfd *));
+static bfd_boolean NAME (aout,sparclynx_write_object_contents) PARAMS ((bfd *));
 
 /* This is needed to reject a NewsOS file, e.g. in
    gdb/testsuite/gdb.t10/crossload.exp. <kingdon@cygnus.com>
@@ -119,11 +108,6 @@ NAME(lynx,set_arch_mach) (abfd, machtype)
       machine = 0;
       break;
 
-    case M_29K:
-      arch = bfd_arch_a29k;
-      machine = 0;
-      break;
-
     case M_HPUX:
       arch = bfd_arch_m68k;
       machine = 0;
@@ -150,7 +134,6 @@ choose_reloc_size (abfd)
   switch (bfd_get_arch (abfd))
     {
     case bfd_arch_sparc:
-    case bfd_arch_a29k:
       obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE;
       break;
     default:
@@ -163,7 +146,7 @@ choose_reloc_size (abfd)
   Section contents have already been written.  We write the
   file header, symbols, and relocation.  */
 
-static boolean
+static bfd_boolean
 NAME(aout,sparclynx_write_object_contents) (abfd)
      bfd *abfd;
 {
@@ -191,9 +174,6 @@ NAME(aout,sparclynx_write_object_contents) (abfd)
     case bfd_arch_i386:
       N_SET_MACHTYPE (*execp, M_386);
       break;
-    case bfd_arch_a29k:
-      N_SET_MACHTYPE (*execp, M_29K);
-      break;
     default:
       N_SET_MACHTYPE (*execp, M_UNKNOWN);
     }
@@ -204,30 +184,30 @@ NAME(aout,sparclynx_write_object_contents) (abfd)
 
   WRITE_HEADERS (abfd, execp);
 
-  return true;
+  return TRUE;
 }
 
 #define MY_set_sizes sparclynx_set_sizes
-static boolean sparclynx_set_sizes PARAMS ((bfd *));
+static bfd_boolean sparclynx_set_sizes PARAMS ((bfd *));
 
-static boolean
+static bfd_boolean
 sparclynx_set_sizes (abfd)
      bfd *abfd;
 {
   switch (bfd_get_arch (abfd))
     {
     default:
-      return false;
+      return FALSE;
     case bfd_arch_sparc:
       adata (abfd).page_size = 0x2000;
       adata (abfd).segment_size = 0x2000;
       adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE;
-      return true;
+      return TRUE;
     case bfd_arch_m68k:
       adata (abfd).page_size = 0x2000;
       adata (abfd).segment_size = 0x20000;
       adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE;
-      return true;
+      return TRUE;
     }
 }
 
@@ -246,7 +226,7 @@ static const struct aout_backend_data sparclynx_aout_backend =
 #define MY_bfd_debug_info_start		bfd_void
 #define MY_bfd_debug_info_end		bfd_void
 #define MY_bfd_debug_info_accumulate	\
-			(void (*) PARAMS ((bfd *, struct sec *))) bfd_void
+		(void (*) PARAMS ((bfd *, struct bfd_section *))) bfd_void
 
 #define MY_write_object_contents	NAME(aout,sparclynx_write_object_contents)
 #define MY_backend_data			&sparclynx_aout_backend
@@ -255,9 +235,9 @@ static const struct aout_backend_data sparclynx_aout_backend =
 
 #ifdef LYNX_CORE
 
-char *  lynx_core_file_failing_command ();
-int     lynx_core_file_failing_signal ();
-boolean lynx_core_file_matches_executable_p ();
+char * lynx_core_file_failing_command ();
+int lynx_core_file_failing_signal ();
+bfd_boolean lynx_core_file_matches_executable_p ();
 const bfd_target * lynx_core_file_p ();
 
 #define	MY_core_file_failing_command lynx_core_file_failing_command