remove d30v sanitization

3 files changed, 10 insertions, 50 deletions

diff --git a/include/elf/.Sanitize b/include/elf/.Sanitize
index bf4a9c1..a871771 100644
--- a/include/elf/.Sanitize
+++ b/include/elf/.Sanitize
@@ -21,14 +21,6 @@ Do-first:
 # called.  Directories not listed will be removed in their entirety
 # with rm -rf.
 
-d30v_files="d30v.h"
-
-if ( echo $* | grep keep\-d30v > /dev/null ) ; then
-	keep_these_too="${d30v_files} ${keep_these_too}"
-else
-	lose_these_too="${d30v_files} ${lose_these_too}"
-fi
-
 Things-to-keep:
 
 ChangeLog
@@ -37,6 +29,7 @@ arc.h
 arm.h
 common.h
 d10v.h
+d30v.h
 dwarf.h
 dwarf2.h
 external.h
@@ -49,6 +42,7 @@ mips.h
 mn10200.h
 mn10300.h
 ppc.h
+reloc-macros.h
 sh.h
 sparc.h
 v850.h
@@ -85,34 +79,6 @@ else
 	done
 fi
 
-d30v_files="ChangeLog common.h"
-if ( echo $* | grep keep\-d30v > /dev/null ) ; then
-	for i in $d30v_files ; do
-		if test ! -d $i && (grep sanitize-d30v $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping d30v stuff in $i
-			fi
-		fi
-	done
-else
-	for i in $d30v_files ; do
-		if test ! -d $i && (grep sanitize-d30v $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"d30v\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-d30v/,/end-\sanitize\-d30v/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
-
 v850_files="ChangeLog common.h v850.h"
 if ( echo $* | grep keep\-v850e > /dev/null ) ; then
 	for i in $v850_files ; do
diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index 7bf13ee..7371ca2 100644
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -16,9 +16,7 @@ Wed Jul 22 16:22:11 1998  Nick Clifton  <nickc@cygnus.com>
 	* arc.h: Use reloc-macros.h.
 	* arm.h: Use reloc-macros.h.
 	* d10v.h: Use reloc-macros.h.
-start-sanitize-d30v
 	* d30v.h: Use reloc-macros.h.
-end-sanitize-d30v
 	* hppa.h: Use reloc-macros.h.
 	* i386.h: Use reloc-macros.h.
 	* m32r.h: Use reloc-macros.h.
@@ -39,9 +37,7 @@ end-sanitize-d30v
 	* alpha.h: Likewise.
 	* arm.h: Likewise.
 	* d10v.h: Likewise.
-start-sanitize-d30v
 	* d30v.h: Likewise.
-end-sanitize-d30v
 	* m32r.h: Likewise.
 	* m68k.h: Likewise.
 	* mn10200.h: Likewise.
@@ -52,9 +48,7 @@ end-sanitize-d30v
 
 	* arm.h: New file.
 	* d10v.h: New file.
-start-sanitize-d30v
 	* d30v.h: New file.
-end-sanitize-d30v
 	* i386.h: New file.
 	* m68k.h: New file.
 	* mn10200.h: New file.
@@ -250,12 +244,10 @@ Wed Feb 19 15:35:31 1997  Ian Lance Taylor  <ian@cygnus.com>
 	* external.h, internal.h, common.h: Added new structures and
 	definitions for ELF versions.
 
-start-sanitize-d30v
 Tue Feb 18 17:40:36 1997  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* common.h (EM_CYGNUS_D30V): Define.
 
-end-sanitize-d30v
 Mon Jan 27 11:54:44 1997  Doug Evans  <dje@seba.cygnus.com>
 
 	* m32r.h (enum reloc_type): Add R_M32R_HI16_[SU]LO,R_M32R_LO16.
diff --git a/include/elf/common.h b/include/elf/common.h
index 89261b3..596c1ab 100644
--- a/include/elf/common.h
+++ b/include/elf/common.h
@@ -77,21 +77,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define EM_386		3	/* Intel 80386 */
 #define EM_68K		4	/* Motorola m68k family */
 #define EM_88K		5	/* Motorola m88k family */
+#define EM_486		6	/* Intel 80486 */
 #define EM_860		7	/* Intel 80860 */
 #define EM_MIPS		8	/* MIPS R3000 (officially, big-endian only) */
-
+#define EM_S370		9	/* Amdahl */
 #define EM_MIPS_RS4_BE 10	/* MIPS R4000 big-endian */
 
 #define EM_PARISC      15	/* HPPA */
 
 #define EM_SPARC32PLUS 18	/* Sun's "v8plus" */
-
+#define EM_960         19       /* Intel 80960 */
 #define EM_PPC	       20	/* PowerPC */
 
+#define EM_V800        36	/* NEC V800 series */
+#define EM_FR20	       37	/* Fujitsu FR20 */
+#define EM_RH32	       38       /* TRW RH32 */
+#define EM_MMA         39	/* Fujitsu MMA */
 #define EM_ARM	       40	/* ARM */
-
+#define EM_OLD_ALPHA   41	/* Digital Alpha */
 #define EM_SH	       42	/* Hitachi SH */
-
 #define EM_SPARCV9     43	/* SPARC v9 64-bit */
 
 /* If it is necessary to assign new unofficial EM_* values, please pick large
@@ -124,10 +128,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* D10V backend magic number.  Written in the absence of an ABI.  */
 #define EM_CYGNUS_D10V	0x7650
 
-/* start-sanitize-d30v */
 /* D30V backend magic number.  Written in the absence of an ABI.  */
 #define EM_CYGNUS_D30V	0x7676
-/* end-sanitize-d30v */
 
 /* V850 backend magic number.  Written in the absense of an ABI.  */
 #define EM_CYGNUS_V850	0x9080