From 64381ab4ee3428a297f88996415a365c3d6badc6 Mon Sep 17 00:00:00 2001
From: Michael Meissner <gnu@the-meissners.org>
Date: Tue, 2 Feb 1999 23:52:42 +0000
Subject: [PATCH] Change M32RX sanitization from m32rx sanitization to normal
 Cygnus sanitization

---
 bfd/.Sanitize | 30 +-----------------------------
 bfd/ChangeLog |  4 ++--
 2 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/bfd/.Sanitize b/bfd/.Sanitize
index 91fc744c25a..f2d47e65bbd 100644
--- a/bfd/.Sanitize
+++ b/bfd/.Sanitize
@@ -431,7 +431,7 @@ else
 	done
 fi
 
-cygnus_files="ChangeLog ChangeLog-9697 archures.c bfd-in2.h bfd-in.h cpu-mips.c elf32-mips.c cpu-m10300.c elf-m10300.c"
+cygnus_files="ChangeLog ChangeLog-9697 archures.c bfd-in2.h bfd-in.h cpu-mips.c elf32-mips.c cpu-m10300.c elf-m10300.c cpu-m32r.c elf32-m32r.c"
 if ( echo $* | grep keep\-cygnus > /dev/null ) ; then
 	for i in $cygnus_files ; do
 		if test ! -d $i && (grep sanitize-cygnus $i > /dev/null) ; then
@@ -515,34 +515,6 @@ else
 	done
 fi
 
-m32rx_files="ChangeLog ChangeLog-9697 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
-
 sky_files="ChangeLog archures.c elf32-mips.c reloc.c cpu-mips.c config.bfd configure.in configure bfd-in2.h libbfd.h"
 if ( echo $* | grep keep\-sky > /dev/null ) ; then
 	for i in $sky_files ; do
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 6a6aa7a1a0c..38950ab0c70 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -2489,10 +2489,10 @@ Tue Feb 10 19:23:28 1998  H.J. Lu  <hjl@gnu.org>
 	* configure: Rebuild.
 
 Tue Feb 10 15:16:38 1998  Nick Clifton  <nickc@cygnus.com>
-start-sanitize-m32rx
+start-sanitize-cygnus
 	* elf32-m32r.c (m32r_elf_merge_private_bfd_data): Do not complain
 	when merging m32r BFDs into m32rx BFDs.
-end-sanitize-m32rx
+end-sanitize-cygnus
 	* elf32-v850.c (remember_hi16s_reloc): New function.
 	(find_remembered_hi16s_reloc): New function.
 	(v850_elf_store_addend_in_insn): Use the above new functions to
-- 
2.30.2