fix armelf sanitization

diff --git a/ld/.Sanitize b/ld/.Sanitize
index a3839718546859a5220cee9bd73cb7640bf75468..20f7df00eced7d4f78c11d109cec8683b1413825 100644 (file)
--- a/ld/.Sanitize
+++ b/ld/.Sanitize
@@ -299,6 +299,34 @@ for i in * ; do
        fi
 done
 
+armelf_files="ChangeLog configure.tgt"
+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
+
 # This must come after all other sanitizations.  Re-sanitize the .pot
 # file.
 if [ -n "${verbose}" ]; then

diff --git a/ld/emulparams/.Sanitize b/ld/emulparams/.Sanitize
index ec8dce22d51ae81cc2bcc0d4785eb2ce06adad49..f1ee271b15dac614216a1fff6d2081b44ccf8f6c 100644 (file)
--- a/ld/emulparams/.Sanitize
+++ b/ld/emulparams/.Sanitize
@@ -36,6 +36,13 @@ else
         lose_these_too="${beos_files} ${lose_these_too}"
 fi
 
+armelf_files="armelf.sh"
+if ( echo $* | grep keep\-armelf > /dev/null ) ; then
+       keep_these_too="${armelf_files} ${keep_these_too}"
+else
+       lose_these_too="${armelf_files} ${lose_these_too}"
+fi
+
 # All files listed between the "Things-to-keep:" line and the
 # "Do-last:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize

diff --git a/ld/scripttempl/.Sanitize b/ld/scripttempl/.Sanitize
index 119834a41691165474ee0d0350e9a5d5770ee2da..98e8d789406c190e57d1fd6c12675567d5b0716e 100644 (file)
--- a/ld/scripttempl/.Sanitize
+++ b/ld/scripttempl/.Sanitize
@@ -29,6 +29,13 @@ else
         lose_these_too="${beos_files} ${lose_these_too}"
 fi
 
+armelf_files="elfarm.sc"
+if ( echo $* | grep keep\-armelf > /dev/null ) ; then
+       keep_these_too="${armelf_files} ${keep_these_too}"
+else
+       lose_these_too="${armelf_files} ${lose_these_too}"
+fi
+
 # All files listed between the "Things-to-keep:" line and the
 # "Do-last:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize