Date: Sun, 3 May 2020 16:52:00 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r360611 - stable/11/stand Message-ID: <202005031652.043Gq0T8017876@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Sun May 3 16:51:59 2020 New Revision: 360611 URL: https://svnweb.freebsd.org/changeset/base/360611 Log: Revert r360606, as it results in linker set errors while building for amd64, I'll have to re-do this more carefully: Un-MFC r354043 (partial, by sjg): Add support for hypervisor check on x86 Add ficl words for isvirtualized and move ficl inb and outb words to ficl/x86/sysdep.c so can be shared by i386 and amd64 Reviewed by: imp bdrewery Sponsored by: Juniper Networks Differential Revision: https://reviews.freebsd.org/D22069 Modified: stable/11/stand/defs.mk Directory Properties: stable/11/ (props changed) Modified: stable/11/stand/defs.mk ============================================================================== --- stable/11/stand/defs.mk Sun May 3 16:14:55 2020 (r360610) +++ stable/11/stand/defs.mk Sun May 3 16:51:59 2020 (r360611) @@ -188,15 +188,14 @@ CFLAGS+=-I. all: ${PROG} .if !defined(NO_OBJ) -_ILINKS=include/machine +_ILINKS=machine .if ${MACHINE} != ${MACHINE_CPUARCH} && ${MACHINE} != "arm64" -_ILINKS+=include/${MACHINE_CPUARCH} +_ILINKS+=${MACHINE_CPUARCH} .endif .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" -_ILINKS+=include/x86 +_ILINKS+=x86 .endif -CFLAGS+= -Iinclude -CLEANDIRS+= include +CLEANFILES+=${_ILINKS} beforedepend: ${_ILINKS} beforebuild: ${_ILINKS} @@ -211,8 +210,8 @@ ${OBJS}: ${_link} .NOPATH: ${_ILINKS} -${_ILINKS}: .NOMETA - @case ${.TARGET:T} in \ +${_ILINKS}: + @case ${.TARGET} in \ machine) \ if [ ${DO32:U0} -eq 0 ]; then \ path=${SYSDIR}/${MACHINE}/include ; \ @@ -222,11 +221,8 @@ ${_ILINKS}: .NOMETA *) \ path=${SYSDIR}/${.TARGET:T}/include ;; \ esac ; \ - case ${.TARGET} in \ - */*) mkdir -p ${.TARGET:H};; \ - esac ; \ path=`(cd $$path && /bin/pwd)` ; \ - ${ECHO} ${.TARGET} "->" $$path ; \ - ln -fhs $$path ${.TARGET} + ${ECHO} ${.TARGET:T} "->" $$path ; \ + ln -fhs $$path ${.TARGET:T} .endif # !NO_OBJ .endif # __BOOT_DEFS_MK__
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005031652.043Gq0T8017876>