From 37bdd624bd222c32e23be1997bbd29e5e0d8c6a1 Mon Sep 17 00:00:00 2001 From: David Edelsohn Date: Fri, 21 Mar 1997 20:59:30 +0000 Subject: [PATCH] Remove m32r sanitization. --- bfd/.Sanitize | 38 ++------------------------------------ bfd/Makefile.in | 6 ------ bfd/config.bfd | 2 -- bfd/libbfd.h | 12 ++++-------- bfd/targets.c | 4 ---- 5 files changed, 6 insertions(+), 56 deletions(-) diff --git a/bfd/.Sanitize b/bfd/.Sanitize index 22b0825c41f..c5796db2b29 100644 --- a/bfd/.Sanitize +++ b/bfd/.Sanitize @@ -31,14 +31,6 @@ else lose_these_too="${d30v_files} ${lose_these_too}" fi -m32r_files="cpu-m32r.c elf32-m32r.c" - -if ( echo $* | grep keep\-m32r > /dev/null ) ; then - keep_these_too="${m32r_files} ${keep_these_too}" -else - lose_these_too="${m32r_files} ${lose_these_too}" -fi - v850_files="cpu-v850.c elf32-v850.c" if ( echo $* | grep keep\-v850 > /dev/null ) ; then @@ -144,6 +136,7 @@ cpu-hppa.c cpu-i386.c cpu-i860.c cpu-i960.c +cpu-m32r.c cpu-m68k.c cpu-m88k.c cpu-mips.c @@ -172,6 +165,7 @@ elf32-hppa.c elf32-hppa.h elf32-i386.c elf32-i860.c +elf32-m32r.c elf32-m68k.c elf32-m88k.c elf32-mips.c @@ -358,34 +352,6 @@ else done fi -m32r_files="ChangeLog Makefile.in config.bfd configure.in configure elf.c archures.c reloc.c targets.c bfd-in2.h libbfd.h" -if ( echo $* | grep keep\-m32r > /dev/null ) ; then - for i in $m32r_files ; do - if test ! -d $i && (grep sanitize-m32r $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Keeping m32r stuff in $i - fi - fi - done -else - for i in $m32r_files ; do - if test ! -d $i && (grep sanitize-m32r $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Removing traces of \"m32r\" from $i... - fi - cp $i new - sed '/start\-sanitize\-m32r/,/end-\sanitize\-m32r/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.2 Makefile.in archures.c reloc.c targets.c config.bfd configure.in configure bfd-in2.h elf.c libbfd.h" if ( echo $* | grep keep\-v850 > /dev/null ) ; then for i in $v850_files ; do diff --git a/bfd/Makefile.in b/bfd/Makefile.in index c5ada4f292a..ba27f251593 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -126,9 +126,7 @@ ALL_MACHINES = \ cpu-i386.o \ cpu-i860.o \ cpu-i960.o \ - $(start-sanitize-m32r) \ cpu-m32r.o \ - $(end-sanitize-m32r) \ cpu-m68k.o \ cpu-m88k.o \ cpu-mips.o \ @@ -227,9 +225,7 @@ BFD32_BACKENDS = \ elf32-hppa.o \ elf32-i386.o \ elf32-i860.o \ - $(start-sanitize-m32r) \ elf32-m32r.o \ - $(end-sanitize-m32r) \ elf32-m68k.o \ elf32-m88k.o \ elf32-mips.o \ @@ -863,11 +859,9 @@ elf32-d30v.o: elf32-d30v.c elf-bfd.h $(INCDIR)/elf/common.h \ elf32-target.h end-sanitize-d30v: -start-sanitize-m32r: elf32-m32r.o: elf32-m32r.c elf-bfd.h $(INCDIR)/elf/common.h \ $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ elf32-target.h -end-sanitize-m32r: start-sanitize-v850: cpu-v850.o: cpu-v850.c diff --git a/bfd/config.bfd b/bfd/config.bfd index 5d1bb9e185f..0638eb70a85 100755 --- a/bfd/config.bfd +++ b/bfd/config.bfd @@ -247,11 +247,9 @@ case "${targ}" in targ_underscore=yes ;; -# start-sanitize-m32r m32r-*-*) targ_defvec=bfd_elf32_m32r_vec ;; -# end-sanitize-m32r m68*-apollo-*) targ_defvec=apollocoff_vec diff --git a/bfd/libbfd.h b/bfd/libbfd.h index d20b8da1eb6..bd72ffc41f1 100644 --- a/bfd/libbfd.h +++ b/bfd/libbfd.h @@ -87,12 +87,11 @@ extern PTR bfd_zmalloc PARAMS ((size_t)); extern bfd_error_handler_type _bfd_error_handler; -/* These routines allocate and free things on the BFD's obstack. */ +/* These routines allocate and free things on the BFD's objalloc. */ -PTR bfd_alloc PARAMS ((bfd *abfd, size_t size)); -PTR bfd_zalloc PARAMS ((bfd *abfd, size_t size)); - -#define bfd_release(x,y) (void) obstack_free(&(x->memory),y) +extern PTR bfd_alloc PARAMS ((bfd *, size_t)); +extern PTR bfd_zalloc PARAMS ((bfd *, size_t)); +extern void bfd_release PARAMS ((bfd *, PTR)); bfd * _bfd_create_empty_archive_element_shell PARAMS ((bfd *obfd)); bfd * _bfd_look_for_bfd_in_cache PARAMS ((bfd *arch_bfd, file_ptr index)); @@ -755,7 +754,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", "BFD_RELOC_D30V_32_PCREL", /* end-sanitize-d30v */ -/* start-sanitize-m32r */ "BFD_RELOC_M32R_24", "BFD_RELOC_M32R_10_PCREL", "BFD_RELOC_M32R_18_PCREL", @@ -764,8 +762,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", "BFD_RELOC_M32R_HI16_SLO", "BFD_RELOC_M32R_LO16", "BFD_RELOC_M32R_SDA16", -/* end-sanitize-m32r */ - /* start-sanitize-v850 */ "BFD_RELOC_V850_9_PCREL", "BFD_RELOC_V850_22_PCREL", diff --git a/bfd/targets.c b/bfd/targets.c index a43f9e215a0..b8d4dd2f437 100644 --- a/bfd/targets.c +++ b/bfd/targets.c @@ -500,9 +500,7 @@ extern const bfd_target bfd_elf32_i860_vec; extern const bfd_target bfd_elf32_little_generic_vec; extern const bfd_target bfd_elf32_littlemips_vec; extern const bfd_target bfd_elf64_littlemips_vec; -/* start-sanitize-m32r */ extern const bfd_target bfd_elf32_m32r_vec; -/* end-sanitize-m32r */ extern const bfd_target bfd_elf32_m68k_vec; extern const bfd_target bfd_elf32_m88k_vec; extern const bfd_target bfd_elf32_mn10200_vec; @@ -670,9 +668,7 @@ const bfd_target * const bfd_target_vector[] = { #ifdef BFD64 &bfd_elf64_littlemips_vec, #endif -/* start-sanitize-m32r */ &bfd_elf32_m32r_vec, -/* end-sanitize-m32r */ &bfd_elf32_mn10200_vec, &bfd_elf32_mn10300_vec, &bfd_elf32_m68k_vec, -- 2.30.2