Module Name: src
Committed By: maxv
Date: Wed Aug 9 18:52:00 UTC 2017
Modified Files:
src/sys/compat/svr4: svr4_exec.h svr4_stat.c
Log Message:
Remove __i386__.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/compat/svr4/svr4_exec.h
cvs rdiff -u -r1.70 -r1.71 src/sys/compat/svr4/svr4_stat.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/compat/svr4/svr4_exec.h
diff -u src/sys/compat/svr4/svr4_exec.h:1.28 src/sys/compat/svr4/svr4_exec.h:1.29
--- src/sys/compat/svr4/svr4_exec.h:1.28 Thu Dec 10 14:13:53 2009
+++ src/sys/compat/svr4/svr4_exec.h Wed Aug 9 18:52:00 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_exec.h,v 1.28 2009/12/10 14:13:53 matt Exp $ */
+/* $NetBSD: svr4_exec.h,v 1.29 2017/08/09 18:52:00 maxv Exp $ */
/*-
* Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -37,15 +37,6 @@
* play with brk(2) a bit more.
*/
-#ifdef __i386__
-/*
- * I cannot load the interpreter after the data segment because brk(2)
- * breaks. I have to load it somewhere before. Programs start at
- * 0x08000000 so I load the interpreter far before.
- */
-#define SVR4_INTERP_ADDR 0x01000000
-#endif
-
#ifdef __m68k__
/*
* Here programs load at 0x80000000, so I load the interpreter far before.
Index: src/sys/compat/svr4/svr4_stat.c
diff -u src/sys/compat/svr4/svr4_stat.c:1.70 src/sys/compat/svr4/svr4_stat.c:1.71
--- src/sys/compat/svr4/svr4_stat.c:1.70 Thu Aug 14 17:29:30 2014
+++ src/sys/compat/svr4/svr4_stat.c Wed Aug 9 18:52:00 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_stat.c,v 1.70 2014/08/14 17:29:30 maxv Exp $ */
+/* $NetBSD: svr4_stat.c,v 1.71 2017/08/09 18:52:00 maxv Exp $ */
/*-
* Copyright (c) 1994, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_stat.c,v 1.70 2014/08/14 17:29:30 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_stat.c,v 1.71 2017/08/09 18:52:00 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -454,8 +454,6 @@ svr4_sys_systeminfo(struct lwp *l, const
case SVR4_SI_ISALIST:
#if defined(__sparc__)
str = "sparcv9 sparcv9-fsmuld sparcv8 sparcv8-fsmuld sparcv7 sparc";
-#elif defined(__i386__)
- str = "i386";
#else
str = "unknown";
#endif
@@ -475,9 +473,7 @@ svr4_sys_systeminfo(struct lwp *l, const
break;
case SVR4_SI_PLATFORM:
-#if defined(__i386__)
- str = "i86pc";
-#elif defined(__sparc__)
+#if defined(__sparc__)
{
extern char machine_model[];
