From nobody Thu Oct 20 16:49:07 2022 X-Original-To: dev-commits-src-all@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 4MtYTb70MHz4g2c0; Thu, 20 Oct 2022 16:49:07 +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 4MtYTb6K7xz4GJ5; Thu, 20 Oct 2022 16:49:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666284547; 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=ckl5Yfv2QQg5BoRNedrWQOfrGBGVo/zL293L+ngu0E8=; b=EJodE4QaBLcZn4joS5RV8Bc8764fs8ci/A1g10pZK4vW6MASkeq/Z62fK76/aTf5b/hcvB +klq+wG2PEbZj/Jb8kDtIW/T61OtoPmfJzFexvxYJGABp39ZF+/kIHdVBx83mi55ihG1Fi xj4BD/sFKG/ww+B2S5SSFM04jAzOn4wyxYK5nz95sN3+MVM6hK28e8zpDqOpYXFHLEtxaJ 25l2UqkoI4pBxwxw8uqBc+8klQ5pATa1WW0lV51X4td3g1UodZ1FaEiQc4L6YdZK0f3pxQ hPm1CmGdRtbDc8i+7uraWJT6t1wFG93DL+UHSVpZ91O3FeyO2dmhGE7DTJlWYA== 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 4MtYTb5DnnzwXJ; Thu, 20 Oct 2022 16:49:07 +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 29KGn72q015352; Thu, 20 Oct 2022 16:49:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29KGn7hT015351; Thu, 20 Oct 2022 16:49:07 GMT (envelope-from git) Date: Thu, 20 Oct 2022 16:49:07 GMT Message-Id: <202210201649.29KGn7hT015351@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f9d615746fa6 - main - arm: Remove useless armv6/armv7 options List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f9d615746fa6b179c247518d179c47199d4a86d4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666284547; 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=ckl5Yfv2QQg5BoRNedrWQOfrGBGVo/zL293L+ngu0E8=; b=SpnO0qJEHl8LUDP3juhJ+T1nEakGFldTdY3++SzHolMCtalQ2Vbg3jWxJxy44dabmmPSLl fNQHGiqucxsb+YXK3CQvfdmDpP3v9T9S5lJZeOpNu9vT0WIkROi1v1ot+i/PfL3NW8DnXp iW/4WOf55tzHDWSW26Z808Zd/g/89RSRzVsUux1bGCRuYqYLW9GBvmQCHDyl52AI8cdm7M G/pFKP/PxVXouygyUJyLhLcS7oa6j5Gb+QSzs9HWvSwv3+aYLAG51Gr08Ojtk8suwLmWHw 8x0gCKl+GCFNixK+RG7u7+9qz4nE+/CC8FGCwXUO00SssktlbX3hNo3ULVhaYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666284547; a=rsa-sha256; cv=none; b=AE3NNjWCyJY84v1XeHRe5S2ZSPvSkTubIknm5av6oWLZTJEkfcuhgPA3+uAR0cx5R1C8YZ cKOqB9pqfXigTK/z2zWoZ2TVZpU6GSL4xBaf/2Rt2Ttypf2YCeCOmuoAi90oAjP+Y8eTEp IfdWkgskA/0+QuxTQ8tb3vv6jTSjJviPt0SEgv4GAUDSvcBUEMSZLzl8Gy2SuZbTA+AJPl gxL+8BRnA9MsuwRv+NJF4LxtOXL93n0lvX5G82tJiUOiZ4FuZ+2bIP3Ip+2g2AdU+8mTVM D3QSipwld5CQwmilvkdvIZQGLGrMEHv0oAXepGURE05Yaq5uTP4SDV36PQPeiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f9d615746fa6b179c247518d179c47199d4a86d4 commit f9d615746fa6b179c247518d179c47199d4a86d4 Author: Warner Losh AuthorDate: 2022-10-20 15:02:28 +0000 Commit: Warner Losh CommitDate: 2022-10-20 16:48:31 +0000 arm: Remove useless armv6/armv7 options Cleanup another remnant of the armv4/armv5 support. Now that we always define armv6 or armv7, these lines can be deleted (execpt hwpmc_armv7.c which now needs just one line). Since we don't do anything different between armv6 and armv7 from a config file selection point of view, delete them from options.arm. We are extremely unlikely to grow anything new here during the remaining lifetime of 32-bit arm in FreeBSD. Sponsored by: Netflix Reviewed by: kevans, andrew Differential Revision: https://reviews.freebsd.org/D37069 --- sys/conf/files.arm | 10 +--------- sys/conf/options.arm | 2 -- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/sys/conf/files.arm b/sys/conf/files.arm index c7e8a52a813d..e31c3b9c8b60 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -77,7 +77,6 @@ arm/arm/undefined.c standard arm/arm/unwind.c optional ddb | kdtrace_hooks | stack arm/arm/vm_machdep.c standard arm/arm/vfp.c standard -cddl/compat/opensolaris/kern/opensolaris_atomic.c optional !armv7 !armv6 zfs | !armv7 !armv6 dtrace compile-with "${CDDL_C}" cddl/dev/dtrace/arm/dtrace_asm.S optional dtrace compile-with "${DTRACE_S}" cddl/dev/dtrace/arm/dtrace_subr.c optional dtrace compile-with "${DTRACE_C}" cddl/dev/fbt/arm/fbt_isa.c optional dtrace_fbt | dtraceall compile-with "${FBT_C}" @@ -89,8 +88,7 @@ dev/fb/fb.c optional sc dev/fdt/fdt_arm_platform.c optional platform fdt dev/hdmi/hdmi_if.m optional hdmi dev/hwpmc/hwpmc_arm.c optional hwpmc -dev/hwpmc/hwpmc_armv7.c optional hwpmc armv6 -dev/hwpmc/hwpmc_armv7.c optional hwpmc armv7 +dev/hwpmc/hwpmc_armv7.c optional hwpmc dev/iicbus/twsi/twsi.c optional twsi dev/ofw/ofw_pcib.c optional fdt pci dev/pci/pci_host_generic.c optional pci_host_generic pci @@ -112,7 +110,6 @@ kern/subr_physmem.c standard kern/subr_sfbuf.c standard libkern/arm/aeabi_unwind.c standard libkern/arm/divsi3.S standard -libkern/arm/ffs.S optional !armv7 !armv6 libkern/arm/ldivmod.S standard libkern/arm/ldivmod_helper.c standard libkern/arm/memclr.S standard @@ -122,11 +119,6 @@ libkern/arm/muldi3.c standard libkern/ashldi3.c standard libkern/ashrdi3.c standard libkern/divdi3.c standard -libkern/ffsl.c optional !armv7 !armv6 -libkern/ffsll.c optional !armv7 !armv6 -libkern/fls.c optional !armv7 !armv6 -libkern/flsl.c optional !armv7 !armv6 -libkern/flsll.c optional !armv7 !armv6 libkern/lshrdi3.c standard libkern/moddi3.c standard libkern/qdivrem.c standard diff --git a/sys/conf/options.arm b/sys/conf/options.arm index 0e5726e9713e..cdf98a35fcb4 100644 --- a/sys/conf/options.arm +++ b/sys/conf/options.arm @@ -1,6 +1,4 @@ #$FreeBSD$ -ARMV6 opt_global.h -ARMV7 opt_global.h ARM_FORCE_DBG_MONITOR_DISABLE opt_ddb.h CPSW_ETHERSWITCH opt_cpsw.h CPU_ARM1176 opt_global.h