Changeset 609 for branches/GNU/src/binutils/bfd/aout-cris.c

Timestamp:

Aug 16, 2003, 6:59:22 PM (22 years ago)

Author:

bird

Message:

binutils v2.14 - offical sources.

File:

• branches/GNU/src/binutils/bfd/aout-cris.c (modified) (14 diffs, 1 prop)

branches/GNU/src/binutils/bfd/aout-cris.c

@@ -1 +1 @@
 /* BFD backend for CRIS a.out binaries.
-   Copyright 2000 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
    Contributed by Axis Communications AB.
    Written by Hans-Peter Nilsson.
@@ -24 +24 @@
 
 #define N_HEADER_IN_TEXT(x) 0
-#define BYTES_IN_WORD 4
 #define N_TXTOFF(x) 32
 #define ENTRY_CAN_BE_ZERO
@@ -38 +37 @@
    symbol info, and luckily there's no pressing need for correctness for
    those vma:s at this time.  */
-#define N_TXTADDR(x) ((x).a_entry & ~0xffff)
+#define N_TXTADDR(x) ((x).a_entry & ~(bfd_vma) 0xffff)
 
 /* If you change this to 4, you can not link to an address N*4+2.  */
@@ -65 +64 @@
 #define DEFAULT_ARCH bfd_arch_cris
 
-/* ??? Spacing might be essential for the parameters in this macro.
-   Do Not Change.  */
-#define MY(OP) CAT (cris_aout_,OP)
-#define NAME(x,y) CAT3(cris_aout,_32_,y)
+/* 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 (cris_aout_,OP)
+#define NAME(x, y) CONCAT3 (cris_aout,_32_,y)
 
 #include "bfd.h"
@@ -76 +76 @@
 
 #define MY_write_object_contents MY(write_object_contents)
-static boolean MY(write_object_contents) PARAMS ((bfd *));
+static bfd_boolean MY(write_object_contents) PARAMS ((bfd *));
 
 /* Forward this, so we can use a pointer to it in PARAMS.  */
@@ -92 +92 @@
 
 #define MY_set_sizes MY(set_sizes)
-static boolean MY(set_sizes) PARAMS ((bfd *));
+static bfd_boolean MY(set_sizes) PARAMS ((bfd *));
 
 /* To set back reloc_size to ext, we make MY(set_sizes) be called
@@ -113 +113 @@
 #endif
 
+#define MACHTYPE_OK(mtype) ((mtype) == M_CRIS)
+
 /* Include generic functions (some are overridden above).  */
 #include "aout32.c"
@@ -119 +121 @@
 /* We need our own version to set header flags.  */
 
-static boolean
+static bfd_boolean
 MY(write_object_contents) (abfd)
      bfd *abfd;
@@ -141 +143 @@
   WRITE_HEADERS (abfd, execp);
 
-  return true;
+  return TRUE;
 }
 
@@ -157 +159 @@
   int r_extern;
   unsigned int r_type;
-  unsigned int r_addend;
+  bfd_vma r_addend;
   asymbol *sym = *(g->sym_ptr_ptr);
   asection *output_section = sym->section->output_section;
@@ -248 +250 @@
     {
       (*_bfd_error_handler) (_("%s: Invalid relocation type imported: %d"),
-                             bfd_get_filename (abfd), r_type);
+                             bfd_archive_filename (abfd), r_type);
 
       bfd_set_error(bfd_error_wrong_format);
@@ -259 +261 @@
       (*_bfd_error_handler)
         (_("%s: Bad relocation record imported: %d"),
-         bfd_get_filename (abfd), r_index);
+         bfd_archive_filename (abfd), r_index);
 
       bfd_set_error (bfd_error_wrong_format);
@@ -277 +279 @@
    NAME (aout, set_arch_mach) in aoutx.  */
 
-static boolean
+static bfd_boolean
 MY(set_sizes) (abfd)
      bfd *abfd;
@@ -295 +297 @@
   obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE;
 
-  return true;
+  return TRUE;
 }