Module Name: src
Committed By: matt
Date: Fri Apr 29 22:12:22 UTC 2011
Modified Files:
src/sys/arch/mips/mips: cpu_exec.c
Log Message:
fix mips32/mips64 program on mips32/mips64 r2 bug.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/mips/mips/cpu_exec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/cpu_exec.c
diff -u src/sys/arch/mips/mips/cpu_exec.c:1.62 src/sys/arch/mips/mips/cpu_exec.c:1.63
--- src/sys/arch/mips/mips/cpu_exec.c:1.62 Tue Mar 15 07:39:22 2011
+++ src/sys/arch/mips/mips/cpu_exec.c Fri Apr 29 22:12:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_exec.c,v 1.62 2011/03/15 07:39:22 matt Exp $ */
+/* $NetBSD: cpu_exec.c,v 1.63 2011/04/29 22:12:22 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_exec.c,v 1.62 2011/03/15 07:39:22 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_exec.c,v 1.63 2011/04/29 22:12:22 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_compat_ultrix.h"
@@ -280,8 +280,9 @@
break;
case EF_MIPS_ARCH_32:
case EF_MIPS_ARCH_64:
- if (!CPUISMIPSNN)
+ if (!CPUISMIPSNN && !CPUISMIPS32R2 && !CPUISMIPS64R2)
return ENOEXEC;
+ break;
case EF_MIPS_ARCH_32R2:
case EF_MIPS_ARCH_64R2:
if (!CPUISMIPS32R2 && !CPUISMIPS64R2)
