fix sanitization for gettext changes

9 files changed, 163 insertions, 59 deletions

diff --git a/gas/.Sanitize b/gas/.Sanitize
index 4d66157..c7788c6 100644
--- a/gas/.Sanitize
+++ b/gas/.Sanitize
@@ -1,4 +1,4 @@
-# .Sanitize for devo/gas.
+# .Sanitize for devo/gas
 
 # Each directory to survive its way into a release will need a file
 # like this one called "./.Sanitize".  All keyword lines must exist,
@@ -23,7 +23,7 @@ for d in obsolete regress regress.m68k testscripts ; do
 done
 
 # All files listed between the "Things-to-keep:" line and the
-# "Files-to-sed:" line will be kept.  All other files will be removed.
+# "Do-last:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize
 # called.  Directories not listed will be removed in their entirety
 # with rm -rf.
@@ -45,6 +45,7 @@ aclocal.m4
 app.c
 as.c
 as.h
+asintl.h
 atof-generic.c
 bignum-copy.c
 bignum.h
@@ -52,8 +53,8 @@ bit_fix.h
 cgen.c
 cond.c
 config
-config.in
 config-gas.com
+config.in
 configure
 configure.bat
 configure.in
@@ -81,14 +82,14 @@ hash.h
 input-file.c
 input-file.h
 input-scrub.c
-link.cmd
-listing.c
-listing.h
-literal.c
 itbl-lex.l
 itbl-ops.c
 itbl-ops.h
 itbl-parse.y
+link.cmd
+listing.c
+listing.h
+literal.c
 mac-as.r
 macro.c
 macro.h
@@ -99,6 +100,7 @@ mpw-make.sed
 obj.h
 output-file.c
 output-file.h
+po
 read.c
 read.h
 sb.c
@@ -118,6 +120,12 @@ write.h
 
 Things-to-lose:
 
+
+
+# The lines between the "Do-last:" line and the end of the file
+# are executed as a /bin/sh shell script after everything else is
+# done.
+
 Do-last:
 
 v850_files="ChangeLog configure.in configure"
@@ -432,5 +440,4 @@ for i in * ; do
 	fi
 done
 
-#
-# End of file.
+# eof
diff --git a/gas/config/.Sanitize b/gas/config/.Sanitize
index aa84562..79ba312 100644
--- a/gas/config/.Sanitize
+++ b/gas/config/.Sanitize
@@ -11,7 +11,7 @@
 
 # The lines between the "Do-first:" line and the "Things-to-keep:"
 # line are executed as a /bin/sh shell script before anything else is
-# done in this 
+# done in this directory.
 
 Do-first:
 
@@ -44,7 +44,7 @@ else
 fi
 
 # All files listed between the "Things-to-keep:" line and the
-# "Files-to-sed:" line will be kept.  All other files will be removed.
+# "Do-last:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize
 # called.  Directories not listed will be removed in their entirety
 # with rm -rf.
@@ -55,11 +55,11 @@ aout_gnu.h
 atof-ieee.c
 atof-tahoe.c
 atof-vax.c
-go32.cfg
 e-i386coff.c
 e-i386elf.c
 e-mipsecoff.c
 e-mipself.c
+go32.cfg
 itbl-mips.h
 m68k-parse.h
 m68k-parse.y
@@ -147,8 +147,8 @@ tc-z8k.c
 tc-z8k.h
 te-386bsd.h
 te-aux.h
-te-delta.h
 te-delt88.h
+te-delta.h
 te-dpx2.h
 te-dynix.h
 te-generic.h
@@ -175,15 +175,20 @@ te-sun3.h
 te-svr4.h
 te-sysv32.h
 vax-inst.h
-vms-conf.h
 vms-a-conf.h
+vms-conf.h
 
 Things-to-lose:
 
+
+
+# The lines between the "Do-last:" line and the end of the file
+# are executed as a /bin/sh shell script after everything else is
+# done.
+
 Do-last:
 
 r5900_files="tc-mips.c"
-
 if ( echo $* | grep keep\-r5900 > /dev/null ) ; then
 	for i in $r5900_files ; do
 		if test ! -d $i && (grep sanitize-r5900 $i > /dev/null) ; then
@@ -240,7 +245,6 @@ else
 fi
 
 tx19_files="tc-mips.c"
-
 if ( echo $* | grep keep\-tx19 > /dev/null ) ; then
 	for i in $tx19_files ; do
 		if test ! -d $i && (grep sanitize-tx19 $i > /dev/null) ; then
@@ -269,7 +273,6 @@ else
 fi
 
 tx49_files="ChangeLog tc-mips.c"
-
 if ( echo $* | grep keep\-tx49 > /dev/null ) ; then
 	for i in $tx49_files ; do
 		if test ! -d $i && (grep sanitize-tx49 $i > /dev/null) ; then
@@ -298,7 +301,6 @@ else
 fi
 
 tic80_files="obj-coff.h"
-
 if ( echo $* | grep keep\-tic80 > /dev/null ) ; then
 	for i in $tic80_files ; do
 		if test ! -d $i && (grep sanitize-tic80 $i > /dev/null) ; then
@@ -442,4 +444,4 @@ for i in * ; do
 	fi
 done
 
-# End of file.
+# eof
diff --git a/gas/doc/.Sanitize b/gas/doc/.Sanitize
index fd5744c..3e50739 100644
--- a/gas/doc/.Sanitize
+++ b/gas/doc/.Sanitize
@@ -1,7 +1,6 @@
-# Sanitize.in for devo.
-#
+# .Sanitize for devo/gas/doc
 
-# Each directory to survive it's way into a release will need a file
+# Each directory to survive its way into a release will need a file
 # like this one called "./.Sanitize".  All keyword lines must exist,
 # and must exist in the order specified by this file.  Each directory
 # in the tree will be processed, top down, in the following order.
@@ -12,7 +11,7 @@
 
 # The lines between the "Do-first:" line and the "Things-to-keep:"
 # line are executed as a /bin/sh shell script before anything else is
-# done in this 
+# done in this directory.
 
 Do-first:
 
@@ -25,7 +24,7 @@ else
 fi
 
 # All files listed between the "Things-to-keep:" line and the
-# "Files-to-sed:" line will be kept.  All other files will be removed.
+# "Do-last:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize
 # called.  Directories not listed will be removed in their entirety
 # with rm -rf.
@@ -60,6 +59,12 @@ internals.texi
 
 Things-to-lose:
 
+
+
+# The lines between the "Do-last:" line and the end of the file
+# are executed as a /bin/sh shell script after everything else is
+# done.
+
 Do-last:
 
 v850e_files="c-v850.texi"
@@ -146,13 +151,10 @@ else
 	done
 fi
 
-# Don't try to clean directories here, as the 'mv' command will fail.
-# Also, grep fails on NFS mounted directories.
-
 for i in * ; do
 	if test ! -d $i && (grep sanitize $i > /dev/null) ; then
 		echo '***' Some mentions of Sanitize are still left in $i! 1>&2
 	fi
 done
 
-# End of file.
+# eof
diff --git a/gas/po/.Sanitize b/gas/po/.Sanitize
new file mode 100644
index 0000000..50cfed6
--- /dev/null
+++ b/gas/po/.Sanitize
@@ -0,0 +1,41 @@
+# .Sanitize for devo/gas/po
+
+# Each directory to survive its way into a release will need a file
+# like this one called "./.Sanitize".  All keyword lines must exist,
+# and must exist in the order specified by this file.  Each directory
+# in the tree will be processed, top down, in the following order.
+
+# Hash started lines like this one are comments and will be deleted
+# before anything else is done.  Blank lines will also be squashed
+# out.
+
+# The lines between the "Do-first:" line and the "Things-to-keep:"
+# line are executed as a /bin/sh shell script before anything else is
+# done in this directory.
+
+Do-first:
+
+
+# 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
+# called.  Directories not listed will be removed in their entirety
+# with rm -rf.
+
+Things-to-keep:
+
+Make-in
+POTFILES.in
+gas.pot
+
+Things-to-lose:
+
+
+
+# The lines between the "Do-last:" line and the end of the file
+# are executed as a /bin/sh shell script after everything else is
+# done.
+
+Do-last:
+
+# eof
diff --git a/gas/testsuite/gas/.Sanitize b/gas/testsuite/gas/.Sanitize
index e3202d4..bb65e75 100644
--- a/gas/testsuite/gas/.Sanitize
+++ b/gas/testsuite/gas/.Sanitize
@@ -1,8 +1,6 @@
-# Sanitize.in for devo.
-# $Id$
-#
+# .Sanitize for devo/gas/testsuite/gas
 
-# Each directory to survive it's way into a release will need a file
+# Each directory to survive its way into a release will need a file
 # like this one called "./.Sanitize".  All keyword lines must exist,
 # and must exist in the order specified by this file.  Each directory
 # in the tree will be processed, top down, in the following order.
@@ -13,7 +11,7 @@
 
 # The lines between the "Do-first:" line and the "Things-to-keep:"
 # line are executed as a /bin/sh shell script before anything else is
-# done in this 
+# done in this directory.
 
 Do-first:
 
@@ -42,7 +40,7 @@ else
 fi
 
 # All files listed between the "Things-to-keep:" line and the
-# "Files-to-sed:" line will be kept.  All other files will be removed.
+# "Do-last:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize
 # called.  Directories not listed will be removed in their entirety
 # with rm -rf.
@@ -77,6 +75,12 @@ vax
 
 Things-to-lose:
 
+
+
+# The lines between the "Do-last:" line and the end of the file
+# are executed as a /bin/sh shell script after everything else is
+# done.
+
 Do-last:
 
-# End of file.
+# eof
diff --git a/gas/testsuite/gas/d30v/.Sanitize b/gas/testsuite/gas/d30v/.Sanitize
index 8dfc440..f378046 100644
--- a/gas/testsuite/gas/d30v/.Sanitize
+++ b/gas/testsuite/gas/d30v/.Sanitize
@@ -1,5 +1,27 @@
+# .Sanitize for devo/gas/testsuite/gas/d30v
+
+# Each directory to survive its way into a release will need a file
+# like this one called "./.Sanitize".  All keyword lines must exist,
+# and must exist in the order specified by this file.  Each directory
+# in the tree will be processed, top down, in the following order.
+
+# Hash started lines like this one are comments and will be deleted
+# before anything else is done.  Blank lines will also be squashed
+# out.
+
+# The lines between the "Do-first:" line and the "Things-to-keep:"
+# line are executed as a /bin/sh shell script before anything else is
+# done in this directory.
+
 Do-first:
 
+
+# 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
+# called.  Directories not listed will be removed in their entirety
+# with rm -rf.
+
 Things-to-keep:
 
 align.d
@@ -18,4 +40,12 @@ reloc.s
 
 Things-to-lose:
 
-Do-last:
\ No newline at end of file
+
+
+# The lines between the "Do-last:" line and the end of the file
+# are executed as a /bin/sh shell script after everything else is
+# done.
+
+Do-last:
+
+# eof
diff --git a/gas/testsuite/gas/hppa/.Sanitize b/gas/testsuite/gas/hppa/.Sanitize
index 9829b80..b6ce777 100644
--- a/gas/testsuite/gas/hppa/.Sanitize
+++ b/gas/testsuite/gas/hppa/.Sanitize
@@ -1,8 +1,6 @@
-# Sanitize.in for devo.
-# $Id$
-#
+# .Sanitize for devo/gas/testsuite/gas/hppa
 
-# Each directory to survive it's way into a release will need a file
+# Each directory to survive its way into a release will need a file
 # like this one called "./.Sanitize".  All keyword lines must exist,
 # and must exist in the order specified by this file.  Each directory
 # in the tree will be processed, top down, in the following order.
@@ -13,7 +11,7 @@
 
 # The lines between the "Do-first:" line and the "Things-to-keep:"
 # line are executed as a /bin/sh shell script before anything else is
-# done in this 
+# done in this directory.
 
 Do-first:
 
@@ -24,7 +22,7 @@ for d in more.parse ; do
 done
 
 # All files listed between the "Things-to-keep:" line and the
-# "Files-to-sed:" line will be kept.  All other files will be removed.
+# "Do-last:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize
 # called.  Directories not listed will be removed in their entirety
 # with rm -rf.
@@ -37,6 +35,14 @@ parse
 reloc
 unsorted
 
+Things-to-lose:
+
+
+
+# The lines between the "Do-last:" line and the end of the file
+# are executed as a /bin/sh shell script after everything else is
+# done.
+
 Do-last:
 
-# End of file.
+# eof
diff --git a/gas/testsuite/gas/m32r/.Sanitize b/gas/testsuite/gas/m32r/.Sanitize
index 66fc6a1..d42dc01 100644
--- a/gas/testsuite/gas/m32r/.Sanitize
+++ b/gas/testsuite/gas/m32r/.Sanitize
@@ -1,6 +1,6 @@
-# Sanitize.in for devo/gas/testsuite/gas/m32r.
+# .Sanitize for devo/gas/testsuite/gas/m32r
 
-# Each directory to survive it's way into a release will need a file
+# Each directory to survive its way into a release will need a file
 # like this one called "./.Sanitize".  All keyword lines must exist,
 # and must exist in the order specified by this file.  Each directory
 # in the tree will be processed, top down, in the following order.
@@ -11,7 +11,7 @@
 
 # The lines between the "Do-first:" line and the "Things-to-keep:"
 # line are executed as a /bin/sh shell script before anything else is
-# done in this 
+# done in this directory.
 
 Do-first:
 
@@ -23,15 +23,15 @@ else
 fi
 
 # All files listed between the "Things-to-keep:" line and the
-# "Files-to-sed:" line will be kept.  All other files will be removed.
+# "Do-last:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize
 # called.  Directories not listed will be removed in their entirety
 # with rm -rf.
 
 Things-to-keep:
 
-allinsn.exp
 allinsn.d
+allinsn.exp
 allinsn.s
 high-1.d
 high-1.s
@@ -43,6 +43,12 @@ uppercase.s
 
 Things-to-lose:
 
+
+
+# The lines between the "Do-last:" line and the end of the file
+# are executed as a /bin/sh shell script after everything else is
+# done.
+
 Do-last:
 
 for i in * ; do
@@ -51,4 +57,4 @@ for i in * ; do
 	fi
 done
 
-# End of file.
+# eof
diff --git a/gas/testsuite/gas/mips/.Sanitize b/gas/testsuite/gas/mips/.Sanitize
index 9dacebd..2185975 100644
--- a/gas/testsuite/gas/mips/.Sanitize
+++ b/gas/testsuite/gas/mips/.Sanitize
@@ -1,6 +1,6 @@
-# .Sanitize for devo/gas/testsuite/gas/mips.
+# .Sanitize for devo/gas/testsuite/gas/mips
 
-# Each directory to survive it's way into a release will need a file
+# Each directory to survive its way into a release will need a file
 # like this one called "./.Sanitize".  All keyword lines must exist,
 # and must exist in the order specified by this file.  Each directory
 # in the tree will be processed, top down, in the following order.
@@ -11,7 +11,7 @@
 
 # The lines between the "Do-first:" line and the "Things-to-keep:"
 # line are executed as a /bin/sh shell script before anything else is
-# done in this 
+# done in this directory.
 
 Do-first:
 
@@ -64,7 +64,7 @@ else
 fi
 
 # All files listed between the "Things-to-keep:" line and the
-# "Files-to-sed:" line will be kept.  All other files will be removed.
+# "Do-last:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize
 # called.  Directories not listed will be removed in their entirety
 # with rm -rf.
@@ -111,17 +111,17 @@ la.s
 lb-empic.d
 lb-pic.s
 lb-svr4pic.d
-lb-xgot.d
 lb-xgot-ilocks.d
+lb-xgot.d
 lb.d
 lb.s
-ld.d
-ld.s
 ld-empic.d
 ld-ilocks.d
 ld-pic.s
 ld-svr4pic.d
 ld-xgot.d
+ld.d
+ld.s
 li.d
 li.s
 lif-empic.d
@@ -150,12 +150,12 @@ sb.d
 sb.s
 trunc.d
 trunc.s
+uld.d
+uld.s
 ulh-empic.d
 ulh-pic.s
 ulh-svr4pic.d
 ulh-xgot.d
-uld.d
-uld.s
 ulh.d
 ulh.s
 ulw.d
@@ -169,6 +169,12 @@ usw.s
 
 Things-to-lose:
 
+
+
+# The lines between the "Do-last:" line and the end of the file
+# are executed as a /bin/sh shell script after everything else is
+# done.
+
 Do-last:
 
 tx19_files="mips.exp"
@@ -311,4 +317,4 @@ else
 	done
 fi
 
-# End of file.
+# eof