Module Name:    src
Committed By:   matt
Date:           Thu Sep  3 00:08:19 UTC 2009

Modified Files:
        src/sys/arch/mips/mips [matt-nb5-mips64]: cpu_exec.c

Log Message:
If loading O32, and COMPAT_16 is defined, set *startp to ELFS32_LINK_ADDR
so that the interpeter will be loaded at its link address.


To generate a diff of this commit:
cvs rdiff -u -r1.50.54.1.4.6 -r1.50.54.1.4.7 \
    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.50.54.1.4.6 src/sys/arch/mips/mips/cpu_exec.c:1.50.54.1.4.7
--- src/sys/arch/mips/mips/cpu_exec.c:1.50.54.1.4.6	Wed Sep  2 17:52:10 2009
+++ src/sys/arch/mips/mips/cpu_exec.c	Thu Sep  3 00:08:19 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu_exec.c,v 1.50.54.1.4.6 2009/09/02 17:52:10 matt Exp $	*/
+/*	$NetBSD: cpu_exec.c,v 1.50.54.1.4.7 2009/09/03 00:08:19 matt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_exec.c,v 1.50.54.1.4.6 2009/09/02 17:52:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_exec.c,v 1.50.54.1.4.7 2009/09/03 00:08:19 matt Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_compat_ultrix.h"
@@ -357,6 +357,9 @@
 #endif
 	case EF_MIPS_ABI_O32:
 		p->p_md.md_abi = _MIPS_BSD_API_O32;
+#ifdef COMPAT_16
+		*start_p = ELF32_LINK_ADDR;
+#endif
 		if (old_abi != p->p_md.md_abi)
 			printf("pid %d(%s): ABI set to O32 (e_flags=%#x)\n", p->p_pid, p->p_comm, eh->e_flags);
 		return 0;

Reply via email to