aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Peter Nilsson <hp@axis.com>2005-02-01 03:27:59 +0000
committerHans-Peter Nilsson <hp@axis.com>2005-02-01 03:27:59 +0000
commit1ffd1c2fd7a6e1f4c295c4214ed3305ac02d8a74 (patch)
tree78ce5582ae073c9c3515c7e2aee017927340da4b
parent77cfaee698fa7e54d8d7ff28f433fcfaeaf5acef (diff)
downloadfsf-binutils-gdb-1ffd1c2fd7a6e1f4c295c4214ed3305ac02d8a74.zip
fsf-binutils-gdb-1ffd1c2fd7a6e1f4c295c4214ed3305ac02d8a74.tar.gz
fsf-binutils-gdb-1ffd1c2fd7a6e1f4c295c4214ed3305ac02d8a74.tar.bz2
* cpu-cris.c (get_compatible): Rearrange disabled code and comment
for clarity.
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/cpu-cris.c13
2 files changed, 11 insertions, 7 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index fd04309..e4ecd4a 100644
--- 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 67bc861..884b2c9 100644
--- 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;
}