Fix SH2A machine variants in order to correctly select instruction inheritance

[deliverable/binutils-gdb.git] / bfd / netbsd.h

diff --git a/bfd/netbsd.h b/bfd/netbsd.h
index a5482f043125a98ba9b6eef56037e71b63b8e803..04a4eabfdfd912c80485c5172df7947f98505e5e 100644 (file)
--- a/bfd/netbsd.h
+++ b/bfd/netbsd.h
@@ -1,5 +1,5 @@
 /* BFD back-end definitions used by all NetBSD targets.
 /* BFD back-end definitions used by all NetBSD targets.

-   Copyright (C) 1990, 91, 92, 94, 95, 96, 97, 1998
+   Copyright 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1998, 2000, 2002

    Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
    Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.


@@ -19,33 +19,33 @@ 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 USA.  */
 

-/* Check for our machine type (part of magic number). */
+/* Check for our machine type (part of magic number).  */

 #ifndef MACHTYPE_OK
 #define MACHTYPE_OK(m) ((m) == DEFAULT_MID || (m) == M_UNKNOWN)
 #endif
 
 #ifndef MACHTYPE_OK
 #define MACHTYPE_OK(m) ((m) == DEFAULT_MID || (m) == M_UNKNOWN)
 #endif
 

-/* This is the normal load address for executables. */
+/* This is the normal load address for executables.  */

 #define TEXT_START_ADDR                TARGET_PAGE_SIZE
 
 /* NetBSD ZMAGIC has its header in the text segment.  */
 #define N_HEADER_IN_TEXT(x)    1
 
 #define TEXT_START_ADDR                TARGET_PAGE_SIZE
 
 /* NetBSD ZMAGIC has its header in the text segment.  */
 #define N_HEADER_IN_TEXT(x)    1
 

-/* Determine if this is a shared library using the flags. */
+/* Determine if this is a shared library using the flags.  */

 #define N_SHARED_LIB(x)        (N_DYNAMIC(x))
 
 /* We have 6 bits of flags and 10 bits of machine ID.  */
 #define N_MACHTYPE(exec) \
 #define N_SHARED_LIB(x)        (N_DYNAMIC(x))
 
 /* We have 6 bits of flags and 10 bits of machine ID.  */
 #define N_MACHTYPE(exec) \

-       ((enum machine_type)(((exec).a_info >> 16) & 0x03ff))
+       ((enum machine_type) (((exec).a_info >> 16) & 0x03ff))

 #define N_FLAGS(exec) \
        (((exec).a_info >> 26) & 0x3f)
 
 #define N_SET_INFO(exec, magic, type, flags) \
        ((exec).a_info = ((magic) & 0xffff) \
 #define N_FLAGS(exec) \
        (((exec).a_info >> 26) & 0x3f)
 
 #define N_SET_INFO(exec, magic, type, flags) \
        ((exec).a_info = ((magic) & 0xffff) \

-        | (((int)(type) & 0x3ff) << 16) \
+        | (((int) (type) & 0x3ff) << 16) \

         | (((flags) & 0x3f) << 24))
 #define N_SET_MACHTYPE(exec, machtype) \
        ((exec).a_info = \
         | (((flags) & 0x3f) << 24))
 #define N_SET_MACHTYPE(exec, machtype) \
        ((exec).a_info = \

-         ((exec).a_info & 0xfb00ffff) | ((((int)(machtype))&0x3ff) << 16))
+         ((exec).a_info & 0xfb00ffff) | ((((int) (machtype))&0x3ff) << 16))

 #define N_SET_FLAGS(exec, flags) \
        ((exec).a_info = \
         ((exec).a_info & 0x03ffffff) | ((flags & 0x03f) << 26))
 #define N_SET_FLAGS(exec, flags) \
        ((exec).a_info = \
         ((exec).a_info & 0x03ffffff) | ((flags & 0x03f) << 26))


@@ -64,7 +64,7 @@ USA.  */
 #define MY_entry_is_text_address 1
 
 #define MY_write_object_contents MY(write_object_contents)
 #define MY_entry_is_text_address 1
 
 #define MY_write_object_contents MY(write_object_contents)

-static boolean MY(write_object_contents) PARAMS ((bfd *abfd));
+static bfd_boolean MY(write_object_contents) PARAMS ((bfd *abfd));

 #define MY_text_includes_header 1
 
 #include "aout-target.h"
 #define MY_text_includes_header 1
 
 #include "aout-target.h"


@@ -73,7 +73,7 @@ static boolean MY(write_object_contents) PARAMS ((bfd *abfd));
    Section contents have already been written.  We write the
    file header, symbols, and relocation.  */
 
    Section contents have already been written.  We write the
    file header, symbols, and relocation.  */
 

-static boolean
+static bfd_boolean

 MY(write_object_contents) (abfd)
      bfd *abfd;
 {
 MY(write_object_contents) (abfd)
      bfd *abfd;
 {


@@ -91,11 +91,7 @@ MY(write_object_contents) (abfd)
       NAME(aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end);
     }
 
       NAME(aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end);
     }
 

-#if CHOOSE_RELOC_SIZE
-  CHOOSE_RELOC_SIZE(abfd);
-#else

   obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
   obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;

-#endif

 
   /* Magic number, maestro, please!  */
   switch (bfd_get_arch(abfd)) {
 
   /* Magic number, maestro, please!  */
   switch (bfd_get_arch(abfd)) {


@@ -118,5 +114,5 @@ MY(write_object_contents) (abfd)
 
   WRITE_HEADERS(abfd, execp);
 
 
   WRITE_HEADERS(abfd, execp);
 

-  return true;
+  return TRUE;

 }
 }