* elf-bfd.h (struct elf_backend_data): Add as_needed_cleanup hook.

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

diff --git a/bfd/cpu-cris.c b/bfd/cpu-cris.c
index 67bc8612023c74c77e73adde881eb59104239d2f..e89d74b5055c29b8c4b80c7981270a20cbdb5f6a 100644 (file)
--- a/bfd/cpu-cris.c
+++ b/bfd/cpu-cris.c
@@ -1,5 +1,5 @@
 /* BFD support for the Axis CRIS architecture.
-   Copyright 2000, 2002 Free Software Foundation, Inc.
+   Copyright 2000, 2002, 2004, 2005 Free Software Foundation, Inc.
    Contributed by Axis Communications AB.
    Written by Hans-Peter Nilsson.
 
@@ -17,7 +17,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include "bfd.h"
 #include "sysdep.h"
@@ -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;
 }