Module Name: src
Committed By: macallan
Date: Wed Feb 18 11:15:19 UTC 2015
Modified Files:
src/sys/arch/sgimips/conf: GENERIC64_32_IP2x GENERIC64_32_IP3x
std.sgimips64_32
Log Message:
cleanup compat options, disable COMPAT_LINUX for N32 kernels
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sgimips/conf/GENERIC64_32_IP2x \
src/sys/arch/sgimips/conf/GENERIC64_32_IP3x
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sgimips/conf/std.sgimips64_32
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/sgimips/conf/GENERIC64_32_IP2x
diff -u src/sys/arch/sgimips/conf/GENERIC64_32_IP2x:1.2 src/sys/arch/sgimips/conf/GENERIC64_32_IP2x:1.3
--- src/sys/arch/sgimips/conf/GENERIC64_32_IP2x:1.2 Sat Aug 23 20:26:59 2014
+++ src/sys/arch/sgimips/conf/GENERIC64_32_IP2x Wed Feb 18 11:15:19 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC64_32_IP2x,v 1.2 2014/08/23 20:26:59 dholland Exp $
+# $NetBSD: GENERIC64_32_IP2x,v 1.3 2015/02/18 11:15:19 macallan Exp $
#
# GENERIC32_IP2x machine description file
#
@@ -29,7 +29,7 @@ include "arch/sgimips/conf/std.sgimips6
no makeoptions TEXTADDR # entry point
makeoptions TEXTADDR=0xffffffff88069000 # entry point
-#ident "GENERIC64-IP2x-$Revision: 1.2 $"
+#ident "GENERIC64-IP2x-$Revision: 1.3 $"
no makeoptions WANT_ECOFF
makeoptions WANT_ECOFF="no" # Create an ECOFF kernel in addition
@@ -37,14 +37,3 @@ makeoptions WANT_ECOFF="no" # Create an
# netbooting Indigo (IP20) and some
# Indigo2 (IP22) machines
-# Compatibility options
-#options COMPAT_15 # NetBSD 1.5,
-#options COMPAT_16 # NetBSD 1.6,
-#options COMPAT_20 # NetBSD 2.0,
-#options COMPAT_30 # NetBSD 3.0,
-#options COMPAT_40 # NetBSD 4.0 binary compatibility.
-#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
-
-#options COMPAT_LINUX # binary compatibility with Linux
-#options COMPAT_ULTRIX # binary compatibility with Ultrix
-#options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
Index: src/sys/arch/sgimips/conf/GENERIC64_32_IP3x
diff -u src/sys/arch/sgimips/conf/GENERIC64_32_IP3x:1.2 src/sys/arch/sgimips/conf/GENERIC64_32_IP3x:1.3
--- src/sys/arch/sgimips/conf/GENERIC64_32_IP3x:1.2 Sat Aug 23 20:26:59 2014
+++ src/sys/arch/sgimips/conf/GENERIC64_32_IP3x Wed Feb 18 11:15:19 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC64_32_IP3x,v 1.2 2014/08/23 20:26:59 dholland Exp $
+# $NetBSD: GENERIC64_32_IP3x,v 1.3 2015/02/18 11:15:19 macallan Exp $
#
# GENERIC32_IP3x machine description file
#
@@ -30,16 +30,4 @@ makeoptions TEXTADDR="0xffffffff80069000
no makeoptions CPUFLAGS
makeoptions CPUFLAGS="-march=mips4 -mtune=vr5000"
-#ident "GENERIC64_IP3x-$Revision: 1.2 $"
-
-# Compatibility options
-#options COMPAT_15 # NetBSD 1.5,
-#options COMPAT_16 # NetBSD 1.6,
-#options COMPAT_20 # NetBSD 2.0,
-#options COMPAT_30 # NetBSD 3.0, and
-#options COMPAT_40 # NetBSD 4.0 binary compatibility.
-#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
-
-no options COMPAT_LINUX # binary compatibility with Linux
-#options COMPAT_ULTRIX # binary compatibility with Ultrix
-#options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
+#ident "GENERIC64_IP3x-$Revision: 1.3 $"
Index: src/sys/arch/sgimips/conf/std.sgimips64_32
diff -u src/sys/arch/sgimips/conf/std.sgimips64_32:1.3 src/sys/arch/sgimips/conf/std.sgimips64_32:1.4
--- src/sys/arch/sgimips/conf/std.sgimips64_32:1.3 Wed Jun 4 18:18:21 2014
+++ src/sys/arch/sgimips/conf/std.sgimips64_32 Wed Feb 18 11:15:19 2015
@@ -1,4 +1,4 @@
-# $NetBSD: std.sgimips64_32,v 1.3 2014/06/04 18:18:21 macallan Exp $
+# $NetBSD: std.sgimips64_32,v 1.4 2015/02/18 11:15:19 macallan Exp $
# this is for building n32 kernels
no makeoptions MACHINE_ARCH
@@ -11,3 +11,5 @@ makeoptions LP64="no"
# for some reason this kicks in for n32 binaries as well, causing problems
# with pkgsrc ( MACHINE_ARCH vs. uname -p mismatch )
#options COMPAT_NETBSD32
+
+no options COMPAT_LINUX
