From 9545e5c1388711b57b50e2f46c3e0a6d0821faad Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 10 May 2001 03:55:19 +0000
Subject: Eleminate all occurances of EM_MIPS_RS4_BE; define EM_MIPS_RS3_LE.

---
 arch/mips/boot/mkboot.c           |  5 ++---
 arch/mips64/kernel/binfmt_elf32.c |  6 +++---
 include/asm-mips/elf.h            | 15 ++-------------
 include/asm-mips64/elf.h          |  3 +--
 4 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/arch/mips/boot/mkboot.c b/arch/mips/boot/mkboot.c
index 35612d248..9e587eb1a 100644
--- a/arch/mips/boot/mkboot.c
+++ b/arch/mips/boot/mkboot.c
@@ -5,7 +5,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1996 by Ralf Baechle
+ * Copyright (C) 1996, 2001 by Ralf Baechle
  *
  * This file is written in plain Kernighan & Ritchie C as it has to run
  * on all crosscompile hosts no matter how braindead.  This code might
@@ -80,7 +80,6 @@ typedef struct
  * Acceptable machine type in e_machine.
  */
 #define EM_MIPS         8               /* MIPS R3000 big-endian */
-#define EM_MIPS_RS4_BE 10               /* MIPS R4000 big-endian */
 
 /*
  * The type of ELF file we accept.
@@ -462,7 +461,7 @@ main(argc, argv)
 		fprintf(stderr, "Input file isn't a executable.\n");
 		exit(1);
 	}
-	if(eh.e_machine != EM_MIPS && eh.e_machine != EM_MIPS_RS4_BE) {
+	if(eh.e_machine != EM_MIPS) {
 		fprintf(stderr, "Input file isn't a MIPS executable.\n");
 		exit(1);
 	}
diff --git a/arch/mips64/kernel/binfmt_elf32.c b/arch/mips64/kernel/binfmt_elf32.c
index fd68241f4..c49eca7c4 100644
--- a/arch/mips64/kernel/binfmt_elf32.c
+++ b/arch/mips64/kernel/binfmt_elf32.c
@@ -1,8 +1,8 @@
 /*
  * Support for 32-bit Linux/MIPS ELF binaries.
  *
- * Copyright (C) 1999 Ralf Baechle
- * Copyright (C) 1999 Silicon Graphics, Inc.
+ * Copyright (C) 1999, 2001 Ralf Baechle
+ * Copyright (C) 1999, 2001 Silicon Graphics, Inc.
  *
  * Heavily inspired by the 32-bit Sparc compat code which is
  * Copyright (C) 1995, 1996, 1997, 1998 David S. Miller (davem@redhat.com)
@@ -28,7 +28,7 @@ typedef double elf_fpreg_t;
 typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
 
 #define elf_check_arch(x)	\
-	((x)->e_machine == EM_MIPS || (x)->e_machine == EM_MIPS_RS4_BE)
+	((x)->e_machine == EM_MIPS)
 
 #define TASK32_SIZE		0x80000000UL
 #undef ELF_ET_DYN_BASE
diff --git a/include/asm-mips/elf.h b/include/asm-mips/elf.h
index adaba397a..9f13f7299 100644
--- a/include/asm-mips/elf.h
+++ b/include/asm-mips/elf.h
@@ -25,8 +25,7 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
 	int __res = 1;							\
 	struct elfhdr *__h = (hdr);					\
 									\
-	if ((__h->e_machine != EM_MIPS) &&				\
-	    (__h->e_machine != EM_MIPS_RS4_BE))				\
+	if (__h->e_machine != EM_MIPS)					\
 		__res = 0;						\
 	if (__h->e_flags & EF_MIPS_ARCH)				\
 		__res = 0;						\
@@ -35,17 +34,7 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
 })
 
 /* This one accepts IRIX binaries.  */
-#define irix_elf_check_arch(hdr)					\
-({									\
-	int __res = 1;							\
-	struct elfhdr *__h = (hdr);					\
-									\
-	if ((__h->e_machine != EM_MIPS) &&				\
-	    (__h->e_machine != EM_MIPS_RS4_BE))				\
-		__res = 0;						\
-									\
-	__res;								\
-})
+#define irix_elf_check_arch(hdr)	((hdr)->e_machine == EM_MIPS)
 
 /*
  * These are used to set parameters in the core dumps.
diff --git a/include/asm-mips64/elf.h b/include/asm-mips64/elf.h
index 3ab76a80b..f1449ddeb 100644
--- a/include/asm-mips64/elf.h
+++ b/include/asm-mips64/elf.h
@@ -29,8 +29,7 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
 	int __res = 1;							\
 	struct elfhdr *__h = (hdr);					\
 									\
-	if ((__h->e_machine != EM_MIPS) &&				\
-	    (__h->e_machine != EM_MIPS_RS4_BE))				\
+	if (__h->e_machine != EM_MIPS)					\
 		__res = 0;						\
 	if (sizeof(elf_caddr_t) == 8 &&					\
 	    __h->e_ident[EI_CLASS] == ELFCLASS32)			\
-- 
cgit v1.2.3