git: 06999c8a3a3c - main - share/mk: Remove armv6 support

The branch main has been updated by andrew:

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

commit 06999c8a3a3cbd254b8e52b25549e5f5222dafa6
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2024-07-12 11:28:44 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2024-07-12 11:31:54 +0000

    share/mk: Remove armv6 support
    
    It is being removed from the tree. Remove the build infrastructure to
    configure armv6 builds.
    
    Reviewed by:    manu, imp, emaste
    Sponsored by:   Arm Ltd
    Differential Revision:  https://reviews.freebsd.org/D45643
---
 share/mk/bsd.cpu.mk  | 5 +----
 share/mk/bsd.opts.mk | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk
index 793c01b76dca..29eb4662dcdd 100644
--- a/share/mk/bsd.cpu.mk
+++ b/share/mk/bsd.cpu.mk
@@ -315,13 +315,10 @@ MACHINE_CPU = riscv
 ########## arm
 .if ${MACHINE_CPUARCH} == "arm"
 MACHINE_CPU += arm
-. if ${MACHINE_ARCH:Marmv6*} != ""
-MACHINE_CPU += armv6
-. endif
 . if ${MACHINE_ARCH:Marmv7*} != ""
 MACHINE_CPU += armv7
 . endif
-# Normally armv6 and armv7 are hard float ABI from FreeBSD 11 onwards. However
+# Normally armv7 is hard float ABI from FreeBSD 11 onwards. However
 # when CPUTYPE has 'soft' in it, we use the soft-float ABI to allow building of
 # soft-float ABI libraries. In this case, we have to add the -mfloat-abi=softfp
 # to force that.
diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk
index 18098c93605c..136215a2db47 100644
--- a/share/mk/bsd.opts.mk
+++ b/share/mk/bsd.opts.mk
@@ -95,7 +95,7 @@ __DEFAULT_DEPENDENT_OPTIONS = \
 # means that ASLR is of limited effectiveness, and it may cause issues with
 # some memory-hungry workloads.
 #
-.if ${MACHINE_ARCH} == "armv6" || ${MACHINE_ARCH} == "armv7" \
+.if ${MACHINE_ARCH} == "armv7" \
     || ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" \
     || ${MACHINE_ARCH} == "powerpcspe"
 __DEFAULT_NO_OPTIONS+= PIE