patch-2.4.0-test6 linux/include/asm-mips/elf.h

• Lines: 55
• Date: Thu Jul 27 18:36:54 2000
• Orig file: v2.4.0-test5/linux/include/asm-mips/elf.h
• Orig date: Fri Jul 14 12:12:15 2000

diff -u --recursive --new-file v2.4.0-test5/linux/include/asm-mips/elf.h linux/include/asm-mips/elf.h
@@ -1,8 +1,10 @@
 /*
- * $Id: elf.h,v 1.6 1999/02/15 02:22:10 ralf Exp $
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
-#ifndef __ASM_MIPS_ELF_H
-#define __ASM_MIPS_ELF_H
+#ifndef __ASM_ELF_H
+#define __ASM_ELF_H
 
 /* ELF register definitions */
 #define ELF_NGREG	45
@@ -20,13 +22,14 @@
  */
 #define elf_check_arch(hdr)						\
 ({									\
-	int __res = 0;							\
+	int __res = 1;							\
 	struct elfhdr *__h = (hdr);					\
 									\
-	if ((__h->e_machine != EM_MIPS) && (__h->e_machine != EM_MIPS))	\
-		__res = -ENOEXEC;					\
+	if ((__h->e_machine != EM_MIPS) &&				\
+	    (__h->e_machine != EM_MIPS_RS4_BE))				\
+		__res = 0;						\
 	if (__h->e_flags & EF_MIPS_ARCH)				\
-		__res = -ENOEXEC;					\
+		__res = 0;						\
 									\
 	__res;								\
 })
@@ -34,11 +37,12 @@
 /* This one accepts IRIX binaries.  */
 #define irix_elf_check_arch(hdr)					\
 ({									\
-	int __res = 0;							\
+	int __res = 1;							\
 	struct elfhdr *__h = (hdr);					\
 									\
-	if ((__h->e_machine != EM_MIPS) && (__h->e_machine != EM_MIPS))	\
-		__res = -ENOEXEC;					\
+	if ((__h->e_machine != EM_MIPS) &&				\
+	    (__h->e_machine != EM_MIPS_RS4_BE))				\
+		__res = 0;						\
 									\
 	__res;								\
 })
@@ -102,4 +106,4 @@
 #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
 #endif
 
-#endif /* __ASM_MIPS_ELF_H */
+#endif /* __ASM_ELF_H */