From nobody Wed Jun 12 11:49:28 2024
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 4VzkNS3hqQz5M4S1;
Wed, 12 Jun 2024 11:49:28 +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 4VzkNS2mFXz4vQL;
Wed, 12 Jun 2024 11:49:28 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718192968;
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=86Zid2xS7c5HvhErU71LpIwsnHSEIiqrODELozBi3JY=;
b=XESdT92N/onbUNd8maoXUuiMl8vxZSAUAeoed/KvMseLFSaBRx7fVX48e0gr1NIJCsfqU+
kQfZWO3QV5xgmuM2ANUBEjSWq6Ki++nf2GpttU3BtEH3p+fQxlYgoTaKZLVwzQXWRg94r8
c17jW04APojM2P2kg/COh48Utd+NHZOgI7N766/OG3XB0TBqSdMNVugmiuV0DiuBFAxHgT
lpjF6gTGFoiw32sUw2DdlUpnvnAq1bLa2zk0qXXMyx4AwsAunwK0o9YHnDQxNGCl7B3Ckn
qivH/y+Orj5dzvoVgOtbLppZHKAD3AAKYEtjGHivIkY14wtwLBMEXayKp7E5fA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718192968; a=rsa-sha256; cv=none;
b=Jd1D5HmPn6Nasn1sK40q7qdCwl+9Pu5ASevef3DiwbKhQxMFMax5uRVsYwupkXMVs0KsOX
HTdw3n3qCuZFj0rqhlNh1h01ya3lyfY6NxQr0PCypLTHaZ1sVNxpL271EqY+umWZME3GHA
va7Owjy8d380Hivy4F5CLzmUQZDqdfUB+MpD46qRbFY0RvJx8jaM8HN1L8eWIEkUOBxiZj
bT8xDWKmFQB6pOnqxYAFF6+V4EVI3dVOLVgFPs2OMmiWSXfvwV9Lcwt7E2Ik3t4ZKbdfYQ
PXeI7RFn2eFQF6Di75iuqiWp7Club75U+d8M7Ye9zewYRv/c/6Jh4QSFiaAiqA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1718192968;
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=86Zid2xS7c5HvhErU71LpIwsnHSEIiqrODELozBi3JY=;
b=NvAdZ8hczcWPVraNPWYVB1S/SBAuo94hFyvy4xgv4WEN6o/I+qtyTFxvkrEWYCaXhzKmAA
Y/Axx+vFmVwKnDwXsLBH7dsLqhrl/VUnQZX1X9J0j8g/D7xnvZO6JuPLepHD4xhdLUYjq7
0o/QmOO7fpRYPaTuAfOofmJTEcnGLrVK86xlzhguJzwKtdOiqkmV+hlecTiRltSXIXcoAA
kV00JiSXCqrMI3d1l4aHqih6h/iMk+U/1Z/8Hb9H/ba/OQzuJQ704tQv6u2goGIpSmZkb6
Jts/PrrYTqIZv7vdPaiPaGRfOpHmFG3QYWNnF0yrDhkz2zhIydmse4F7MBJFEg==
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 4VzkNS2MRGzrnX;
Wed, 12 Jun 2024 11:49:28 +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 45CBnSwS043158;
Wed, 12 Jun 2024 11:49:28 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45CBnSLs043155;
Wed, 12 Jun 2024 11:49:28 GMT
(envelope-from git)
Date: Wed, 12 Jun 2024 11:49:28 GMT
Message-Id: <202406121149.45CBnSLs043155@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Andrew Turner <andrew@FreeBSD.org>
Subject: git: b8a496dfb6df - main - lib: Remove __ARM_ARCH checks
that are always true
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: andrew
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: b8a496dfb6df7b86e014d0d4476cd75850e060c1
Auto-Submitted: auto-generated
The branch main has been updated by andrew:
URL: https://cgit.FreeBSD.org/src/commit/?id=b8a496dfb6df7b86e014d0d4476cd75850e060c1
commit b8a496dfb6df7b86e014d0d4476cd75850e060c1
Author: Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2024-06-12 11:49:05 +0000
Commit: Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2024-06-12 11:49:05 +0000
lib: Remove __ARM_ARCH checks that are always true
Reviewed by: imp
Differential Revision: https://reviews.freebsd.org/D45559
---
lib/libc/arm/aeabi/aeabi_vfp.h | 2 +-
lib/libc/arm/gen/_setjmp.S | 8 ++++----
lib/libc/arm/gen/setjmp.S | 4 ++--
lib/libsys/arm/__vdso_gettc.c | 7 -------
lib/msun/arm/fenv.c | 6 +-----
5 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/lib/libc/arm/aeabi/aeabi_vfp.h b/lib/libc/arm/aeabi/aeabi_vfp.h
index f87f9acfd0a2..3b70fe06fab3 100644
--- a/lib/libc/arm/aeabi/aeabi_vfp.h
+++ b/lib/libc/arm/aeabi/aeabi_vfp.h
@@ -65,7 +65,7 @@
* C Helper macros
*/
-#if __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC)
+#if !defined(SOFTFLOAT_FOR_GCC)
/*
* Generate a function that will either call into the VFP implementation,
* or the soft float version for a given __aeabi_* helper. The function
diff --git a/lib/libc/arm/gen/_setjmp.S b/lib/libc/arm/gen/_setjmp.S
index 19b8b6b07059..9e655d2e9e2e 100644
--- a/lib/libc/arm/gen/_setjmp.S
+++ b/lib/libc/arm/gen/_setjmp.S
@@ -58,12 +58,12 @@
ENTRY(_setjmp)
ldr r1, .L_setjmp_magic
-#if !defined(_STANDALONE) && __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC)
+#if !defined(_STANDALONE) && !defined(SOFTFLOAT_FOR_GCC)
add r2, r0, #(_JB_REG_D8 * 4)
vstmia r2, {d8-d15}
vmrs r2, fpscr
str r2, [r0, #(_JB_REG_FPSCR * 4)]
-#endif /* !_STANDALONE && __ARM_ARCH >= 6 */
+#endif /* !_STANDALONE && !SOFTFLOAT_FOR_GCC */
str r1, [r0]
@@ -91,12 +91,12 @@ ENTRY(_longjmp)
teq ip, r2 /* magic correct? */
bne botch /* no, botch */
-#if !defined(_STANDALONE) && __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC)
+#if !defined(_STANDALONE) && !defined(SOFTFLOAT_FOR_GCC)
add ip, r0, #(_JB_REG_D8 * 4)
vldmia ip, {d8-d15}
ldr ip, [r0, #(_JB_REG_FPSCR * 4)]
vmsr fpscr, ip
-#endif /* !_STANDALONE && __ARM_ARCH >= 6 */
+#endif /* !_STANDALONE && !SOFTFLOAT_FOR_GCC */
add r0, r0, #(_JB_REG_R4 * 4)
/* Restore integer registers */
diff --git a/lib/libc/arm/gen/setjmp.S b/lib/libc/arm/gen/setjmp.S
index 5a6c899e2b23..e7f8b788e878 100644
--- a/lib/libc/arm/gen/setjmp.S
+++ b/lib/libc/arm/gen/setjmp.S
@@ -61,7 +61,7 @@ ENTRY(setjmp)
ldr r1, .Lsetjmp_magic
-#if __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC)
+#if !defined(SOFTFLOAT_FOR_GCC)
add r2, r0, #(_JB_REG_D8 * 4)
vstmia r2, {d8-d15}
vmrs r2, fpscr
@@ -102,7 +102,7 @@ ENTRY(__longjmp)
bl PIC_SYM(_C_LABEL(sigprocmask), PLT)
ldmfd sp!, {r0-r2, r14}
-#if __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC)
+#if !defined(SOFTFLOAT_FOR_GCC)
add ip, r0, #(_JB_REG_D8 * 4)
vldmia ip, {d8-d15}
ldr ip, [r0, #(_JB_REG_FPSCR * 4)]
diff --git a/lib/libsys/arm/__vdso_gettc.c b/lib/libsys/arm/__vdso_gettc.c
index ea70dec35cd8..cb4bdec1e8ef 100644
--- a/lib/libsys/arm/__vdso_gettc.c
+++ b/lib/libsys/arm/__vdso_gettc.c
@@ -37,7 +37,6 @@
#include <errno.h>
#include "libc_private.h"
-#if __ARM_ARCH >= 6
static inline uint64_t
cp15_cntvct_get(void)
{
@@ -55,7 +54,6 @@ cp15_cntpct_get(void)
__asm __volatile("mrrc\tp15, 0, %Q0, %R0, c14" : "=r" (reg));
return (reg);
}
-#endif
#pragma weak __vdso_gettc
int
@@ -64,7 +62,6 @@ __vdso_gettc(const struct vdso_timehands *th, u_int *tc)
if (th->th_algo != VDSO_TH_ALGO_ARM_GENTIM)
return (ENOSYS);
-#if __ARM_ARCH >= 6
/*
* Userspace gettimeofday() is only enabled on ARMv7 CPUs, but
* libc is compiled for ARMv6. Due to clang issues, .arch
@@ -73,10 +70,6 @@ __vdso_gettc(const struct vdso_timehands *th, u_int *tc)
__asm __volatile(".word\t0xf57ff06f" : : : "memory"); /* isb */
*tc = th->th_physical == 0 ? cp15_cntvct_get() : cp15_cntpct_get();
return (0);
-#else
- *tc = 0;
- return (ENOSYS);
-#endif
}
#pragma weak __vdso_gettimekeep
diff --git a/lib/msun/arm/fenv.c b/lib/msun/arm/fenv.c
index 9f172d5fd7c9..05b3adb05f81 100644
--- a/lib/msun/arm/fenv.c
+++ b/lib/msun/arm/fenv.c
@@ -32,10 +32,6 @@
#include <machine/acle-compat.h>
-#if __ARM_ARCH >= 6
-#define FENV_ARMv6
-#endif
-
/* When SOFTFP_ABI is defined we are using the softfp ABI. */
#if defined(__VFP_FP__) && !defined(__ARM_PCS_VFP)
#define SOFTFP_ABI
@@ -52,7 +48,7 @@ const fenv_t __fe_dfl_env = 0;
/* If this is a non-mangled softfp version special processing is required */
-#if defined(FENV_MANGLE) || !defined(SOFTFP_ABI) || !defined(FENV_ARMv6)
+#if defined(FENV_MANGLE) || !defined(SOFTFP_ABI)
/*
* The following macros map between the softfloat emulator's flags and