remove armelf sanitization.

diff --git a/ld/.Sanitize b/ld/.Sanitize
index ac7281867f914fa2ff7e7d7a9d16e445057703e5..5798f8bad4c83ed0940b02994e3bb1b10df373bb 100644 (file)
--- a/ld/.Sanitize
+++ b/ld/.Sanitize
@@ -310,34 +310,6 @@ else
        done
 fi
 
-armelf_files="ChangeLog configure.tgt Makefile.am Makefile.in"
-if ( echo $* | grep keep\-armelf > /dev/null ) ; then
-       for i in $armelf_files ; do
-               if test ! -d $i && (grep sanitize-armelf $i > /dev/null) ; then
-                       if [ -n "${verbose}" ] ; then
-                               echo Keeping armelf stuff in $i
-                       fi
-               fi
-       done
-else
-       for i in $armelf_files ; do
-               if test ! -d $i && (grep sanitize-armelf $i > /dev/null) ; then
-                       if [ -n "${verbose}" ] ; then
-                               echo Removing traces of \"armelf\" from $i...
-                       fi
-                       cp $i new
-                       sed '/start\-sanitize\-armelf/,/end-\sanitize\-armelf/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
-
 for i in * ; do
   if test ! -d $i && (grep sanitize $i > /dev/null) ; then
     echo '***' Some mentions of Sanitize are still left in ld/$i! 1>&2

diff --git a/ld/ChangeLog b/ld/ChangeLog
index ee627bc2c1adb38de7aa2f9c7e2d6ba09f3bc351..f782ec496bf2d04a581b675c60fef40dea440038 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,4 +1,3 @@
-start-sanitize-armelf
 Tue Aug 18 12:05:34 1998  Catherine Moore  <clm@cygnus.com>
 
         * emultempl/armelf.em (gld_armelf_before_allocation):
@@ -7,7 +6,6 @@ Tue Aug 18 12:05:34 1998  Catherine Moore  <clm@cygnus.com>
         (gld_armelf_after_open): Add bfd_ prefix to 
         elf32_arm_get_bfd_for_interworking.
 
-end-sanitize-armelf
 Fri Aug 14 15:34:29 1998  Ian Lance Taylor  <ian@cygnus.com>
 
        * Makefile.am: Rebuild dependencies.
@@ -26,7 +24,6 @@ Fri Aug 14 15:34:29 1998  Ian Lance Taylor  <ian@cygnus.com>
        * ld.texinfo (Output Section Keywords): Document SORT
        (CONSTRUCTORS).
 
-start-sanitize-armelf
 Thu Aug 13 12:20:39 1998  Catherine Moore  <clm@cygnus.com>
  
        * emulparams/armelf.sh:  Define TEMPLATE_NAME to armelf.
@@ -34,7 +31,6 @@ Thu Aug 13 12:20:39 1998  Catherine Moore  <clm@cygnus.com>
        sections.
        * emultempl/armelf.em: New file.
  
-end-sanitize-armelf
 Thu Aug 13 12:52:45 1998  H.J. Lu  <hjl@gnu.org>
 
        * Makefile.am (ld.dvi): Use " instead of ' for MAKEINFO.
@@ -47,33 +43,26 @@ Wed Aug 12 16:30:29 1998  Doug Evans  <devans@canuck.cygnus.com>
        for .DVP.overlay.* for elf32elmip too.
 
 end-sanitize-sky
-start-sanitize-armelf
 Tue Aug 11 16:17:01 1998  Catherine Moore  <clm@cygnus.com>
 
         * scripttempl/elfarm.sc:  Change text start address
         back to zero.
 
-end-sanitize-armelf
 Tue Aug 11 10:01:12 1998  Jeffrey A Law  (law@cygnus.com)
 
        * emulparms/mn10200.sh (MAX_PAGESIZE): Define to 1.
        * emulparms/mn10300.sh (MAX_PAGESIZE): Define to 1.
 
-start-sanitize-armelf
 Sun Aug  9 20:31:27 1998  Catherine Moore  <clm@cygnus.com>
 
         * scripttempl/elfarm.sc:  Set text start address to
         0x8000.  Add __bss_end definition.
 
-end-sanitize-armelf
-start-sanitize-armelf
 Sat Aug  1 11:47:37 1998  Catherine Moore  <clm@cygnus.com>
 
         * scripttempl/elfarm.sc:  New file.
         * emulparams/armelf.sh: Set SCRIPT_NAME to elfarm.
 
-end-sanitize-armelf
-start-sanitize-armelf
 Fri Jul 31 15:56:16 1998  Catherine Moore  <clm@cygnus.com>
 
         * emulparams/armelf.sh: New file.
@@ -81,7 +70,6 @@ Fri Jul 31 15:56:16 1998  Catherine Moore  <clm@cygnus.com>
         * Makefile.am (earmelf.o): New.
         * Makefile.in: Rebuild.
 
-end-sanitize-armelf
 Fri Jul 24 12:00:57 1998  Ian Lance Taylor  <ian@cygnus.com>
 
        * Makefile.am (install-exec-local): Don't remove the file before

diff --git a/ld/Makefile.am b/ld/Makefile.am
index 403bfd13c073f7bc5edc43e970591642c810cbd0..a16119d1d62e320721da89b681fa754e2a196b30 100644 (file)
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -100,15 +100,10 @@ ALL_EMULATIONS = \
        eaixrs6.o \
        ealpha.o \
        earcelf.o \
-       $(start-sanitize-armelf) \
        earmelf.o \
-       $(end-sanitize-armelf) \
        earmaoutb.o \
        earmaoutl.o \
        earmcoff.o \
-       $(start-sanitize-armelf) \
-       earmelf.o \
-       $(end-sanitize-armelf) \
        earmpe.o \
        ecoff_sparc.o \
        ed10velf.o \
@@ -277,11 +272,9 @@ ealpha.c: $(srcdir)/emulparams/alpha.sh \
 earcelf.c: $(srcdir)/emulparams/arcelf.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
        ${GENSCRIPTS} arcelf "$(tdir_arcelf)"
-# start-sanitize-armelf
 earmelf.c: $(srcdir)/emulparams/armelf.sh \
   $(srcdir)/emultempl/armelf.em $(srcdir)/scripttempl/elfarm.sc ${GEN_DEPENDS}
        ${GENSCRIPTS} armelf "$(tdir_armelf)"
-# end-sanitize-armelf
 earmaoutb.c:   $(srcdir)/emulparams/armaoutb.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/armaout.sc ${GEN_DEPENDS}
        ${GENSCRIPTS} armaoutb "$(tdir_armaoutb)"

diff --git a/ld/Makefile.in b/ld/Makefile.in
index ae8700740c229e42158d3db627fdf82d4ddc7425..81db062b83c91b9b5823d6681537f83994dd445a 100644 (file)
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -171,15 +171,10 @@ ALL_EMULATIONS = \
        eaixrs6.o \
        ealpha.o \
        earcelf.o \
-       $(start-sanitize-armelf) \
        earmelf.o \
-       $(end-sanitize-armelf) \
        earmaoutb.o \
        earmaoutl.o \
        earmcoff.o \
-       $(start-sanitize-armelf) \
-       earmelf.o \
-       $(end-sanitize-armelf) \
        earmpe.o \
        ecoff_sparc.o \
        ed10velf.o \
@@ -894,11 +889,9 @@ ealpha.c: $(srcdir)/emulparams/alpha.sh \
 earcelf.c: $(srcdir)/emulparams/arcelf.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
        ${GENSCRIPTS} arcelf "$(tdir_arcelf)"
-# start-sanitize-armelf
 earmelf.c: $(srcdir)/emulparams/armelf.sh \
   $(srcdir)/emultempl/armelf.em $(srcdir)/scripttempl/elfarm.sc ${GEN_DEPENDS}
        ${GENSCRIPTS} armelf "$(tdir_armelf)"
-# end-sanitize-armelf
 earmaoutb.c:   $(srcdir)/emulparams/armaoutb.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/armaout.sc ${GEN_DEPENDS}
        ${GENSCRIPTS} armaoutb "$(tdir_armaoutb)"