* config/tc-mips.c (prev_insn_labels): New.

	(mips_fix_4011_branch_bug): New.
	(append_insn): Watch for and handle branchs with labels.
	(mips_no_prev_insn): Initialize prev_insn_labels.
	(md_longopts,md_parse_option): Add {no-}fix-4011-branch-bug option.

1 files changed, 28 insertions, 0 deletions

diff --git a/gas/.Sanitize b/gas/.Sanitize
index 236bc9f..e6f17cf 100644
--- a/gas/.Sanitize
+++ b/gas/.Sanitize
@@ -463,6 +463,34 @@ else
 	done
 fi
 
+branchbug4011_files="ChangeLog"
+if ( echo $* | grep keep\-branchbug4011 > /dev/null ) ; then
+	for i in $branchbug4011_files ; do
+		if test ! -d $i && (grep sanitize-branchbug4011 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping branchbug4011 stuff in $i
+			fi
+		fi
+	done
+else
+	for i in $branchbug4011_files ; do
+		if test -r $i && (grep sanitize-branchbug4011 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"branchbug4011\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-branchbug4011/,/end\-sanitize\-branchbug4011/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