* elf64-ppc.c (toc_adjusting_stub_needed): Exit early if section

[deliverable/binutils-gdb.git] / bfd / cpu-z8k.c

diff --git a/bfd/cpu-z8k.c b/bfd/cpu-z8k.c
index 5cce8eb0689bdad1eeba50da748cceeecc5713ff..3ccedf6ea93d75eca8b150cb658a250a6022ed08 100644 (file)
--- a/bfd/cpu-z8k.c
+++ b/bfd/cpu-z8k.c
@@ -1,5 +1,6 @@
 /* BFD library support routines for the Z800n architecture.
-   Copyright (C) 1992 Free Software Foundation, Inc.
+   Copyright 1992, 1993, 1994, 2000, 2001, 2002, 2003
+   Free Software Foundation, Inc.
    Hacked by Steve Chamberlain of Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -22,6 +23,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "sysdep.h"
 #include "libbfd.h"
 
+static const bfd_arch_info_type *compatible
+  PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));
 
 #if 0                          /* not used currently */
 /*
@@ -33,7 +36,7 @@ howto16_callback (abfd, reloc_entry, symbol_in, data,
                  ignore_input_section, ignore_bfd)
      bfd *abfd;
      arelent *reloc_entry;
-     struct symbol_cache_entry *symbol_in;
+     struct bfd_symbol *symbol_in;
      PTR data;
      asection *ignore_input_section;
      bfd *ignore_bfd;
@@ -50,13 +53,12 @@ howto16_callback (abfd, reloc_entry, symbol_in, data,
   return bfd_reloc_ok;
 }
 
-
 static bfd_reloc_status_type
 howto8_callback (abfd, reloc_entry, symbol_in, data,
                 ignore_input_section, ignore_bfd)
      bfd *abfd;
      arelent *reloc_entry;
-     struct symbol_cache_entry *symbol_in;
+     struct bfd_symbol *symbol_in;
      PTR data;
      asection *ignore_input_section;
      bfd *ignore_bfd;
@@ -73,13 +75,12 @@ howto8_callback (abfd, reloc_entry, symbol_in, data,
   return bfd_reloc_ok;
 }
 
-
 static bfd_reloc_status_type
 howto8_FFnn_callback (abfd, reloc_entry, symbol_in, data,
                      ignore_input_section, ignore_bfd)
      bfd *abfd;
      arelent *reloc_entry;
-     struct symbol_cache_entry *symbol_in;
+     struct bfd_symbol *symbol_in;
      PTR data;
      asection *ignore_input_section;
      bfd *ignore_bfd;
@@ -102,7 +103,7 @@ howto8_pcrel_callback (abfd, reloc_entry, symbol_in, data,
                       ignore_input_section, ignore_bfd)
      bfd *abfd;
      arelent *reloc_entry;
-     struct symbol_cache_entry *symbol_in;
+     struct bfd_symbol *symbol_in;
      PTR data;
      asection *ignore_input_section;
      bfd *ignore_bfd;
@@ -119,19 +120,16 @@ howto8_pcrel_callback (abfd, reloc_entry, symbol_in, data,
   return bfd_reloc_ok;
 }
 
-
-
 static reloc_howto_type howto_16
-= NEWHOWTO (howto16_callback, "abs16", 1, false, false);
+= NEWHOWTO (howto16_callback, "abs16", 1, FALSE, FALSE);
 static reloc_howto_type howto_8
-= NEWHOWTO (howto8_callback, "abs8", 0, false, false);
+= NEWHOWTO (howto8_callback, "abs8", 0, FALSE, FALSE);
 
 static reloc_howto_type howto_8_FFnn
-= NEWHOWTO (howto8_FFnn_callback, "ff00+abs8", 0, false, false);
+= NEWHOWTO (howto8_FFnn_callback, "ff00+abs8", 0, FALSE, FALSE);
 
 static reloc_howto_type howto_8_pcrel
-= NEWHOWTO (howto8_pcrel_callback, "pcrel8", 0, false, true);
-
+= NEWHOWTO (howto8_pcrel_callback, "pcrel8", 0, FALSE, TRUE);
 
 static reloc_howto_type *
 local_bfd_reloc_type_lookup (arch, code)
@@ -154,25 +152,6 @@ local_bfd_reloc_type_lookup (arch, code)
 }
 #endif
 
-int bfd_default_scan_num_mach ();
-
-static boolean
-scan_mach (info, string)
-     const struct bfd_arch_info *info;
-     const char *string;
-{
-  if (strcmp (string, "z8001") == 0 || strcmp (string, "z8k") == 0)
-    {
-      return bfd_mach_z8001 == info->mach;
-    }
-  if (strcmp (string, "z8002") == 0)
-    {
-      return bfd_mach_z8002 == info->mach;
-    }
-  return false;
-}
-
-
 /* This routine is provided two arch_infos and returns whether
    they'd be compatible */
 
@@ -186,13 +165,14 @@ compatible (a, b)
   return a;
 }
 
-
 static const bfd_arch_info_type arch_info_struct[] =
 {
-  {32, 32, 8, bfd_arch_z8k, bfd_mach_z8001, "z8k", "z8001", 1, false, compatible, scan_mach, 0,},
+  { 32, 16, 8, bfd_arch_z8k, bfd_mach_z8002, "z8k", "z8002", 1, FALSE,
+    compatible, bfd_default_scan, 0 }
 };
 
 const bfd_arch_info_type bfd_z8k_arch =
 {
-  32, 16, 8, bfd_arch_z8k, bfd_mach_z8002, "z8k", "z8002", 1, true, compatible, scan_mach, &arch_info_struct[0],
+  32, 32, 8, bfd_arch_z8k, bfd_mach_z8001, "z8k", "z8001", 1, TRUE,
+  compatible, bfd_default_scan, &arch_info_struct[0]
 };