svn commit: r360606 - stable/11/stand

[Dimitry Andric]

Author: dim
Date: Sun May  3 15:39:10 2020
New Revision: 360606
URL: https://svnweb.freebsd.org/changeset/base/360606

Log:
  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
  
  Note, only the stand/defs.mk changes were applied, as this fixes the
  following error during buildworld for TARGET=pc98:
  
  --- cleandir_subdir_stand ---
  rm: i386: is a directory
  *** [clean] Error code 1

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 15:08:32 2020	(r360605)
+++ stable/11/stand/defs.mk	Sun May  3 15:39:10 2020	(r360606)
@@ -188,14 +188,15 @@ CFLAGS+=-I.
 all: ${PROG}
 
 .if !defined(NO_OBJ)
-_ILINKS=machine
+_ILINKS=include/machine
 .if ${MACHINE} != ${MACHINE_CPUARCH} && ${MACHINE} != "arm64"
-_ILINKS+=${MACHINE_CPUARCH}
+_ILINKS+=include/${MACHINE_CPUARCH}
 .endif
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
-_ILINKS+=x86
+_ILINKS+=include/x86
 .endif
-CLEANFILES+=${_ILINKS}
+CFLAGS+= -Iinclude
+CLEANDIRS+= include
 
 beforedepend: ${_ILINKS}
 beforebuild: ${_ILINKS}
@@ -210,8 +211,8 @@ ${OBJS}:       ${_link}
 
 .NOPATH: ${_ILINKS}
 
-${_ILINKS}:
-	@case ${.TARGET} in \
+${_ILINKS}: .NOMETA
+	@case ${.TARGET:T} in \
 	machine) \
 		if [ ${DO32:U0} -eq 0 ]; then \
 			path=${SYSDIR}/${MACHINE}/include ; \
@@ -221,8 +222,11 @@ ${_ILINKS}:
 	*) \
 		path=${SYSDIR}/${.TARGET:T}/include ;; \
 	esac ; \
+	case ${.TARGET} in \
+	*/*) mkdir -p ${.TARGET:H};; \
+	esac ; \
 	path=`(cd $$path && /bin/pwd)` ; \
-	${ECHO} ${.TARGET:T} "->" $$path ; \
-	ln -fhs $$path ${.TARGET:T}
+	${ECHO} ${.TARGET} "->" $$path ; \
+	ln -fhs $$path ${.TARGET}
 .endif # !NO_OBJ
 .endif # __BOOT_DEFS_MK__