gdbserver: include linux-arm-tdesc.h in linux-arm-tdesc.c

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

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

-   Copyright (C) 1990-2014 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.


@@ -23,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,


@@ -30,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[] =
   {


@@ -259,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));