Module Name: src
Committed By: matt
Date: Wed Sep 3 19:22:53 UTC 2014
Modified Files:
src/share/mk: bsd.endian.mk bsd.own.mk bsd.sys.mk
Log Message:
Change to support OR1K
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/share/mk/bsd.endian.mk
cvs rdiff -u -r1.833 -r1.834 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.244 -r1.245 src/share/mk/bsd.sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.endian.mk
diff -u src/share/mk/bsd.endian.mk:1.20 src/share/mk/bsd.endian.mk:1.21
--- src/share/mk/bsd.endian.mk:1.20 Sun Aug 10 05:57:31 2014
+++ src/share/mk/bsd.endian.mk Wed Sep 3 19:22:53 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.endian.mk,v 1.20 2014/08/10 05:57:31 matt Exp $
+# $NetBSD: bsd.endian.mk,v 1.21 2014/09/03 19:22:53 matt Exp $
.if !defined(_BSD_ENDIAN_MK_)
_BSD_ENDIAN_MK_=1
@@ -19,6 +19,7 @@ TARGET_ENDIANNESS= 1234
${MACHINE_ARCH} == "hppa" || \
${MACHINE_ARCH} == "m68000" || \
${MACHINE_ARCH} == "m68k" || \
+ ${MACHINE_ARCH} == "or1k" || \
${MACHINE_ARCH} == "powerpc" || \
${MACHINE_ARCH} == "powerpc64" || \
${MACHINE_ARCH} == "sparc" || \
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.833 src/share/mk/bsd.own.mk:1.834
--- src/share/mk/bsd.own.mk:1.833 Sat Aug 23 02:26:36 2014
+++ src/share/mk/bsd.own.mk Wed Sep 3 19:22:53 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.833 2014/08/23 02:26:36 matt Exp $
+# $NetBSD: bsd.own.mk,v 1.834 2014/09/03 19:22:53 matt Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -14,7 +14,7 @@ MAKECONF?= /etc/mk.conf
#
# CPU model, derived from MACHINE_ARCH
#
-MACHINE_CPU= ${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/coldfire/m68k/:S/m68000/m68k/:C/arm.*/arm/:C/earm.*/arm/:S/earm/arm/:S/powerpc64/powerpc/:S/aarch64eb/aarch64/}
+MACHINE_CPU= ${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/coldfire/m68k/:S/m68000/m68k/:C/arm.*/arm/:C/earm.*/arm/:S/earm/arm/:S/powerpc64/powerpc/:S/aarch64eb/aarch64/:S/or1knd/or1k/}
#
# Subdirectory used below ${RELEASEDIR} when building a release
@@ -711,6 +711,13 @@ MKGCC:= no
# No GDB support for aarch64
MKGDB.aarch64= no
+MKGDB.or1k= no
+
+# No kernel modules for or1k (yet)
+MKKMOD.or1k= no
+
+# No profiling for or1k (yet)
+MKPROFILE.or1k= no
#
# The m68000 port is incomplete.
@@ -901,10 +908,11 @@ MKCOMPATMODULES:= no
# arm is always softfloat unless it isn't
# emips is always softfloat.
# coldfire is always softfloat
+# or1k is always softfloat
#
.if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" || \
(${MACHINE_CPU} == "arm" && ${MACHINE_ARCH:M*hf*} == "") || \
- ${MACHINE_ARCH} == "coldfire" || \
+ ${MACHINE_ARCH} == "coldfire" || ${MACHINE_CPU} == "or1k" || \
${MACHINE} == "emips"
MKSOFTFLOAT?= yes
.endif
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.244 src/share/mk/bsd.sys.mk:1.245
--- src/share/mk/bsd.sys.mk:1.244 Thu Aug 14 18:39:38 2014
+++ src/share/mk/bsd.sys.mk Wed Sep 3 19:22:53 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.244 2014/08/14 18:39:38 joerg Exp $
+# $NetBSD: bsd.sys.mk,v 1.245 2014/09/03 19:22:53 matt Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -116,7 +116,8 @@ COPTS+= -fstack-protector -Wstack-protec
.if "${ACTIVE_CC}" == "gcc" && "${HAVE_GCC}" == "48" && \
( ${MACHINE_CPU} == "sh3" || \
${MACHINE_ARCH} == "vax" || \
- ${MACHINE_CPU} == "m68k" )
+ ${MACHINE_CPU} == "m68k" || \
+ ${MACHINE_CPU} == "or1k" )
COPTS+= -Wno-error=stack-protector
.endif
