From 4773254c4508da9ff033f89148a0a84b11d7feec Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Mon, 31 Jan 2005 23:13:34 +0000 Subject: * aout-arm.c, aout-target.h, aoutx.h, archive.c, armnetbsd.c, bfd-in.h, bfdio.c, coff-alpha.c, coff-arm.c, coff-h8300.c, coff-i860.c, coff-mcore.c, coff-or32.c, coff-ppc.c, coff-sh.c, coff-sparc.c, coffcode.h, coffgen.c, cofflink.c, cpu-cris.c, cpu-h8500.c, cpu-ns32k.c, ecoff.c, ecofflink.c, elf.c, elf32-dlx.c, elf32-fr30.c, elf32-frv.c, elf32-hppa.c, elf32-i860.c, elf32-ip2k.c, elf32-m32r.c, elf32-sh.c, elf32-v850.c, elf64-mips.c, elf64-sparc.c, elflink.c, i386aout.c, i386msdos.c, i386os9k.c, ieee.c, mach-o.c, nlm32-sparc.c, oasys.c, opncls.c, pdp11.c, pe-mips.c, peXXigen.c, pef.c, peicode.h, reloc.c, riscix.c, section.c, simple.c, som.c, sparclynx.c, targets.c, vms-misc.c, vms-tir.c, xsym.c, doc/chew.c, hosts/delta68.h, hosts/vaxbsd.h: Remove #if 0'd code throughout. Similarly, collapse #if 1'd code. --- bfd/cpu-cris.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'bfd/cpu-cris.c') diff --git a/bfd/cpu-cris.c b/bfd/cpu-cris.c index d15a2756aa..67bc861202 100644 --- a/bfd/cpu-cris.c +++ b/bfd/cpu-cris.c @@ -45,7 +45,6 @@ get_compatible (a,b) if (b->mach == bfd_mach_cris_v10_v32) return a; -#if 0 /* 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 @@ -57,9 +56,12 @@ get_compatible (a,b) pretending matching machs here. */ /* Except for the compatible mach, machs must match. */ - if (a->mach != b->mach) - return NULL; -#endif + + /* + This code is disabled but kept as a warning: + if (a->mach != b->mach) + return NULL; + */ return a; } -- cgit v1.2.1