Module Name: src Committed By: martin Date: Thu Aug 15 19:53:01 UTC 2019
Modified Files: src/usr.sbin/installboot: Makefile machines.c Log Message: Never trust a compiler that predefines i386 as 1 - do the symbol name concatenation at the make level instead. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/usr.sbin/installboot/Makefile cvs rdiff -u -r1.41 -r1.42 src/usr.sbin/installboot/machines.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.sbin/installboot/Makefile diff -u src/usr.sbin/installboot/Makefile:1.53 src/usr.sbin/installboot/Makefile:1.54 --- src/usr.sbin/installboot/Makefile:1.53 Thu Aug 15 14:06:40 2019 +++ src/usr.sbin/installboot/Makefile Thu Aug 15 19:53:01 2019 @@ -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 @@ ARCH_FILES?= ${ARCH_XLAT:M${MACHINE}-*:S .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} Index: src/usr.sbin/installboot/machines.c diff -u src/usr.sbin/installboot/machines.c:1.41 src/usr.sbin/installboot/machines.c:1.42 --- src/usr.sbin/installboot/machines.c:1.41 Thu Aug 15 14:06:40 2019 +++ src/usr.sbin/installboot/machines.c Thu Aug 15 19:53:01 2019 @@ -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 @@ __RCSID("$NetBSD: machines.c,v 1.41 2019 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,