Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 29 Nov 2025 06:11:55 +0000
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Cc:        Minsoo Choo <minsoochoo0122@proton.me>
Subject:   git: 57c0a337dbc5 - main - libsys: remove armv6 hack
Message-ID:  <692a8eab.22585.60655b6e@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=57c0a337dbc592a82d184f18dc69634eb0a9db10

commit 57c0a337dbc592a82d184f18dc69634eb0a9db10
Author:     Minsoo Choo <minsoochoo0122@proton.me>
AuthorDate: 2025-11-29 00:48:29 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2025-11-29 06:07:12 +0000

    libsys: remove armv6 hack
    
    Signed-off-by: Minsoo Choo <minsoochoo0122@proton.me>
    Reviewed by: imp
    Pull Request: https://github.com/freebsd/freebsd-src/pull/1903
---
 lib/libsys/arm/__vdso_gettc.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/libsys/arm/__vdso_gettc.c b/lib/libsys/arm/__vdso_gettc.c
index cb4bdec1e8ef..c86bb78becb9 100644
--- a/lib/libsys/arm/__vdso_gettc.c
+++ b/lib/libsys/arm/__vdso_gettc.c
@@ -62,12 +62,8 @@ __vdso_gettc(const struct vdso_timehands *th, u_int *tc)
 
 	if (th->th_algo != VDSO_TH_ALGO_ARM_GENTIM)
 		return (ENOSYS);
-	/*
-	 * Userspace gettimeofday() is only enabled on ARMv7 CPUs, but
-	 * libc is compiled for ARMv6.  Due to clang issues, .arch
-	 * armv7-a directive does not work.
-	 */
-	__asm __volatile(".word\t0xf57ff06f" : : : "memory"); /* isb */
+
+	__asm __volatile("isb" : : : "memory");
 	*tc = th->th_physical == 0 ? cp15_cntvct_get() : cp15_cntpct_get();
 	return (0);
 }


help

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?692a8eab.22585.60655b6e>