From nobody Sat Aug 12 04:55:34 2023 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 4RN7dg2bSjz4Tmsm; Sat, 12 Aug 2023 04:55:35 +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 4RN7dg22lMz3Mtx; Sat, 12 Aug 2023 04:55:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691816135; 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=tVGK2C3axYi72Dt0Kt4nmwMU6UNATX+xUHDPQF3H4lY=; b=Fy87WYE6d7l9Cn6nMLcTLFFo5plR9Poso8iZ1NenPaYeaA+pNgGuwtYCBHdPoxj3hIzj/9 IGMYNqpqecfp3C7+0oM7vP40L+YR9LC7QoAvjxjpKkpdrTJ2dJukuONe2OQ8LasScRRiDy WtpbPix604pClWfXIx0WVcMMFqKVNxfnJtpQbQMNl8Z+FyyBzYcVY5AsjtnMTVQelonV/R DUmZBsVx/nMv86MaJ7b6l8vyiM5O9hNgIw0gnRCAmQ2VUCVQxm5ij04hDSDWAbgRiW068Z RW0n7l7FQ68o4OIUhesOmdwUiA/S1TnVX/riuUi0rWE/sG/lh+RdNui4rz3F3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691816135; 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=tVGK2C3axYi72Dt0Kt4nmwMU6UNATX+xUHDPQF3H4lY=; b=oS1zigWCReACYWMkrAxA0kq91NyKdgvDRsJuY8o8vju37YkpvafIqzghSOsqPRtstDRr0S DxSyk+WEO3NmDQaT5ey0h6F8baR4LWSk8YHVSugJ/sr9URIZRvPdwr8FIPkv5YlPVNQWkj c+j+AkTJ7xoVrPyJfD0NA9cL8+hP2P3GqyvEITOpdu3xKExMl/E2Yp9YDapQZnGJ+IeIyj h/y1ZrnPbLiPiVcKVyw0TKOm6zN8jOFXh+LnPItw4mnhxGbNcNgGwxMZMclYTvg0kPx6IO 0Q07DNUJOeS2uNQBVHsfuZl4K7AjZvDWLgpcUFO1fXABJE83fNByapx0gPQ4qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691816135; a=rsa-sha256; cv=none; b=Lu4gyKi+sOGWl87lPogtbB+JKEUW+3EnJheAEYtJ45UlKlPgZA1HsOuNeWYOKZpawpicbp XrLgxl9dBua84+AjzSa1pxABsyhOstdDAbHVhZdckyDfO0qT9RBzsNuyNadyhVe2W5AziM s2r+LWw4FFnYD6LVrZK0hf/1IYSS53Wif8zK934g22WDJTbRyj4YCQfy0qUQ97gF7Hjk89 gu9QkjUIAYEXLKuKZMEnSygmoDKYHr8MYbPNQf+lO7bKsGyl+wsYnMJPe7OJajRiX/D8zG zqjtsSboSMG65G449XuCnffKnSUt+71X7BhcATm8iAuwUjfEk06XOOVfIa5mag== 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 4RN7dg0x48z16V6; Sat, 12 Aug 2023 04:55:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37C4tYBs074415; Sat, 12 Aug 2023 04:55:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37C4tYJ9074413; Sat, 12 Aug 2023 04:55:34 GMT (envelope-from git) Date: Sat, 12 Aug 2023 04:55:34 GMT Message-Id: <202308120455.37C4tYJ9074413@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: 2726978bd801 - main - Makefile.inc1: Remove redundant test for armv[67] 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: 2726978bd801ceca07075f150d6ad9ef55470a21 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2726978bd801ceca07075f150d6ad9ef55470a21 commit 2726978bd801ceca07075f150d6ad9ef55470a21 Author: Warner Losh AuthorDate: 2022-07-05 16:16:19 +0000 Commit: Warner Losh 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