OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed v850eq sanitization.

Browse Source 
Changed mismatch architecture message to a warning.
This commit is contained in:
Nick Clifton 1997-09-20 23:59:31 +00:00
parent f13f11b494
commit 15d82b260c
3 changed files with 14 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
bfd/.Sanitize
View File

@ -31,12 +31,6 @@ else
lose_these_too="${tic80_files} ${lose_these_too}"
fi
if ( echo $* | grep keep\-v850 > /dev/null ) ; then
keep_these_too="cpu-v850.c elf32-v850.c ${keep_these_too}"
else
lose_these_too="cpu-v850.c elf32-v850.c ${lose_these_too}"
fi
# All files listed between the "Things-to-keep:" line and the
# "Files-to-sed:" line will be kept. All other files will be removed.
# Directories listed in this section will have their own Sanitize
@ -140,6 +134,7 @@ cpu-powerpc.c
cpu-rs6000.c
cpu-sh.c
cpu-sparc.c
cpu-v850.c
cpu-vax.c
cpu-we32k.c
cpu-w65.c
@ -168,6 +163,7 @@ elf-m10300.c
elf32-ppc.c
elf32-sh.c
elf32-sparc.c
elf32-v850.c
elf32.c
elf64-alpha.c
elf64-gen.c
@ -322,32 +318,6 @@ else
fi
v850_files="ChangeLog Makefile.in Makefile.am archures.c reloc.c targets.c config.bfd configure.in configure bfd-in2.h elf.c libbfd.h elf32-v850.c cpu-v850.c"
if ( echo $* | grep keep\-v850eq > /dev/null ) ; then
for i in $v850_files ; do
if test -r $i && (grep sanitize-v850eq $i > /dev/null) ; then
if [ -n "${verbose}" ] ; then
echo Keeping v850eq stuff in $i
fi
fi
done
else
for i in $v850_files ; do
if test -f $i && (grep sanitize-v850eq $i > /dev/null) ; then
if [ -n "${verbose}" ] ; then
echo Removing traces of \"v850eq\" from $i...
fi
cp $i new
sed '/start\-sanitize\-v850eq/,/end\-sanitize\-v850eq/d' < $i > new
if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
if [ -n "${verbose}" ] ; then
echo Caching $i in .Recover...
fi
mv $i .Recover
fi
mv new $i
fi
done
fi
if ( echo $* | grep keep\-v850e > /dev/null ) ; then
for i in $v850_files ; do
if test -r $i && (grep sanitize-v850e $i > /dev/null) ; then

13
bfd/ChangeLog
View File

@ -114,9 +114,7 @@ start-sanitize-v850e
Tue Sep 2 17:43:49 1997 Nick Clifton <nickc@cygnus.com>
* elf.c (prep_headers): Remove V850E magic number.
start-sanitize-v850eq
* elf.c (prep_headers): Remove V850EQ magic number.
end-sanitize-v850eq
end-sanitize-v850e
Tue Sep 2 17:35:05 1997 Doug Evans <dje@canuck.cygnus.com>
@ -196,9 +194,7 @@ start-sanitize-v850e
number.
* elf.c (prep_headers): Add support for v850e machine number.
end-sanitize-v850e
start-sanitize-v850eq
* archures.c (bfd_mach_v850eq): Machine value for v850eq.
* bfd-in2.h (bfd_mach_v850eq): Machine value for v850eq.
@ -207,8 +203,7 @@ start-sanitize-v850eq
number.
* elf.c (prep_headers): Add support for v850eq machine number.
end-sanitize-v850eq
end-sanitize-v850e
Mon Aug 25 14:07:33 1997 Ian Lance Taylor <ian@cygnus.com>
@ -282,9 +277,7 @@ Mon Aug 18 11:33:56 1997 Nick Clifton <nickc@cygnus.com>
* config.bfd: Add support for v850e target.
* archures.c: Add support for v850e target.
end-sanitize-v850e
start-sanitize-v850eq
Mon Aug 18 11:33:56 1997 Nick Clifton <nickc@cygnus.com>
* cpu-v850eq: New file.
@ -296,7 +289,7 @@ Mon Aug 18 11:33:56 1997 Nick Clifton <nickc@cygnus.com>
* config.bfd: Add support for v850eq target.
* archures.c: Add support for v850eq target.
end-sanitize-v850eq
end-sanitize-v850e
Fri Aug 15 12:01:28 1997 Ian Lance Taylor <ian@cygnus.com>

20
bfd/elf32-v850.c
View File

@ -1606,10 +1606,8 @@ v850_elf_object_p (abfd)
case E_V850_ARCH: (void) bfd_default_set_arch_mach (abfd, bfd_arch_v850, 0); break;
/* start-sanitize-v850e */
case E_V850E_ARCH: (void) bfd_default_set_arch_mach (abfd, bfd_arch_v850, bfd_mach_v850e); break;
/* end-sanitize-v850e */
/* start-sanitize-v850eq */
case E_V850EQ_ARCH: (void) bfd_default_set_arch_mach (abfd, bfd_arch_v850, bfd_mach_v850eq); break;
/* end-sanitize-v850eq */
/* end-sanitize-v850e */
}
}
@ -1626,11 +1624,9 @@ v850_elf_final_write_processing (abfd, linker)
default:
case 0: val = E_V850_ARCH; break;
/* start-sanitize-v850e */
case bfd_mach_v850e: val = E_V850E_ARCH; break;
/* end-sanitize-v850e */
/* start-sanitize-v850eq */
case bfd_mach_v850e: val = E_V850E_ARCH; break;
case bfd_mach_v850eq: val = E_V850EQ_ARCH; break;
/* end-sanitize-v850eq */
/* end-sanitize-v850e */
}
elf_elfheader (abfd)->e_flags &=~ EF_V850_ARCH;
@ -1711,8 +1707,12 @@ v850_elf_merge_private_bfd_data (ibfd, obfd)
{
_bfd_error_handler ("%s: Architecture mismatch with previous modules",
bfd_get_filename (ibfd));
#if 0
bfd_set_error (bfd_error_bad_value);
return false;
#else
return true;
#endif
}
return true;
@ -1735,11 +1735,9 @@ v850_elf_print_private_bfd_data (abfd, ptr)
default:
case E_V850_ARCH: fprintf (file, ": v850 architecture"); break;
/* start-sanitize-v850e */
case E_V850E_ARCH: fprintf (file, ": v850e architecture"); break;
/* end-sanitize-v850e */
/* start-sanitize-v850eq */
case E_V850E_ARCH: fprintf (file, ": v850e architecture"); break;
case E_V850EQ_ARCH: fprintf (file, ": v850eq architecture"); break;
/* end-sanitize-v850eq */
/* end-sanitize-v850e */
}
fputc ('\n', file);