From nobody Tue Feb 14 16:54:15 2023 X-Original-To: dev-commits-src-main@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 4PGS3W5gxNz3phxC; Tue, 14 Feb 2023 16:54:15 +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 4PGS3W4wK1z3G2J; Tue, 14 Feb 2023 16:54:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676393655; 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=4iX30IWwmpOL5K8A12b0r/3J0mMUieZtUBra/66xF1E=; b=ignbsNoraeMSEALarwXQuz55pimZhhDLJVs2pXKFoZdiOXn7kQX146d/xLqCWZoFm53RRT /Om2BGI9gva96BVSMH44iBkwq3u/pBdyo8FixtsUjmjpn+z1c56J1MtO+qjd/bfQtTwFTU G9Y4UUKyzLlmnIjc9/bHdkh4LCQQXQW7Hh27C3exekb9xf2T9o2zTyvy7I942XevaZLNuY kKVlQbUpVRHxx5HEM53/t/5EmaXq66/jI3zjb5bStDiAfaBFeGBDIrKxG74s9OrdJNvYJY fv09cR111Eqg9sOUWFboTzQg2/yrN5FZfFa8NbQoBDGrfUeCrU+wWw5GDPzyDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676393655; 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=4iX30IWwmpOL5K8A12b0r/3J0mMUieZtUBra/66xF1E=; b=L8t8uKD763PUTKlpc/zHp/I4d6q1RoVG2UZX+juSpui14VPApzBzHfwVFD+kmZznfzYA22 DtiamRAgKjYELbEybWtwk5Rtu/WqZwbtM77LB+LBMI6PJNOvJqsy14/O+A2pEzXFt3fxGh YX+0TN8SwBnmLvc4Nr8Y7hwg1h1TJFltrIwqu65uFW/ABd02N+vtFCgb5AaHasc51AkzRr o0VN3Eu2WubobJY+lWzy2e/RZHN/60tgNelR81qCAnbc6v1xo5z8oyUCgg4lE1sOUEXZPf FbQ6P8Xx03UFGHpkT9yz7H5i/Nkc3PCi0JgmBomRTT7Eo9aVUCD6+h7POrH7Bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676393655; a=rsa-sha256; cv=none; b=DoQKPYDI1gTXmpBjNtdCzd7Tveyc4dfx+Pq56QlLd9dOl3KO7U5Ulw5DbR7FJrq6jy/Tk7 mDWP1q0+u5Ds/4LJDUPTY9ZRnN3nvC8qnEkPsnrUNcgqms2chDyQ/qeMFFdsJnP3a/e4VE nY6PLJNe5DRXS0bZxLivUUciVfgLDBivTMKZR719DHjzLwq2DwtQY1BoH12uMQ1+8j72ow P4R7LERDIRAj4LUNkxWTnEK8p0b9b5fNuE3JxyrvLstJUAJ4IS3CRn/jbP1QPcCWvO/Mv1 nSPybRb2XLdzj9fCP3A2kt4u3x3idnh3mYGKMO1qUkGVJlTgVt3UddKFem896A== 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 4PGS3W4194z15y0; Tue, 14 Feb 2023 16:54:15 +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 31EGsF94057574; Tue, 14 Feb 2023 16:54:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31EGsFT0057567; Tue, 14 Feb 2023 16:54:15 GMT (envelope-from git) Date: Tue, 14 Feb 2023 16:54:15 GMT Message-Id: <202302141654.31EGsFT0057567@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: 3ae78d66d9e5 - main - bsd.cpu.mk: Simplify armv[67] support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 3ae78d66d9e56fdda35bdf07b21c374ea5f2906b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3ae78d66d9e56fdda35bdf07b21c374ea5f2906b commit 3ae78d66d9e56fdda35bdf07b21c374ea5f2906b Author: Warner Losh AuthorDate: 2023-02-14 16:49:26 +0000 Commit: Warner Losh CommitDate: 2023-02-14 16:53:15 +0000 bsd.cpu.mk: Simplify armv[67] support Drop a clause that's no longer relevant to v4/v5. Drop support for softfloat for v[45]. Simplify soft float expression by assuming we're always either armv6 or armv7. Sponsored by: Netflix Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D38584 --- share/mk/bsd.cpu.mk | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index db5fa08df4bc..693a9b5209da 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -103,9 +103,9 @@ _CPUCFLAGS = -march=armv5te -D__XSCALE__ _CPUCFLAGS = -mfloat-abi=softfp . elif ${CPUTYPE} == "cortexa" _CPUCFLAGS = -march=armv7 -mfpu=vfp -. elif ${CPUTYPE:Marmv[4567]*} != "" +. elif ${CPUTYPE:Marmv[67]*} != "" # Handle all the armvX types that FreeBSD runs: -# armv4, armv4t, armv5, armv5te, armv6, armv6t2, armv7, armv7-a, armv7ve +# armv6, armv6t2, armv7, armv7-a, armv7ve # they require -march=. All the others require -mcpu=. _CPUCFLAGS = -march=${CPUTYPE} . else @@ -292,17 +292,11 @@ MACHINE_CPU += armv6 . if ${MACHINE_ARCH:Marmv7*} != "" MACHINE_CPU += armv7 . endif -# armv6 and armv7 are a hybrid. It can use the softfp ABI, but doesn't emulate -# floating point in the general case, so don't define softfp for it at this -# time. arm is pure softfp, so define it for them. -. if ${MACHINE_ARCH:Marmv[67]*} == "" -MACHINE_CPU += softfp -. endif # Normally armv6 and armv7 are 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. -. if ${MACHINE_ARCH:Marmv[67]*} && defined(CPUTYPE) && ${CPUTYPE:M*soft*} != "" +. if defined(CPUTYPE) && ${CPUTYPE:M*soft*} != "" # Needs to be CFLAGS not _CPUCFLAGS because it's needed for the ABI # not a nice optimization. Please note: softfp ABI uses hardware floating # instructions, but passes arguments to function calls in integer regsiters.