aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>1998-08-21 16:02:40 +0000
committerIan Lance Taylor <ian@airs.com>1998-08-21 16:02:40 +0000
commitbb7835f04c1234a27a4c978e82a2362da7c2645a (patch)
tree071e4d156793973667a539b546305bbc55ee6709
parentd8a152bcf2cbcf15d8430d6a7de70b3d1708d7b8 (diff)
downloadgdb-bb7835f04c1234a27a4c978e82a2362da7c2645a.zip
gdb-bb7835f04c1234a27a4c978e82a2362da7c2645a.tar.gz
gdb-bb7835f04c1234a27a4c978e82a2362da7c2645a.tar.bz2
fix armelf sanitization and checks for mentions of sanitized files
-rw-r--r--ld/.Sanitize27
1 files changed, 15 insertions, 12 deletions
diff --git a/ld/.Sanitize b/ld/.Sanitize
index 79361e8..ac72818 100644
--- a/ld/.Sanitize
+++ b/ld/.Sanitize
@@ -310,7 +310,7 @@ else
done
fi
-armelf_files="ChangeLog configure.tgt"
+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
@@ -345,13 +345,13 @@ for i in * ; do
done
for lost in .. $ld_emulparams_files; do
- if test $lost != ..; then
+ if test $lost != .. && test $lost != CVS; then
if test -f emulparams/$lost; then
:
else
lost2=`echo $lost | sed -e 's/.sh$//'`
for i in Makefile.am Makefile.in configure.host configure.tgt configure.in configure; do
- if fgrep $lost2 ../$i >/dev/null 2>&1; then
+ if fgrep $lost2 $i >/dev/null 2>&1; then
echo '***' File ld/emulparams/$lost was sanitized out but is still mentioned in ld/$i 1>&2
fi
done
@@ -360,20 +360,23 @@ for lost in .. $ld_emulparams_files; do
done
for lost in .. $ld_emultempl_files; do
- if test $lost != ..; then
+ if test $lost != .. && test $lost != CVS; then
if test -f emultempl/$lost; then
:
else
lost2=`echo $lost | sed -e 's/.em$//'`
for i in Makefile.am Makefile.in configure.host configure.tgt configure.in configure; do
- if fgrep $lost2 ../$i >/dev/null 2>&1; then
- echo '***' File ld/emultempl/$lost was sanitized out but is still mentioned in ld/$i 1>&2
+ if fgrep $lost2 $i >/dev/null 2>&1; then
+ # There is a valid mention of beos in configure.tgt
+ if test $lost2 != "beos" || test $i != configure.tgt; then
+ echo '***' File ld/emultempl/$lost was sanitized out but is still mentioned in ld/$i 1>&2
+ fi
fi
done
if test -d emulparams; then
for i in emulparams/*; do
- if fgrep $lost2 ../$i >/dev/null 2>&1; then
- echo '***' File ld/emultempl/$lost was sanitized out but is still mentioned in ld/emulparams/$i 1>&2
+ if fgrep $lost2 $i >/dev/null 2>&1; then
+ echo '***' File ld/emultempl/$lost was sanitized out but is still mentioned in ld/$i 1>&2
fi
done
fi
@@ -382,20 +385,20 @@ for lost in .. $ld_emultempl_files; do
done
for lost in .. $ld_scripttempl_files; do
- if test $lost != ..; then
+ if test $lost != .. && test $lost != CVS; then
if test -f scripttempl/$lost; then
:
else
lost2=`echo $lost | sed -e 's/.sc$//'`
for i in Makefile.am Makefile.in configure.host configure.tgt configure.in configure; do
- if fgrep $lost2 ../$i >/dev/null 2>&1; then
+ if fgrep $lost2 $i >/dev/null 2>&1; then
echo '***' File ld/scripttempl/$lost was sanitized out but is still mentioned in ld/$i 1>&2
fi
done
if test -d emulparams; then
for i in emulparams/*; do
- if fgrep $lost2 ../$i >/dev/null 2>&1; then
- echo '***' File ld/scripttempl/$lost was sanitized out but is still mentioned in ld/emulparams/$i 1>&2
+ if fgrep $lost2 $i >/dev/null 2>&1; then
+ echo '***' File ld/scripttempl/$lost was sanitized out but is still mentioned in ld/$i 1>&2
fi
done
fi