* cpu-cris.c (get_compatible): Rearrange disabled code and comment

	for clarity.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index fd043090e0e7d022f003d4cb499473df70401e68..e4ecd4ae289035c9d177088f6fcc000c3408b6a1 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-01  Hans-Peter Nilsson  <hp@axis.com>
+
+       * cpu-cris.c (get_compatible): Rearrange disabled code and comment
+       for clarity.
+
 2005-02-01  Alan Modra  <amodra@bigpond.net.au>
 
        * elf64-ppc.c (ppc64_elf_check_directives): Move undefs list fixup..

diff --git a/bfd/cpu-cris.c b/bfd/cpu-cris.c
index 67bc8612023c74c77e73adde881eb59104239d2f..884b2c947a38ada7bd6be3b08ba6aafddd111a79 100644 (file)
--- a/bfd/cpu-cris.c
+++ b/bfd/cpu-cris.c
@@ -45,7 +45,9 @@ get_compatible (a,b)
   if (b->mach == bfd_mach_cris_v10_v32)
     return a;
 
-  /* See ldlang.c:lang_check.  Quite illogically, incompatible arches
+#if 0
+  /* The code below is disabled but kept as a warning.
+     See ldlang.c:lang_check.  Quite illogically, incompatible arches
      (as signalled by this function) are only *warned* about, while with
      this function signalling compatible ones, we can have the
      cris_elf_merge_private_bfd_data function return an error.  This is
@@ -56,12 +58,9 @@ get_compatible (a,b)
      pretending matching machs here.  */
 
   /* Except for the compatible mach, machs must match.  */
-
-  /*
-    This code is disabled but kept as a warning:
-    if (a->mach != b->mach)
-      return NULL;
-  */
+  if (a->mach != b->mach)
+    return NULL;
+#endif
 
   return a;
 }