From 6767a3abb71ee590a99bddacda32872b6fd6e5a0 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 23 Jul 1998 23:50:13 +0000 Subject: [PATCH] remove d30v sanitization --- bfd/.Sanitize | 38 ++------------------------------------ bfd/ChangeLog | 2 -- bfd/bfd-in2.h | 6 ------ bfd/config.bfd | 11 +++++++++-- bfd/libbfd.h | 6 ++---- bfd/po/POTFILES.in | 3 +++ bfd/reloc.c | 16 ++++++++++------ 7 files changed, 26 insertions(+), 56 deletions(-) diff --git a/bfd/.Sanitize b/bfd/.Sanitize index ca24fbe..c79b784 100644 --- a/bfd/.Sanitize +++ b/bfd/.Sanitize @@ -15,14 +15,6 @@ Do-first: -d30v_files="cpu-d30v.c elf32-d30v.c" - -if ( echo $* | grep keep\-d30v > /dev/null ) ; then - keep_these_too="${d30v_files} ${keep_these_too}" -else - lose_these_too="${d30v_files} ${lose_these_too}" -fi - tic80_files="cpu-tic80.c coff-tic80.c" if ( echo $* | grep keep\-tic80 > /dev/null ) ; then @@ -120,6 +112,7 @@ cpu-alpha.c cpu-arc.c cpu-arm.c cpu-d10v.c +cpu-d30v.c cpu-h8300.c cpu-h8500.c cpu-hppa.c @@ -156,6 +149,7 @@ elf-m10300.c elf.c elf32-arc.c elf32-d10v.c +elf32-d30v.c elf32-gen.c elf32-hppa.c elf32-hppa.h @@ -328,34 +322,6 @@ else done fi -d30v_files="ChangeLog ChangeLog-9697 Makefile.in Makefile.am archures.c reloc.c targets.c config.bfd configure.in configure bfd-in2.h elf.c libbfd.h" -if ( echo $* | grep keep\-d30v > /dev/null ) ; then - for i in $d30v_files ; do - if test ! -d $i && (grep sanitize-d30v $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Keeping d30v stuff in $i - fi - fi - done -else - for i in $d30v_files ; do - if test ! -d $i && (grep sanitize-d30v $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Removing traces of \"d30v\" from $i... - fi - cp $i new - sed '/start\-sanitize\-d30v/,/end-\sanitize\-d30v/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 - v850_files="ChangeLog ChangeLog-9697 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\-v850e > /dev/null ) ; then for i in $v850_files ; do diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 030ce2e..09d51f5 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1046,10 +1046,8 @@ Fri Mar 27 16:06:02 1998 Ian Lance Taylor * elf-bfd.h (elf_linker_section_t): Make alignment unsigned. (struct elf_obj_tdata): Make cverdefs and cverrefs unsigned. * elf.c (assign_file_positions_for_segments): Always set adjust. -start-sanitize-d30v * elf32-d30v.c (bfd_elf_d30v_reloc): Initialize tmp_addr. Fully parenthesize expression. -end-sanitize-d30v * elf32-m32r.c (m32r_elf_relocate_section): Always initialize h. (m32r_elf_object_p): Return a value. (m32r_elf_print_private_bfd_data): Change fprintf format string. diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 14b2831..01a4108 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -1283,9 +1283,7 @@ enum bfd_architecture bfd_arch_rs6000, /* IBM RS/6000 */ bfd_arch_hppa, /* HP PA RISC */ bfd_arch_d10v, /* Mitsubishi D10V */ - /* start-sanitize-d30v */ bfd_arch_d30v, /* Mitsubishi D30V */ - /* end-sanitize-d30v */ bfd_arch_z8k, /* Zilog Z8000 */ #define bfd_mach_z8001 1 #define bfd_mach_z8002 2 @@ -1993,8 +1991,6 @@ assumed to be 0. */ assumed to be 0. */ BFD_RELOC_D10V_18_PCREL, -/* start-sanitize-d30v */ - /* Mitsubishi D30V relocs. This is a 6-bit absolute reloc. */ BFD_RELOC_D30V_6, @@ -2042,8 +2038,6 @@ of the container. */ /* This is a 32-bit pc-relative reloc. */ BFD_RELOC_D30V_32_PCREL, -/* end-sanitize-d30v */ - /* Mitsubishi M32R relocs. This is a 24 bit absolute address. */ diff --git a/bfd/config.bfd b/bfd/config.bfd index 3155cdf..572af79 100755 --- a/bfd/config.bfd +++ b/bfd/config.bfd @@ -141,11 +141,9 @@ case "${targ}" in targ_defvec=bfd_elf32_d10v_vec ;; -# start-sanitize-d30v d30v-*-*) targ_defvec=bfd_elf32_d30v_vec ;; -# end-sanitize-d30v # start-sanitize-sky dvp-*-*) @@ -253,6 +251,15 @@ case "${targ}" in targ_defvec=bfd_elf32_i386_vec targ_selvecs="i386msdos_vec i386aout_vec" ;; +# start-sanitize-beos + i[3456]86-*-beospe*) + targ_defvec=i386pe_vec + targ_selvecs="i386pe_vec i386pei_vec" + ;; + i[3456]86-*-beoself* | i[3456]86-*-beos*) + targ_defvec=bfd_elf32_i386_vec + ;; +# end-sanitize-beos i[3456]86-*-mingw32* | i[3456]86-*-cygwin32* | i[3456]86-*-winnt | i[3456]86-*-pe) targ_defvec=i386pe_vec targ_selvecs="i386pe_vec i386pei_vec" diff --git a/bfd/libbfd.h b/bfd/libbfd.h index 277f4c4..d7ea8ff 100644 --- a/bfd/libbfd.h +++ b/bfd/libbfd.h @@ -680,6 +680,8 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", /* start-sanitize-sky */ "BFD_RELOC_MIPS_DVP_11_PCREL", "BFD_RELOC_MIPS_DVP_27_S4", + "BFD_RELOC_MIPS_DVP_11_S4", + "BFD_RELOC_MIPS_DVP_U15_S3", /* end-sanitize-sky */ "BFD_RELOC_386_GOT32", @@ -777,8 +779,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", "BFD_RELOC_D10V_10_PCREL_L", "BFD_RELOC_D10V_18", "BFD_RELOC_D10V_18_PCREL", - -/* start-sanitize-d30v */ "BFD_RELOC_D30V_6", "BFD_RELOC_D30V_9_PCREL", "BFD_RELOC_D30V_9_PCREL_R", @@ -790,8 +790,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", "BFD_RELOC_D30V_21_PCREL_R", "BFD_RELOC_D30V_32", "BFD_RELOC_D30V_32_PCREL", -/* end-sanitize-d30v */ - "BFD_RELOC_M32R_24", "BFD_RELOC_M32R_10_PCREL", "BFD_RELOC_M32R_18_PCREL", diff --git a/bfd/po/POTFILES.in b/bfd/po/POTFILES.in index a582f28..e975c3a 100644 --- a/bfd/po/POTFILES.in +++ b/bfd/po/POTFILES.in @@ -54,6 +54,8 @@ cpu-a29k.c cpu-alpha.c cpu-arc.c cpu-arm.c +cpu-d10v.c +cpu-d30v.c cpu-h8300.c cpu-h8500.c cpu-hppa.c @@ -88,6 +90,7 @@ elf-m10300.c elf.c elf32-arc.c elf32-d10v.c +elf32-d30v.c elf32-gen.c elf32-hppa.c elf32-hppa.h diff --git a/bfd/reloc.c b/bfd/reloc.c index 39a3214..78a9241 100644 --- a/bfd/reloc.c +++ b/bfd/reloc.c @@ -2036,6 +2036,16 @@ ENUM BFD_RELOC_MIPS_DVP_27_S4 ENUMDOC This is a 27 bit address left shifted by 4. +ENUM + BFD_RELOC_MIPS_DVP_11_S4 +ENUMDOC + This is the 11 bit offset operand of ilw/stw instructions + left shifted by 4. +ENUM + BFD_RELOC_MIPS_DVP_U15_S3 +ENUMDOC + This is the 15 bit unsigned immediate operand of the iaddiu instruction + left shifted by 3. COMMENT {* end-sanitize-sky *} @@ -2259,7 +2269,6 @@ ENUMDOC stored in the instruction. The high 24 bits are installed in bits 23 through 0. -COMMENT ENUM BFD_RELOC_D10V_10_PCREL_R ENUMDOC @@ -2284,10 +2293,7 @@ ENUM ENUMDOC This is an 18-bit reloc with the right 2 bits assumed to be 0. -COMMENT -COMMENT -{* start-sanitize-d30v *} ENUM BFD_RELOC_D30V_6 ENUMDOC @@ -2347,8 +2353,6 @@ ENUM BFD_RELOC_D30V_32_PCREL ENUMDOC This is a 32-bit pc-relative reloc. -COMMENT -{* end-sanitize-d30v *} ENUM BFD_RELOC_M32R_24 -- 2.7.4