X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fcpu-arc.c;h=906ca1d8743a106d781137a9076ba76168a0ef59;hb=7190276c52b9d86a52aae73d3a0f8b56e7a1f4f1;hp=decbe69b71c04ea62dbd4e10ab4f00dd7f15abc4;hpb=6f2750feaf2827ef8a1a0a5b2f90c1e9a6cabbd1;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/cpu-arc.c b/bfd/cpu-arc.c
index decbe69b71..906ca1d874 100644
--- a/bfd/cpu-arc.c
+++ b/bfd/cpu-arc.c
@@ -1,5 +1,5 @@
 /* BFD support for the ARC processor
-   Copyright (C) 1994-2016 Free Software Foundation, Inc.
+   Copyright (C) 1994-2019 Free Software Foundation, Inc.
    Contributed by Doug Evans (dje@cygnus.com).
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -23,51 +23,79 @@
 #include "bfd.h"
 #include "libbfd.h"
 
+static const bfd_arch_info_type *
+arc_compatible (const bfd_arch_info_type *a, const bfd_arch_info_type *b);
+
 #define ARC(mach, print_name, default_p, next) \
-{					\
-    32,	/* 32 bits in a word  */	\
-    32,	/* 32 bits in an address  */	\
-    8,	/* 8 bits in a byte  */		\
+  {					       \
+    32,	/* Bits in a word.  */		\
+    32,	/* Bits in an address.  */	\
+    8,	/* Bits in a byte.  */		\
     bfd_arch_arc,			\
     mach,				\
     "arc",				\
     print_name,				\
-    4, /* section alignment power  */	\
+    4, /* Section alignment power.  */	\
     default_p,				\
-    bfd_default_compatible,		\
+    arc_compatible,			\
     bfd_default_scan,			\
     bfd_arch_default_fill,		\
     next,				\
+    0 /* Maximum offset of a reloc from the start of an insn.  */ \
   }
 
 static const bfd_arch_info_type arch_info_struct[] =
 {
-  ARC (bfd_mach_arc_arc600, "ARC600", FALSE, &arch_info_struct[1]),
-  ARC (bfd_mach_arc_arc600, "A6"    , FALSE, &arch_info_struct[2]),
-  ARC (bfd_mach_arc_arc601, "ARC601", FALSE, &arch_info_struct[3]),
-  ARC (bfd_mach_arc_arc700, "ARC700", FALSE, &arch_info_struct[4]),
-  ARC (bfd_mach_arc_arc700, "A7",     FALSE, &arch_info_struct[5]),
-  ARC (bfd_mach_arc_arcv2,  "ARCv2",  FALSE, &arch_info_struct[6]),
-  ARC (bfd_mach_arc_arcv2,  "EM",     FALSE, &arch_info_struct[7]),
+  ARC (bfd_mach_arc_arc600, "A6"    , FALSE, &arch_info_struct[1]),
+  ARC (bfd_mach_arc_arc601, "ARC601", FALSE, &arch_info_struct[2]),
+  ARC (bfd_mach_arc_arc700, "ARC700", FALSE, &arch_info_struct[3]),
+  ARC (bfd_mach_arc_arc700, "A7",     FALSE, &arch_info_struct[4]),
+  ARC (bfd_mach_arc_arcv2,  "ARCv2",  FALSE, &arch_info_struct[5]),
+  ARC (bfd_mach_arc_arcv2,  "EM",     FALSE, &arch_info_struct[6]),
   ARC (bfd_mach_arc_arcv2,  "HS",     FALSE, NULL),
 };
 
 const bfd_arch_info_type bfd_arc_arch =
-  ARC (bfd_mach_arc_arcv2,  "HS", TRUE, &arch_info_struct[0]);
-
-/* Utility routines.  */
+  ARC (bfd_mach_arc_arc600, "ARC600", TRUE, &arch_info_struct[0]);
 
-/* Given cpu type NAME, return its bfd_mach_arc_xxx value.
-   Returns -1 if not found.  */
-int arc_get_mach (char *name);
+/* ARC-specific "compatible" function.  The general rule is that if A and B are
+   compatible, then this function should return architecture that is more
+   "feature-rich", that is, can run both A and B.  ARCv2, EM and HS all has
+   same mach number, so bfd_default_compatible assumes they are the same, and
+   returns an A.  That causes issues with GDB, because GDB assumes that if
+   machines are compatible, then "compatible ()" always returns same machine
+   regardless of argument order.  As a result GDB gets confused because, for
+   example, compatible (ARCv2, EM) returns ARCv2, but compatible (EM, ARCv2)
+   returns EM, hence GDB is not sure if they are compatible and prints a
+   warning.  */
 
-int
-arc_get_mach (char *name)
+static const bfd_arch_info_type *
+arc_compatible (const bfd_arch_info_type *a, const bfd_arch_info_type *b)
 {
-  const bfd_arch_info_type *p;
+  const bfd_arch_info_type * const em = &arch_info_struct[5];
+  const bfd_arch_info_type * const hs = &arch_info_struct[6];
+
+  /* Trivial case where a and b is the same instance.  Some callers already
+     check this condition but some do not and get an invalid result.  */
+  if (a == b)
+    return a;
+
+  /* If a & b are for different architecture we can do nothing.  */
+  if (a->arch != b->arch)
+    return NULL;
+
+  if (a->bits_per_word != b->bits_per_word)
+    return NULL;
+
+  /* ARCv2|EM and EM.  */
+  if ((a->mach == bfd_mach_arc_arcv2 && b == em)
+      || (b->mach == bfd_mach_arc_arcv2 && a == em))
+    return em;
+
+  /* ARCv2|HS and HS.  */
+  if ((a->mach == bfd_mach_arc_arcv2 && b == hs)
+      || (b->mach == bfd_mach_arc_arcv2 && a == hs))
+    return hs;
 
-  for (p = &bfd_arc_arch; p != NULL; p = p->next)
-    if (strcmp (name, p->printable_name) == 0)
-      return p->mach;
-  return -1;
+  return bfd_default_compatible (a, b);
 }