From owner-svn-src-all@FreeBSD.ORG Thu Apr 16 22:34:11 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E10955CD; Thu, 16 Apr 2015 22:34:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B266AB4; Thu, 16 Apr 2015 22:34:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3GMYBFA027701; Thu, 16 Apr 2015 22:34:11 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3GMYA2J027695; Thu, 16 Apr 2015 22:34:10 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201504162234.t3GMYA2J027695@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 16 Apr 2015 22:34:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r281627 - in head/sys: conf pc98/pc98 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Apr 2015 22:34:12 -0000 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"