Automatic date update in version.in

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

diff --git a/bfd/cpu-m68k.c b/bfd/cpu-m68k.c
index 009ff043d94187588a98e42690de43d1d42c035b..7ab11c6b542aa6518d4f9e0cde5977ba472bc6cb 100644 (file)
--- a/bfd/cpu-m68k.c
+++ b/bfd/cpu-m68k.c
@@ -1,6 +1,5 @@
 /* BFD library support routines for architectures.
 /* BFD library support routines for architectures.

-   Copyright 1990, 1991, 1992, 1993, 1994, 1997, 1998, 2000, 2001, 2002,
-   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1990-2020 Free Software Foundation, Inc.

    Hacked by Steve Chamberlain of Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
    Hacked by Steve Chamberlain of Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.


@@ -24,6 +23,7 @@
 #include "bfd.h"
 #include "libbfd.h"
 #include "opcode/m68k.h"
 #include "bfd.h"
 #include "libbfd.h"
 #include "opcode/m68k.h"

+#include "cpu-m68k.h"

 
 static const bfd_arch_info_type *
 bfd_m68k_compatible (const bfd_arch_info_type *a,
 
 static const bfd_arch_info_type *
 bfd_m68k_compatible (const bfd_arch_info_type *a,


@@ -31,7 +31,7 @@ bfd_m68k_compatible (const bfd_arch_info_type *a,
 
 #define N(name, print,d,next)  \
 {  32, 32, 8, bfd_arch_m68k, name, "m68k",print,2,d,bfd_m68k_compatible, \
 
 #define N(name, print,d,next)  \
 {  32, 32, 8, bfd_arch_m68k, name, "m68k",print,2,d,bfd_m68k_compatible, \

-   bfd_default_scan, bfd_arch_default_fill, next, }
+   bfd_default_scan, bfd_arch_default_fill, next, 0 }

 
 static const bfd_arch_info_type arch_info_struct[] =
   {
 
 static const bfd_arch_info_type arch_info_struct[] =
   {


@@ -111,7 +111,7 @@ const bfd_arch_info_type bfd_m68k_arch =
 
 /* Table indexed by bfd_mach_arch number indicating which
    architectural features are supported.  */
 
 /* Table indexed by bfd_mach_arch number indicating which
    architectural features are supported.  */

-static const unsigned m68k_arch_features[] = 
+static const unsigned m68k_arch_features[] =

 {
   0,
   m68000|m68881|m68851,
 {
   0,
   m68000|m68881|m68851,


@@ -186,7 +186,7 @@ int bfd_m68k_features_to_mach (unsigned features)
        ix++)
     {
       unsigned this_extra, this_missing;
        ix++)
     {
       unsigned this_extra, this_missing;

-      
+

       if (m68k_arch_features[ix] == features)
        return ix;
       this_extra = bit_count (m68k_arch_features[ix] & ~features);
       if (m68k_arch_features[ix] == features)
        return ix;
       this_extra = bit_count (m68k_arch_features[ix] & ~features);


@@ -195,7 +195,7 @@ int bfd_m68k_features_to_mach (unsigned features)
          extra = this_extra;
          superset = ix;
        }
          extra = this_extra;
          superset = ix;
        }

-      
+

       this_missing = bit_count (features & ~m68k_arch_features[ix]);
       if (this_missing < missing)
        {
       this_missing = bit_count (features & ~m68k_arch_features[ix]);
       if (this_missing < missing)
        {


@@ -220,7 +220,7 @@ bfd_m68k_compatible (const bfd_arch_info_type *a,
     return b;
   if (!b->mach)
     return a;
     return b;
   if (!b->mach)
     return a;

-  
+

   if (a->mach <= bfd_mach_m68060 && b->mach <= bfd_mach_m68060)
     /* Merge m68k machine. */
     return a->mach > b->mach ? a : b;
   if (a->mach <= bfd_mach_m68060 && b->mach <= bfd_mach_m68060)
     /* Merge m68k machine. */
     return a->mach > b->mach ? a : b;


@@ -260,7 +260,7 @@ bfd_m68k_compatible (const bfd_arch_info_type *a,
          if (!cpu32_fido_mix_warning)
            {
              cpu32_fido_mix_warning = 1;
          if (!cpu32_fido_mix_warning)
            {
              cpu32_fido_mix_warning = 1;

-             (*_bfd_error_handler) ("warning: linking CPU32 objects with fido objects");
+             _bfd_error_handler ("warning: linking CPU32 objects with fido objects");

            }
          return bfd_lookup_arch (a->arch,
                                  bfd_m68k_features_to_mach (fido_a | m68881));
            }
          return bfd_lookup_arch (a->arch,
                                  bfd_m68k_features_to_mach (fido_a | m68881));