From 4857ffb496e319a48ed53db7330e7645a13c42e1 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 4 Aug 1998 15:53:37 +0000 Subject: [PATCH] fix armelf sanitization --- ld/.Sanitize | 28 ++++++++++++++++++++++++++++ ld/emulparams/.Sanitize | 7 +++++++ ld/scripttempl/.Sanitize | 7 +++++++ 3 files changed, 42 insertions(+) diff --git a/ld/.Sanitize b/ld/.Sanitize index a3839718546..20f7df00ece 100644 --- 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 ec8dce22d51..f1ee271b15d 100644 --- 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 119834a4169..98e8d789406 100644 --- 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 -- 2.30.2