[src/trunk]: src/share/mk add some comments and prefer MACHINE over MACHINE_A...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c1fb68e1ca20
branches:  trunk
changeset: 814647:c1fb68e1ca20
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Apr 02 22:08:14 2016 +0000

description:
add some comments and prefer MACHINE over MACHINE_ARCH when
they're always the same.  no functional change.

diffstat:

 share/mk/bsd.own.mk |  33 +++++++++++++++++++++------------
 1 files changed, 21 insertions(+), 12 deletions(-)

diffs (82 lines):

diff -r aeba644addd3 -r c1fb68e1ca20 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Sat Apr 02 21:21:57 2016 +0000
+++ b/share/mk/bsd.own.mk       Sat Apr 02 22:08:14 2016 +0000
@@ -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 @@
 #
 .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?=       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 @@
 .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
 .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