git: 2726978bd801 - main - Makefile.inc1: Remove redundant test for armv[67]

From: Warner Losh <imp_at_FreeBSD.org>
Date: Sat, 12 Aug 2023 04:55:34 UTC 
The branch main has been updated by imp:

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

commit 2726978bd801ceca07075f150d6ad9ef55470a21
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2022-07-05 16:16:19 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-08-12 04:55:10 +0000

    Makefile.inc1: Remove redundant test for armv[67]
    
    If MACHINE is arm, then MACHINE_ARCH is going to be either armv6* or
    armv7*.
    
    Sponsored by:           Netflix
---
 Makefile.inc1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index c102348baa6f..e3f758493fa3 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -135,7 +135,7 @@ _TARGET_CPUTYPE=${TARGET_CPUTYPE}
 _TARGET_CPUTYPE=dummy
 .endif
 .if ${TARGET} == "arm"
-.if ${TARGET_ARCH:Marmv[67]*} != "" && ${TARGET_CPUTYPE:M*soft*} == ""
+.if ${TARGET_CPUTYPE:M*soft*} == ""
 TARGET_TRIPLE_ABI=	gnueabihf
 .else
 TARGET_TRIPLE_ABI=	gnueabi