git: f0d122573451 - main - Remove dead code in the cscope target

From: Konrad Witaszczyk <def_at_FreeBSD.org>
Date: Fri, 11 Nov 2022 15:54:18 UTC
The branch main has been updated by def:

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

commit f0d1225734519a74e04b482fe54ae33d08627bcd
Author:     Konrad Witaszczyk <def@FreeBSD.org>
AuthorDate: 2022-08-31 10:57:50 +0000
Commit:     Konrad Witaszczyk <def@FreeBSD.org>
CommitDate: 2022-11-11 15:53:57 +0000

    Remove dead code in the cscope target
    
    arm64 is the only currently supported architecture that has
    ${MACHINE_CPUARCH} set to a different value (aarch64) than ${MACHINE}
    (arm64), as described in arch(7). However, there is no source directory
    associated with arm64 that has a name set to ${MACHINE_CPUARCH}.
    
    Remove the dead code that adds a directory with a name set to
    ${MACHINE_CPUARCH} to a list of directories indexed with cscope.
    This change allows to use the cscope target on arm64.
    
    Discussed with: jhb
    Reviewed by:    imp jhb
    Approved by:    oshogbo (mentor)
    Differential Revision:  https://reviews.freebsd.org/D36402
---
 sys/Makefile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sys/Makefile b/sys/Makefile
index a193bbc2b29d..18e0b7e5281b 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -11,9 +11,6 @@ CSCOPEDIRS=	bsm cam cddl compat conf contrib crypto ddb dev fs gdb \
 CSCOPE_ARCHDIR = amd64 arm arm64 i386 powerpc riscv x86
 .else
 CSCOPE_ARCHDIR = ${MACHINE}
-.if ${MACHINE} != ${MACHINE_CPUARCH}
-CSCOPE_ARCHDIR += ${MACHINE_CPUARCH}
-.endif
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 CSCOPE_ARCHDIR += x86
 .endif