From b08a983c45bae6db79f9236f8320d101bbb17c0e Mon Sep 17 00:00:00 2001
From: Gavin Romig-Koch <gavin@redhat.com>
Date: Mon, 29 Jun 1998 13:38:34 +0000
Subject: [PATCH] 	* 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.

---
 gas/.Sanitize        | 28 ++++++++++++++++++++++++++++
 gas/ChangeLog        | 10 ++++++++++
 gas/config/.Sanitize | 28 ++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+)

diff --git a/gas/.Sanitize b/gas/.Sanitize
index 236bc9f8bad..e6f17cf79bb 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
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 0c2f900e180..61b3fa4a5f7 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,13 @@
+start-sanitize-branchbug4011
+Mon Jun 29 09:36:27 1998  Gavin Koch  <gavin@cygnus.com>
+
+	* 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.
+
+end-sanitize-branchbug4011
 Fri Jun 26 11:21:11 1998  Jeffrey A Law  (law@cygnus.com)
 
 	* config/tc-mn10300.c (set_arch_mach): New function.
diff --git a/gas/config/.Sanitize b/gas/config/.Sanitize
index 66927aa56bb..b6fb21e6572 100644
--- a/gas/config/.Sanitize
+++ b/gas/config/.Sanitize
@@ -466,6 +466,34 @@ else
 	done
 fi
 
+branchbug4011_files="tc-mips.c"
+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
-- 
2.30.2