Comment typo fixes.

[deliverable/binutils-gdb.git] / bfd / aout-cris.c

diff --git a/bfd/aout-cris.c b/bfd/aout-cris.c
index a531bcbe97ebf25adc3360915384caad51bfe584..7027b173ca0597da560ac0ce17c4f3061b2c9ca9 100644 (file)
--- a/bfd/aout-cris.c
+++ b/bfd/aout-cris.c
@@ -1,5 +1,5 @@
 /* BFD backend for CRIS a.out binaries.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
    Contributed by Axis Communications AB.
    Written by Hans-Peter Nilsson.
 
@@ -37,7 +37,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    after text, but with those, we don't have any choice besides reading
    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.  */
 #define SEGMENT_SIZE 2
@@ -47,7 +47,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    adata(abfd).zmagic_disk_block_size, even though the exec_header is
    *not* included in the text segment.  A simple workaround is to
    #define ZMAGIC_DISK_BLOCK_SIZE, which is used if defined; otherwise
-   TARGET_PAGE_SIZE is used. */
+   TARGET_PAGE_SIZE is used.  */
 #define ZMAGIC_DISK_BLOCK_SIZE N_TXTOFF (0)
 
 /* It seems odd at first to set a page-size this low, but gives greater
@@ -64,10 +64,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* The definition here seems not used; just provided as a convention.  */
 #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"
 
@@ -75,7 +76,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define MY_exec_hdr_flags 1
 
 #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.  */
 struct reloc_ext_external;
@@ -91,7 +92,7 @@ static void MY(swap_ext_reloc_in) PARAMS ((bfd *, struct
                                           bfd_size_type));
 
 #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
    through this construct.  Note that MY_set_arch_mach is only called
@@ -112,14 +113,15 @@ static boolean MY(set_sizes) PARAMS ((bfd *));
 #define MY_get_section_contents aout_32_get_section_contents
 #endif
 
+#define MACHTYPE_OK(mtype) ((mtype) == M_CRIS)
+
 /* Include generic functions (some are overridden above).  */
 #include "aout32.c"
 #include "aout-target.h"
 
-
 /* We need our own version to set header flags.  */
 
-static boolean
+static bfd_boolean
 MY(write_object_contents) (abfd)
      bfd *abfd;
 {
@@ -141,13 +143,12 @@ MY(write_object_contents) (abfd)
 
   WRITE_HEADERS (abfd, execp);
 
-  return true;
+  return TRUE;
 }
 
-
 /* We need our own for these reasons:
-   - Assert that a normal 8, 16 or 32 reloc is output. 
-   - Fix what seems to be a weak-bug (perhaps there for valid reasons).  */ 
+   - Assert that a normal 8, 16 or 32 reloc is output.
+   - Fix what seems to be a weak-bug (perhaps there for valid reasons).  */
 
 static void
 MY(swap_ext_reloc_out) (abfd, g, natptr)
@@ -158,7 +159,7 @@ MY(swap_ext_reloc_out) (abfd, g, natptr)
   int r_index;
   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;
 
@@ -206,7 +207,7 @@ MY(swap_ext_reloc_out) (abfd, g, natptr)
     {
       (*_bfd_error_handler) (_("%s: Invalid relocation type exported: %d"),
                             bfd_get_filename (abfd), r_type);
-    
+
       bfd_set_error (bfd_error_wrong_format);
     }
 
@@ -221,7 +222,6 @@ MY(swap_ext_reloc_out) (abfd, g, natptr)
   PUT_WORD (abfd, r_addend, natptr->r_addend);
 }
 
-
 /* We need our own to assert that a normal 8, 16 or 32 reloc is input.  */
 
 static void
@@ -250,19 +250,19 @@ MY(swap_ext_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
   if (r_type > 2)
     {
       (*_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);
     }
-    
+
   cache_ptr->howto =  howto_table_ext + r_type;
 
   if (r_extern && r_index > symcount)
     {
       (*_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);
 
       /* We continue, so we can catch further errors.  */
@@ -275,12 +275,11 @@ MY(swap_ext_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
   MOVE_ADDRESS (GET_SWORD (abfd, bytes->r_addend));
 }
 
-
 /* We use the same as the default, except that we also set
    "obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE;", to avoid changing
    NAME (aout, set_arch_mach) in aoutx.  */
 
-static boolean
+static bfd_boolean
 MY(set_sizes) (abfd)
      bfd *abfd;
 {
@@ -297,8 +296,8 @@ MY(set_sizes) (abfd)
      target-specific things should not be added there.  */
 
   obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE;
-  
-  return true;
+
+  return TRUE;
 }
 
 /*