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

for clarity.
This commit is contained in:
Hans-Peter Nilsson
2005-02-01 03:27:59 +00:00
parent 77cfaee698
commit 1ffd1c2fd7
2 changed files with 11 additions and 7 deletions

View File

@ -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..

View File

@ -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;
}