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

1 files changed, 8 insertions, 12 deletions

diff --git a/stand/defs.mk b/stand/defs.mk
index af69921c78f2..4e160ce1b478 100644
--- a/stand/defs.mk
+++ b/stand/defs.mk
@@ -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__