From a3240f68578e136d4104fa49f4e00d15471c672f Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Tue, 16 Dec 1997 14:38:21 +0000
Subject: [PATCH] Added m32rx sanitization.

---
 bfd/.Sanitize | 28 ++++++++++++++++++++++++++++
 bfd/ChangeLog | 13 ++++++++++---
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/bfd/.Sanitize b/bfd/.Sanitize
index 288fc0b1ef..c8d8b20b01 100644
--- a/bfd/.Sanitize
+++ b/bfd/.Sanitize
@@ -485,6 +485,34 @@ else
 	done
 fi
 
+m32rx_files="ChangeLog archures.c bfd-in2.h elf32-m32r.c cpu-m32r.c"
+if ( echo $* | grep keep\-m32rx > /dev/null ) ; then
+	for i in $m32rx_files ; do
+		if test -r $i && (grep sanitize-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 -f $i && (grep sanitize-m32rx $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"m32rx\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-m32rx/,/end\-sanitize\-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
+
 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/bfd/ChangeLog b/bfd/ChangeLog
index 023d00ebc5..52bfcba332 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -7,10 +7,13 @@ Tue Dec 16 08:09:56 1997  Gavin Koch  <gavin@cygnus.com>
 
 Mon Dec 15 16:08:52 1997  Nick Clifton  <nickc@cygnus.com>
 
+start-sanitize-m32rx
 	* elf32-m32r.c (m32r_elf_merge_private_bfd_data): Allow M32R
 	object files to be merged into a M32RX executable.
-
-	* archures.c: Add bfd_mach_m32r and bfd_mach_m32rx.
+	
+	* archures.c: Add bfd_mach_m32rx.
+end-sanitize-m32rx
+	* archures.c: Add bfd_mach_m32r.
 
 Mon Dec 15 16:11:22 1997  Fred Fish  <fnf@cygnus.com>
 
@@ -41,10 +44,14 @@ Mon Dec 15 15:01:15 1997  Nick Clifton  <nickc@cygnus.com>
 	(bfd_elf32_bfd_print_private_bfd_data): Point to
 	m32r_elf_print_private_bfd_data. 
 
+start-sanitize-m32rx
 	* cpu-m32r.c: Add m32rx cpu architecture.
+	* bfd-in2.h (bfd_mach_m32r, bfd_mach_m32rx): Add identifiers for
+	M32RX architecture machines.
+end-sanitize-m32rx
 
 	* bfd-in2.h (bfd_mach_m32r, bfd_mach_m32rx): Add identifiers for
-	M32R and M32RX architecture machines.
+	M32R architecture machines.
 
 Fri Dec 12 11:30:28 1997  Brendan Kehoe  <brendan@canuck.cygnus.com>
 
-- 
2.34.1