git: 98d03dca9ac8 - main - universe: Demote armv6 to an extra architecture.

The branch main has been updated by imp:

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

commit 98d03dca9ac8e3eb5857c72768e200e2bb0c3800
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2023-07-28 04:21:44 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-07-28 04:30:41 +0000

    universe: Demote armv6 to an extra architecture.
    
    Per discussions over how to lighten the load of armv6, move it to an
    extra arch. You can still build TARGET_ARCH=armv6 if you desire, but
    it won't be built as part of 'make universe' without -DEXTRA_TARGETS.
    
    Sponsored by:           Netflix
---
 Makefile                | 3 +++
 share/mk/sys.machine.mk | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 699f003bf7df..36aa23db1f53 100644
--- a/Makefile
+++ b/Makefile
@@ -536,6 +536,9 @@ worlds: .PHONY
 # Don't build rarely used, semi-supported architectures unless requested.
 #
 .if defined(EXTRA_TARGETS)
+# armv6's importance has waned enough to make building it the exception rather
+# than the rule.
+EXTRA_ARCHES_arm=	armv6
 # powerpcspe excluded from main list until clang fixed
 EXTRA_ARCHES_powerpc=	powerpcspe
 .endif
diff --git a/share/mk/sys.machine.mk b/share/mk/sys.machine.mk
index 445aaa4b62fd..716dd17d5cce 100644
--- a/share/mk/sys.machine.mk
+++ b/share/mk/sys.machine.mk
@@ -6,7 +6,7 @@ TARGET_MACHINE_LIST?= amd64 arm arm64 i386 powerpc riscv
 
 MACHINE_ARCH_host?= ${_HOST_ARCH}
 
-MACHINE_ARCH_LIST_arm?= armv6 armv7
+MACHINE_ARCH_LIST_arm?= armv7 ${EXTRA_ARCHES_arm}
 MACHINE_ARCH_LIST_arm64?= aarch64
 MACHINE_ARCH_LIST_powerpc?= powerpc powerpc64 powerpc64le ${EXTRA_ARCHES_powerpc}
 MACHINE_ARCH_LIST_riscv?= riscv64