svn commit: r281627 - in head/sys: conf pc98/pc98

[Ed Maste]

Author: emaste
Date: Thu Apr 16 22:34:10 2015
New Revision: 281627
URL: https://svnweb.freebsd.org/changeset/base/281627

Log:
  Fix kernel build ${MACHINE} path
  
  $M should be the kernel machine src directory, ${MACHINE}. In most cases
  ${MACHINE} and ${MACHINE_CPUARCH} are the same, but this is not true for
  pc98 and arm64.
  
  It appears we previously set M=${MACHINE_CPUARCH} as a workaround to
  accommodate pc98, where MACHINE_CPUARCH is pc98 but it uses
  sys/i386/i386/genassym.c.
  
  arm64 relies on this being set correctly, so update $M and add explicit
  workarounds for pc98.
  
  Differential Revision:	https://reviews.freebsd.org/D2307
  Reviewed by:	andrew, imp
  Sponsored by:	The FreeBSD Foundation

Added:
  head/sys/pc98/pc98/genassym.c   (contents, props changed)
Modified:
  head/sys/conf/Makefile.pc98
  head/sys/conf/kern.pre.mk
  head/sys/conf/kmod.mk

Modified: head/sys/conf/Makefile.pc98
==============================================================================
--- head/sys/conf/Makefile.pc98	Thu Apr 16 22:30:57 2015	(r281626)
+++ head/sys/conf/Makefile.pc98	Thu Apr 16 22:34:10 2015	(r281627)
@@ -28,6 +28,9 @@ S=	./@
 S=	../../..
 .endif
 .endif
+
+LDSCRIPT_NAME?= ldscript.${MACHINE_ARCH}
+
 .include "$S/conf/kern.pre.mk"
 
 ASM_CFLAGS.mpboot.s=		${CLANG_NO_IAS34}

Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk	Thu Apr 16 22:30:57 2015	(r281626)
+++ head/sys/conf/kern.pre.mk	Thu Apr 16 22:34:10 2015	(r281627)
@@ -26,7 +26,7 @@ KODIR?=		/boot/${KERNEL}
 LDSCRIPT_NAME?=	ldscript.$M
 LDSCRIPT?=	$S/conf/${LDSCRIPT_NAME}
 
-M=		${MACHINE_CPUARCH}
+M=		${MACHINE}
 
 AWK?=		awk
 CP?=		cp

Modified: head/sys/conf/kmod.mk
==============================================================================
--- head/sys/conf/kmod.mk	Thu Apr 16 22:30:57 2015	(r281626)
+++ head/sys/conf/kmod.mk	Thu Apr 16 22:34:10 2015	(r281627)
@@ -425,10 +425,10 @@ genassym.o: opt_global.h
 .endif
 assym.s: ${SYSDIR}/kern/genassym.sh
 	sh ${SYSDIR}/kern/genassym.sh genassym.o > ${.TARGET}
-genassym.o: ${SYSDIR}/${MACHINE_CPUARCH}/${MACHINE_CPUARCH}/genassym.c
+genassym.o: ${SYSDIR}/${MACHINE}/${MACHINE}/genassym.c
 genassym.o: ${SRCS:Mopt_*.h}
 	${CC} -c ${CFLAGS:N-fno-common} \
-	    ${SYSDIR}/${MACHINE_CPUARCH}/${MACHINE_CPUARCH}/genassym.c
+	    ${SYSDIR}/${MACHINE}/${MACHINE}/genassym.c
 .endif
 
 lint: ${SRCS}

Added: head/sys/pc98/pc98/genassym.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/pc98/pc98/genassym.c	Thu Apr 16 22:34:10 2015	(r281627)
@@ -0,0 +1,3 @@
+/* $FreeBSD$ */
+
+#include "../../i386/i386/genassym.c"