[src/trunk]: src/usr.sbin/installboot Never trust a compiler that predefines ...

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

details:   https://anonhg.NetBSD.org/src/rev/f817c2665d49
branches:  trunk
changeset: 1002802:f817c2665d49
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Aug 15 19:53:01 2019 +0000

description:
Never trust a compiler that predefines i386 as 1 - do the symbol name
concatenation at the make level instead.

diffstat:

 usr.sbin/installboot/Makefile   |  4 ++--
 usr.sbin/installboot/machines.c |  8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diffs (47 lines):

diff -r 4314b6d3d72b -r f817c2665d49 usr.sbin/installboot/Makefile
--- a/usr.sbin/installboot/Makefile     Thu Aug 15 16:31:17 2019 +0000
+++ b/usr.sbin/installboot/Makefile     Thu Aug 15 19:53:01 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.53 2019/08/15 14:06:40 martin Exp $
+#      $NetBSD: Makefile,v 1.54 2019/08/15 19:53:01 martin Exp $
 #
 
 .include <bsd.own.mk>
@@ -27,7 +27,7 @@
 .if empty(ARCH_FILES)
 ARCH_FILES= ${MACHINE}.c
 .endif
-COPTS.machines.c+=     -DSINGLE_ARCH="${MACHINE}"
+COPTS.machines.c+=     -DSINGLE_ARCH=ib_mach_${MACHINE}
 .endif
 
 SRCS+=${ARCH_FILES}
diff -r 4314b6d3d72b -r f817c2665d49 usr.sbin/installboot/machines.c
--- a/usr.sbin/installboot/machines.c   Thu Aug 15 16:31:17 2019 +0000
+++ b/usr.sbin/installboot/machines.c   Thu Aug 15 19:53:01 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machines.c,v 1.41 2019/08/15 14:06:40 martin Exp $     */
+/*     $NetBSD: machines.c,v 1.42 2019/08/15 19:53:01 martin Exp $     */
 
 /*-
  * Copyright (c) 2002-2005 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(__lint)
-__RCSID("$NetBSD: machines.c,v 1.41 2019/08/15 14:06:40 martin Exp $");
+__RCSID("$NetBSD: machines.c,v 1.42 2019/08/15 19:53:01 martin Exp $");
 #endif /* !__lint */
 
 #include <sys/types.h>
@@ -43,9 +43,7 @@
 
 struct ib_mach * const machines[] = {
 #ifdef SINGLE_ARCH
-#define        IB_PREFIX(X)    ib_mach_##X
-#define        MY_ARCH(X) IB_PREFIX(X)
-    &MY_ARCH(SINGLE_ARCH),
+    &SINGLE_ARCH,
 #else
     &ib_mach_alpha,
     &ib_mach_amd64,