* cpu-cris.c (get_compatible): Rearrange disabled code and comment

[binutils-gdb.git] / bfd / sparclynx.c

diff --git a/bfd/sparclynx.c b/bfd/sparclynx.c
index e59b57cd90855d1cc2ec38259e1c78769d35359b..0f0761f6ba250a7ae2a7943531142d4ee49e22d8 100644 (file)
--- 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 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -18,18 +18,10 @@ 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
-
-#define MY(OP) CAT (sparclynx_aout_,OP)
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (sparclynx_aout_,OP)
 #define TARGETNAME "a.out-sparc-lynx"
 
 #include "bfd.h"
@@ -45,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>
@@ -160,7 +152,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;
 {
@@ -201,30 +193,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;
     }
 }
 
@@ -243,7 +235,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
@@ -252,9 +244,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