* ldcref.c (cref_fill_array): Call bfd_demangle rather than demangle.

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

diff --git a/bfd/cpu-cris.c b/bfd/cpu-cris.c
index d15a2756aa833dc4d37fbea14c236e687d78e218..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"
@@ -46,7 +46,8 @@ get_compatible (a,b)
     return a;
 
 #if 0
-  /* See ldlang.c:lang_check.  Quite illogically, incompatible arches
+  /* 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