diff --git a/sys/Makefile b/sys/Makefile
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -7,17 +7,14 @@
 		netsmb nfs nfsclient nfsserver nlm ofed opencrypto \
 		rpc security sys ufs vm xdr xen ${CSCOPE_ARCHDIR}
 .if !defined(CSCOPE_ARCHDIR)
-.if defined(ALL_ARCH)
+.  if defined(ALL_ARCH)
 CSCOPE_ARCHDIR = amd64 arm arm64 i386 powerpc riscv x86
-.else
+.  else
 CSCOPE_ARCHDIR = ${MACHINE}
-.if ${MACHINE} != ${MACHINE_CPUARCH}
-CSCOPE_ARCHDIR += ${MACHINE_CPUARCH}
-.endif
-.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
+.    if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 CSCOPE_ARCHDIR += x86
-.endif
-.endif
+.    endif
+.  endif
 .endif
 
 HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh`