[src/trunk]: src/sys/arch/mips/mips fix mips32/mips64 program on mips32/mips6...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/531872770134
branches:  trunk
changeset: 764652:531872770134
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Apr 29 22:12:22 2011 +0000

description:
fix mips32/mips64 program on mips32/mips64 r2 bug.

diffstat:

 sys/arch/mips/mips/cpu_exec.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 956f15294bd2 -r 531872770134 sys/arch/mips/mips/cpu_exec.c
--- a/sys/arch/mips/mips/cpu_exec.c     Fri Apr 29 22:11:15 2011 +0000
+++ b/sys/arch/mips/mips/cpu_exec.c     Fri Apr 29 22:12:22 2011 +0000
@@ -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)