X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=.Sanitize;h=cc78df2761bce3095f87d383332de2426b8673e5;hb=ddfae34d82bb3e1a07f8639fc34d13c6805285e5;hp=d2b2884617393eeb0d3e695bfa645d2ef8be9179;hpb=69f273d821233f31d62db4067564e6a0a184843e;p=deliverable%2Fbinutils-gdb.git

diff --git a/.Sanitize b/.Sanitize
index d2b2884617..cc78df2761 100644
--- a/.Sanitize
+++ b/.Sanitize
@@ -46,15 +46,15 @@
 
 Do-first:
 
-keep_these_too="${keep_these_too} .cvsignore CYGNUS autoconf
-	apache bash 
-	bfd binutils bison byacc cvs deja-gnu dejagnu diff dosrel dvips
+keep_these_too="${keep_these_too} .cvsignore autoconf automake
+	apache ash bash bfd binutils bison byacc bzip2
+	cvs deja-gnu dejagnu diff dosrel dvips
 	emacs emacs19 examples expect fileutils findutils flex
 	gas gawk gcc gdb gdbm gdbtest glob gperf gprof grep grez groff
 	guile gzip
-	include inet install-sh ispell
-	ld less libg++ libgcc libgloss libiberty libio
-	librx libstdc++
+	include inet install-sh intl ispell
+	ld less libgcc libgloss libiberty libio
+	libstdc++ libtermcap libtool
 	m4 make mkinstalldirs mmalloc move-if-change newlib ncurses opcodes
 	pagas patch perl prms
 	rcs readline sed send-pr shellutils sim tar textutils time
@@ -63,9 +63,9 @@ keep_these_too="${keep_these_too} .cvsignore CYGNUS autoconf
 	mpw-README mpw-configure mpw-config.in mpw-build.in mpw-install
 	ltconfig ltmain.sh missing ylwrap"
 
-lose_these_too="${lose_these_too} testsuite"
+lose_these_too="${lose_these_too} libg++ librx libdsp testsuite"
 
-cygnus_files="release release-info build-all.mk test-build.mk COPYING.NEWLIB"
+cygnus_files="release release-info build-all.mk test-build.mk CYGNUS COPYING.NEWLIB"
 
 if ( echo $* | grep keep\-cygnus > /dev/null) ; then
 	keep_these_too="${keep_these_too} ${cygnus_files}"
@@ -108,7 +108,7 @@ else
 	keep_these_too="${keep_these_too} ${inet_files}"
 fi
 
-ide_files="libide vmake jstools"
+ide_files="libide libidetcl vmake jstools"
 
 if (echo $* | grep keep\-ide > /dev/null); then
 	keep_these_too="${keep_these_too} ${ide_files}"
@@ -117,6 +117,34 @@ else
 	lose_these_too="${lose_these_too} ${ide_files}"
 fi
 
+flexlm_files="flexlm"
+
+if (echo $* | grep keep\-cygnus > /dev/null); then
+	keep_these_too="${keep_these_too} ${flexlm_files}"
+	test -n "$verbose" && echo Keeping ${flexlm_files}
+else
+	lose_these_too="${lose_these_too} ${flexlm_files}"
+fi
+
+# CGEN files:
+# It is not yet clear if the cgen package will be shipped with the
+# simulators.
+cgen_files="cgen"
+
+if (echo $* | grep keep\-cgen > /dev/null); then
+	keep_these_too="${keep_these_too} ${cgen_files}"
+else
+	lose_these_too="${lose_these_too} ${cgen_files}"
+fi
+
+# Java stuff
+java_files="boehm-gc libjava qthreads zip"
+
+if (echo $* | grep keep\-java > /dev/null); then
+	keep_these_too="${keep_these_too} ${java_files}"
+else
+	lose_these_too="${lose_these_too} ${java_files}"
+fi
 
 # This top-level directory is special.  We often check out only subsets
 # of this directory, and complaining about directories or files we didn't
@@ -153,6 +181,7 @@ ChangeLog
 Makefile.in
 README
 config.guess
+config.if
 config.sub
 configure
 configure.in
@@ -220,27 +249,27 @@ else
 fi
 
 if [ -n "${verbose}" ] ; then
-	echo Processing \"d30v\"...
+	echo Processing \"v850\"...
 fi
 
-d30v_files="ChangeLog config.sub configure.in"
+v850_files="ChangeLog config.sub configure.in"
 
-if ( echo $* | grep keep\-d30v > /dev/null ) ; then
-	for i in $d30v_files ; do
-		if test ! -d $i && (grep sanitize-d30v $i > /dev/null) ; then
+if ( echo $* | grep keep\-v850e > /dev/null ) ; then
+	for i in $v850_files ; do
+		if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping d30v stuff in $i
+				echo Keeping v850e stuff in $i
 			fi
 		fi
 	done
 else
 	for i in * ; do
-		if test ! -d $i && (grep sanitize-d30v $i > /dev/null) ; then
+		if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"d30v\" from $i...
+				echo Removing traces of \"v850e\" from $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-d30v/,/end-\sanitize\-d30v/d' < $i > new
+			sed '/start\-sanitize\-v850e/,/end-\sanitize\-v850e/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
 				if [ -n "${verbose}" ] ; then
 					echo Caching $i in .Recover...
@@ -252,28 +281,53 @@ else
 	done
 fi
 
-if [ -n "${verbose}" ] ; then
-	echo Processing \"v850\"...
+r5900_files="ChangeLog config.sub configure.in"
+
+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
+			if [ -n "${verbose}" ] ; then
+				echo Keeping r5900 stuff in $i
+			fi
+		fi
+	done
+else
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-r5900 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"r5900\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-r5900/,/end-\sanitize\-r5900/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
 
-v850_files="ChangeLog config.sub configure.in"
+vr4xxx_files="ChangeLog config.sub"
 
-if ( echo $* | grep keep\-v850e > /dev/null ) ; then
-	for i in $v850_files ; do
-		if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then
+if ( echo $* | grep keep\-vr4xxx > /dev/null ) ; then
+	for i in $vr4xxx_files ; do
+		if test ! -d $i && (grep sanitize-vr4xxx $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping v850e stuff in $i
+				echo Keeping vr4xxx stuff in $i
 			fi
 		fi
 	done
 else
 	for i in * ; do
-		if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then
+		if test ! -d $i && (grep sanitize-vr4xxx $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"v850e\" from $i...
+				echo Removing traces of \"vr4xxx\" from $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-v850e/,/end-\sanitize\-v850e/d' < $i > new
+			sed '/start\-sanitize\-vr4xxx/,/end-\sanitize\-vr4xxx/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
 				if [ -n "${verbose}" ] ; then
 					echo Caching $i in .Recover...
@@ -285,24 +339,24 @@ else
 	done
 fi
 
-r5900_files="ChangeLog config.sub configure.in"
+vr4320_files="ChangeLog config.sub"
 
-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
+if ( echo $* | grep keep\-vr4320 > /dev/null ) ; then
+	for i in $vr4320_files ; do
+		if test ! -d $i && (grep sanitize-vr4320 $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping r5900 stuff in $i
+				echo Keeping vr4320 stuff in $i
 			fi
 		fi
 	done
 else
 	for i in * ; do
-		if test ! -d $i && (grep sanitize-r5900 $i > /dev/null) ; then
+		if test ! -d $i && (grep sanitize-vr4320 $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"r5900\" from $i...
+				echo Removing traces of \"vr4320\" from $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-r5900/,/end-\sanitize\-r5900/d' < $i > new
+			sed '/start\-sanitize\-vr4320/,/end-\sanitize\-vr4320/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
 				if [ -n "${verbose}" ] ; then
 					echo Caching $i in .Recover...
@@ -458,10 +512,25 @@ else
 fi
 
 if ( echo $* | grep lose\-gdbtk > /dev/null ) ; then
-	echo Catering to RMS by removing traces of \"gdbtk\"...
 	if [ -n "${verbose}" ] ; then
-		echo Removing traces of \"gdbtk\" from Makefile.in...
+		echo Catering to RMS by removing traces of \"gdbtk\"...
 	fi
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-gdbtk $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"gdbtk\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-gdbtk/,/end-\sanitize\-gdbtk/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
 	cp Makefile.in new
 	sed -e '/GDBTK_SUPPORT_DIRS=/d' -e 's/ $(GDBTK_SUPPORT_DIRS)//' < Makefile.in > new
 	if [ -n "${safe}" -a ! -f .Recover/Makefile.in ] ; then
@@ -471,26 +540,88 @@ if ( echo $* | grep lose\-gdbtk > /dev/null ) ; then
 		mv Makefile.in .Recover
 	fi
 	mv new Makefile.in
+else
+	if [ -n "${verbose}" ] ; then
+		echo Leaving \"gdbtk\" in the sources...
+	fi
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-gdbtk $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping \"gdbtk\" stuff in $i, but editing out sanitize lines...
+			fi
+			cp $i new
+			sed -e '/start\-sanitize\-gdbtk/d' -e '/end\-sanitize\-gdbtk/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
+
+if ( echo $* | grep lose\-mswin > /dev/null ) ; then
+	if [ -n "${verbose}" ] ; then
+		echo Removing traces of \"mswin\"...
+	fi
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-mswin $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"mswin\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-mswin/,/end-\sanitize\-mswin/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
+else
+	if [ -n "${verbose}" ] ; then
+		echo Leaving \"mswin\" in the sources...
+	fi
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-mswin $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping \"mswin\" stuff in $i, but editing out sanitize lines...
+			fi
+			cp $i new
+			sed -e '/start\-sanitize\-mswin/d' -e '/end\-sanitize\-mswin/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
 
-vr5400_files="ChangeLog config.sub"
+cygnus_files="ChangeLog config.sub"
 
-if ( echo $* | grep keep\-vr5400 > /dev/null ) ; then
-	for i in $vr5400_files ; do
-		if test ! -d $i && (grep sanitize-vr5400 $i > /dev/null) ; then
+if ( echo $* | grep keep\-cygnus > /dev/null ) ; then
+	for i in $cygnus_files ; do
+		if test ! -d $i && (grep sanitize-cygnus $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping vr5400 stuff in $i
+				echo Keeping cygnus stuff in $i
 			fi
 		fi
 	done
 else
 	for i in * ; do
-		if test ! -d $i && (grep sanitize-vr5400 $i > /dev/null) ; then
+		if test ! -d $i && (grep sanitize-cygnus $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"vr5400\" from $i...
+				echo Removing traces of \"cygnus\" from $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-vr5400/,/end-\sanitize\-vr5400/d' < $i > new
+			sed '/start\-sanitize\-cygnus/,/end-\sanitize\-cygnus/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
 				if [ -n "${verbose}" ] ; then
 					echo Caching $i in .Recover...
@@ -530,6 +661,129 @@ else
 	done
 fi
 
+java_files="ChangeLog Makefile.in configure.in"
+if ( echo $* | grep keep\-java > /dev/null ) ; then
+	for i in $java_files ; do
+		if test ! -d $i && (grep sanitize-java $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping java stuff in $i
+			fi
+		fi
+	done
+else
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-java $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"java\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-java/,/end-\sanitize\-java/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
+
+dsp_files="ChangeLog Makefile.in configure.in"
+if ( echo $* | grep keep\-dsp > /dev/null ) ; then
+        for i in $dsp_files ; do
+                if test ! -d $i && (grep sanitize-dsp $i > /dev/null) ; then
+                        if [ -n "${verbose}" ] ; then
+                                echo Keeping dsp stuff in $i
+                        fi
+                fi
+        done
+else
+        for i in * ; do
+                if test ! -d $i && (grep sanitize-dsp $i > /dev/null) ; then
+                        if [ -n "${verbose}" ] ; then
+                                echo Removing traces of \"dsp\" from $i...
+                        fi
+                        cp $i new
+                        sed '/start\-sanitize\-dsp/,/end-\sanitize\-dsp/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
+
+
+beos_files="ChangeLog configure.in"
+if ( echo $* | grep keep\-beos > /dev/null ) ; then
+	for i in $beos_files ; do
+		if test ! -d $i && (grep sanitize-beos $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping beos stuff in $i
+			fi
+		fi
+	done
+else
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-beos $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"beos\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-beos/,/end-\sanitize\-beos/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
+
+kcygnus_files="ChangeLog configure configure.in Makefile.in"
+if ( echo $* | grep keep\-cygnus > /dev/null ) ; then
+	for i in $kcygnus_files ; do
+		if test ! -d $i && (grep sanitize-cygnus $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping Cygnus stuff in $i
+			fi
+			cp $i new
+			grep -v sanitize-cygnus $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
+else
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-cygnus $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"cygnus\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-cygnus/,/end-\sanitize\-cygnus/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
+
+
 # Do this check LAST!
 for i in * ; do
 	if test ! -d $i && (grep sanitize $i > /dev/null) ; then