Fix some mswin sanitization problems.

4 files changed, 53 insertions, 2 deletions

diff --git a/config/.Sanitize b/config/.Sanitize
index c677d55..127ad3c 100644
--- a/config/.Sanitize
+++ b/config/.Sanitize
@@ -21,6 +21,12 @@ else
         lose_these_too="${lose_these_too} mt-r5900"
 fi
 
+if ( echo $* | grep keep\-mswin > /dev/null ) ; then
+	keep_these_too="${keep_these_too} mh-windows"
+else
+        lose_these_too="${lose_these_too} mh-windows"
+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.
 # Directories listed in this section will have their own Sanitize
@@ -64,7 +70,6 @@ mh-sun3
 mh-sysv
 mh-sysv4
 mh-vaxult2
-mh-windows
 mh-x86pic
 mpw
 mpw-mh-mpw
diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index 907fe7c..b34887b 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -780,6 +780,7 @@ else
 		fi
 	done
 fi
+
 if ( echo $* | grep keep\-ide > /dev/null ) ; then
 	for i in * ; do
 		if test ! -d $i && (grep sanitize-ide $i > /dev/null) ; then
@@ -807,6 +808,33 @@ else
 	done
 fi
 
+if ( echo $* | grep keep\-mswin > /dev/null ) ; then
+	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
+			fi
+		fi
+	done
+else
+	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
+fi
+
 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
diff --git a/gdb/config/i386/.Sanitize b/gdb/config/i386/.Sanitize
index ac74c1a..4394e06 100644
--- a/gdb/config/i386/.Sanitize
+++ b/gdb/config/i386/.Sanitize
@@ -15,6 +15,23 @@
 
 Do-first:
 
+# WinGDB files are not really ready to be part of FSF releases, but
+# keep them for progressives and such.
+
+mswin_files="windows.mh"
+
+if ( echo $* | grep lose\-mswin > /dev/null ) ; then
+	lose_these_too="${mswin_files} ${lose_these_too}"
+	if [ -n "${verbose}" ] ; then
+		echo Deleting ${mswin_files}
+	fi
+else
+	keep_these_too="${mswin_files} ${keep_these_too}"
+	if [ -n "${verbose}" ] ; then
+		echo Keeping ${mswin_files}
+	fi
+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.
 # Directories listed in this section will have their own Sanitize
@@ -110,7 +127,6 @@ tm-ptx.h
 tm-ptx4.h
 tm-sun386.h
 tm-symmetry.h
-windows.mh
 xm-cygwin32.h
 xm-go32.h
 xm-i386aix.h
diff --git a/gdb/configure.host b/gdb/configure.host
index b9aa3ed..d1e6c0a 100644
--- a/gdb/configure.host
+++ b/gdb/configure.host
@@ -74,7 +74,9 @@ i[3456]86-*-sysv*)	gdb_host=i386v ;;
 i[3456]86-*-isc*)	gdb_host=i386v32 ;;
 i[3456]86-*-cygwin32)	gdb_host=cygwin32 ;;
 i[3456]86-*-windows)	gdb_host=windows
+			# start-sanitize-mswin
 			configdirs=mswin
+			# end-sanitize-mswin
 			gdb_cv_c_long_long=no
 			gdb_cv_printf_has_long_long=no ;;
 m680[01]0-sun-sunos3*)	gdb_host=sun2os3 ;;