* config/tc-m32r.c (optimize): New static local.

(md_shortopts): Add -O.
	(md_parse_option): Recognize it.
	(md_show_usage): Document it.
	(md_assemble): Don't try to combine insns in parallel if !optimize.

gas/.Sanitize

@@ -375,6 +375,32 @@ else
 		fi
 	done
 fi
+if ( echo $* | grep keep\-phase2\-m32rx > /dev/null ) ; then
+	for i in $m32rx_files ; do
+		if test ! -d $i && (grep sanitize\-phase2\-m32rx $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping m32rx stuff in $i
+			fi
+		fi
+	done
+else
+	for i in $m32rx_files ; do
+		if test -r $i && (grep sanitize\-phase2\-m32rx $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"m32rx\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-phase2\-m32rx/,/end\-sanitize\-phase2\-m32rx/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
 
 sky_files="ChangeLog configure.in configure"
 if ( echo $* | grep keep\-sky > /dev/null ) ; then

gas/ChangeLog

@@ -1,3 +1,13 @@
+start-sanitize-phase2-m32rx
+Wed Feb 25 11:43:45 1998  Doug Evans  <devans@canuck.cygnus.com>
+
+	* config/tc-m32r.c (optimize): New static local.
+	(md_shortopts): Add -O.
+	(md_parse_option): Recognize it.
+	(md_show_usage): Document it.
+	(md_assemble): Don't try to combine insns in parallel if !optimize.
+
+end-sanitize-phase2-m32rx
 start-sanitize-m32rx
 Tue Feb 24 18:03:25 1998  Nick Clifton  <nickc@cygnus.com>