git: 55c0af86ce74 - stable/13 - Bring the tags and links entries for amd64 up to date.

The branch stable/13 has been updated by mckusick:

URL: https://cgit.FreeBSD.org/src/commit/?id=55c0af86ce740747e8f5d79131d2ef02d31f97c4

commit 55c0af86ce740747e8f5d79131d2ef02d31f97c4
Author:     Kirk McKusick <mckusick@FreeBSD.org>
AuthorDate: 2021-09-23 23:38:37 +0000
Commit:     Kirk McKusick <mckusick@FreeBSD.org>
CommitDate: 2021-10-07 23:01:46 +0000

    Bring the tags and links entries for amd64 up to date.
    
    Sponsored by: Netflix
    
    (cherry picked from commit 1c8d670cb633d39cea68cdeecab507d2ee264705)
---
 sys/amd64/Makefile     | 8 +++++---
 sys/kern/Make.tags.inc | 6 ------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/sys/amd64/Makefile b/sys/amd64/Makefile
index 2e87b95895e7..0f1367f859f2 100644
--- a/sys/amd64/Makefile
+++ b/sys/amd64/Makefile
@@ -14,7 +14,7 @@ all:
 	@echo "make links or tags only"
 
 # Directories in which to place amd64 tags links
-DAMD64=	acpica amd64 ia32 include linux linux32 pci vmm
+DAMD64=	acpica amd64 ia32 include linux linux32 pci sgx vmm
 
 links::
 	-for i in ${COMMDIR1}; do \
@@ -22,13 +22,13 @@ links::
 	-for i in ${COMMDIR2}; do \
 	    (cd $$i && { rm -f tags; ln -s ../../${TAGDIR}/tags tags; }) done
 	-for i in ${DAMD64}; do \
-	    (cd $$i && { rm -f tags; ln -s ../tags tags; }) done
+	    (cd ${SYS}/amd64/$$i && { rm -f tags; ln -s ../tags tags; }) done
 
 SAMD64=	${SYS}/amd64/acpica/*.[ch] \
 	${SYS}/amd64/amd64/*.[ch] ${SYS}/amd64/ia32/*.[ch] \
 	${SYS}/amd64/include/*.[ch] ${SYS}/amd64/linux/*.[ch] \
 	${SYS}/amd64/linux32/*.[ch] ${SYS}/amd64/pci/*.[ch] \
-	${SYS}/amd64/vmm/*.[ch]
+	${SYS}/amd64/sgx/*.[ch] ${SYS}/amd64/vmm/*.[ch]
 AAMD64=	${SYS}/amd64/amd64/*.S
 
 tags::
@@ -38,3 +38,5 @@ tags::
 		>> tags
 	sort -o tags tags
 	chmod 444 tags
+	rm -f ${SYS}/amd64/tags
+	mv tags ${SYS}/amd64/tags
diff --git a/sys/kern/Make.tags.inc b/sys/kern/Make.tags.inc
index cdefa98a32f6..23a85150c19a 100644
--- a/sys/kern/Make.tags.inc
+++ b/sys/kern/Make.tags.inc
@@ -12,12 +12,10 @@ SYS?=	${.CURDIR}/..
 
 COMM=	${SYS}/sys/vnode.h \
 	${SYS}/dev/alc/*.[ch] \
-	${SYS}/dev/en/*.[ch] \
 	${SYS}/dev/iicbus/*.[ch] \
 	${SYS}/dev/isp/*.[ch] \
 	${SYS}/dev/ppbus/*.[ch] \
 	${SYS}/dev/smbus/*.[ch] \
-	${SYS}/dev/vx/*.[ch] \
 	${SYS}/fs/autofs/*.[ch] \
 	${SYS}/fs/cd9660/*.[ch] \
 	${SYS}/fs/cuse/*.[ch] \
@@ -44,7 +42,6 @@ COMM=	${SYS}/sys/vnode.h \
 	${SYS}/netinet/*.[ch] \
 	${SYS}/netinet6/*.[ch] \
 	${SYS}/netipsec/*.[ch] \
-	${SYS}/netnatm/*.[ch] \
 	${SYS}/ddb/*.[ch] \
 	${SYS}/ufs/ffs/*.[ch] \
 	${SYS}/ufs/ufs/*.[ch] \
@@ -58,19 +55,16 @@ COMMDIR1= ${SYS}/conf \
 	${SYS}/netinet \
 	${SYS}/netinet6 \
 	${SYS}/netipsec \
-	${SYS}/netnatm \
 	${SYS}/ddb \
 	${SYS}/vm \
 	${SYS}/sys
 
 COMMDIR2= ${SYS}/dev/alc \
-	${SYS}/dev/en \
 	${SYS}/dev/iicbus \
 	${SYS}/dev/isp \
 	${SYS}/dev/md \
 	${SYS}/dev/ppbus \
 	${SYS}/dev/smbus \
-	${SYS}/dev/vx \
 	${SYS}/fs/autofs \
 	${SYS}/fs/cd9660 \
 	${SYS}/fs/cuse \