diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2015-04-16 22:34:10 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2015-04-16 22:34:10 +0000 |
| commit | 7dd824c370b73e1d0674a8f61551213593d8395b (patch) | |
| tree | 85d9b7d816c16258512bea040df0b920150172e6 /sys/conf/Makefile.pc98 | |
| parent | dec32474f0ba1288bc3b0a10c864ec65ce2d831e (diff) | |
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
Notes
Notes:
svn path=/head/; revision=281627
Diffstat (limited to 'sys/conf/Makefile.pc98')
| -rw-r--r-- | sys/conf/Makefile.pc98 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98 index 9d0f25b57a57..1bd5bae805f7 100644 --- a/sys/conf/Makefile.pc98 +++ b/sys/conf/Makefile.pc98 @@ -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} |