From nobody Fri Nov 11 15:54:18 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N83DB3Qxvz4f4gh; Fri, 11 Nov 2022 15:54:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N83DB2xZ5z4NKx; Fri, 11 Nov 2022 15:54:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668182058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RiteaDrr1qZkm5Yx4ptlXBUF1jkScIhuvX3b+7YbrgQ=; b=X6XFTnMjualdUpm14oi2w8BkvcUS5ZEgxy3SwQ2BffBTJ525faaTiUEpixR8uY6LSIle/7 Z3hpB915y5hLHBMvwE3p6pztSe4lInyFpBZHrYXTMd8OnFTlmpyO/re2f+WuwIKlDHUqC3 z0JiEmNnHEqJ3bnB7ZLbinKs9UqSlbc8f2hrDgUYZRfd1MtC4J3BCdNFXZrN+mOlF46U7I LsnSgnFTQ50R/a1yZ7X3HifzAoKOizGHN0C/5TA7K4V0KfrRugHL2N7Xyz9KLOUcSZzbuI cHtb9Nspx2PjpCNHt++colIGoEasaLneyDF3mbN8UJe66dax1l8w/nkQLmjNNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668182058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RiteaDrr1qZkm5Yx4ptlXBUF1jkScIhuvX3b+7YbrgQ=; b=OMQJNYutOruL13DcJz7wz4hL4gzKYGGjRTxAyZiWvMsRTzvGmFXO5fvsLHUOWK/1W0xmAc RMvhsU6tRx9VVSgdDL/GbKdVAG6srzhesnyZ/ER+4L5ViX9Dxbd9TPPNdIeH0JEH5ytvjV FBy7CGKdtx9iPxSGfExPNpiv+xR4g4/r48XMTFy2nW+/nl8Zn1hQ9m1dHWfaaYatHQUCvV KT8EMXlZgmuda646YIRh1y8FhnkTqD9fDPHl18/0R3KKQvayDrAzRfPyv7EfD1nnw3ny/M s16iY03Yok3ZMN0STXN/clm3dl5IY0N/yOsSn3ZQUusVQTPOt1LhgTTwlDNOxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668182058; a=rsa-sha256; cv=none; b=XXzMH2PSzTwV2U917IHi/MHohFpU3NNOYSm8/J94gOcQrTZht04cVGNvIH/RhYexpYsF6z lXylN+24nTgxH51eR4eFB2QLFT/etj1FFaf45/ib8u7BJd8nE3WpZL5+BfYkb/n3HREfzX szRxo+maeWfAMnhmmTFH2Aic5ghXnTJKx4KP3Prm6883vA1CK8mJ/e1xLHxJZ8zZkgug9U lNBLIYc1zL6NUo9/IAfP8CXhImbKZHRu/xoNUkljux19J/JtQCH79Ew93yrnbrgrXE5sgQ flklpG2AmSM1sL/01RvLULXUa3X0BBoBAGaPDvA1p+gtdnSnVFe42vUrfBexyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N83DB20JDznyG; Fri, 11 Nov 2022 15:54:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2ABFsIok066737; Fri, 11 Nov 2022 15:54:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ABFsIUY066736; Fri, 11 Nov 2022 15:54:18 GMT (envelope-from git) Date: Fri, 11 Nov 2022 15:54:18 GMT Message-Id: <202211111554.2ABFsIUY066736@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konrad Witaszczyk Subject: git: f0d122573451 - main - Remove dead code in the cscope target List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: def X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f0d1225734519a74e04b482fe54ae33d08627bcd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by def: URL: https://cgit.FreeBSD.org/src/commit/?id=f0d1225734519a74e04b482fe54ae33d08627bcd commit f0d1225734519a74e04b482fe54ae33d08627bcd Author: Konrad Witaszczyk AuthorDate: 2022-08-31 10:57:50 +0000 Commit: Konrad Witaszczyk 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