Module Name: src
Committed By: mrg
Date: Sat Apr 2 22:08:14 UTC 2016
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
add some comments and prefer MACHINE over MACHINE_ARCH when
they're always the same. no functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.915 -r1.916 src/share/mk/bsd.own.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.own.mk
diff -u src/share/mk/bsd.own.mk:1.915 src/share/mk/bsd.own.mk:1.916
--- src/share/mk/bsd.own.mk:1.915 Wed Mar 30 20:18:18 2016
+++ src/share/mk/bsd.own.mk Sat Apr 2 22:08:14 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.915 2016/03/30 20:18:18 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.916 2016/04/02 22:08:14 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -61,11 +61,14 @@ MKGCC?= no
#
.if ${MKGCC:Uyes} != "no"
+#
+# What GCC is used?
+#
.if ${MACHINE_CPU} == "aarch64"
HAVE_GCC?= 0
.elif \
- ${MACHINE_ARCH} == "alpha" || \
- ${MACHINE_ARCH} == "hppa" || \
+ ${MACHINE} == "alpha" || \
+ ${MACHINE} == "hppa" || \
${MACHINE} == "playstation2" || \
${MACHINE_ARCH} == "vax"
HAVE_GCC?= 53
@@ -121,10 +124,10 @@ HAVE_LIBGCC_EH?= no
HAVE_LIBGCC_EH?= yes
.endif
-.if (${MACHINE_ARCH} == "alpha") || \
- (${MACHINE_ARCH} == "hppa") || \
- (${MACHINE_ARCH} == "ia64") || \
- (${MACHINE_CPU} == "mips")
+.if ${MACHINE} == "alpha" || \
+ ${MACHINE} == "hppa" || \
+ ${MACHINE} == "ia64" || \
+ ${MACHINE_CPU} == "mips"
HAVE_SSP?= no
.else
HAVE_SSP?= yes
@@ -133,12 +136,15 @@ USE_SSP?= yes
.endif
.endif
+#
+# What GDB is used?
+#
.if ${MACHINE} == "amd64" || \
${MACHINE} == "i386" || \
${MACHINE} == "playstation2" || \
+ ${MACHINE} == "sparc" || \
+ ${MACHINE} == "vax" || \
${MACHINE_CPU} == "sh3" || \
- ${MACHINE_ARCH} == "sparc" || \
- ${MACHINE_ARCH} == "vax" || \
${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
HAVE_GDB?= 710
.else
@@ -151,16 +157,19 @@ EXTERNAL_GDB_SUBDIR= gdb.old
EXTERNAL_GDB_SUBDIR= gdb
.endif
+#
+# What binutils is used?
+#
.if ${MACHINE} == "amd64" || \
${MACHINE} == "evbarm" || \
${MACHINE} == "i386" || \
${MACHINE} == "hppa" || \
${MACHINE} == "playstation2" || \
- ${MACHINE_CPU} == "sh3" || \
${MACHINE} == "sparc" || \
${MACHINE} == "sparc64" || \
- ${MACHINE_ARCH} == "powerpc" || \
- ${MACHINE_ARCH} == "vax"
+ ${MACHINE} == "vax" || \
+ ${MACHINE_CPU} == "sh3" || \
+ ${MACHINE_ARCH} == "powerpc"
HAVE_BINUTILS?= 226
.else
HAVE_BINUTILS?= 223
