The branch main has been updated by markj:
URL:
https://cgit.FreeBSD.org/src/commit/?id=159d29d3948294cdc9ee4cc3951d004de6797a32
commit 159d29d3948294cdc9ee4cc3951d004de6797a32
Author: Mark Johnston <ma...@freebsd.org>
AuthorDate: 2025-01-11 17:45:57 +0000
Commit: Mark Johnston <ma...@freebsd.org>
CommitDate: 2025-01-11 17:45:57 +0000
clock: Use .balign to align ticksl
The .align directive has a different behaviour on 32-bit arm than on
other platforms. Use .balign instead, which has consistent behaviour on
all architectures.
Reported by: kib
Reviewed by: jrtc27, kib
Fixes: 6b82130e6c9a ("clock: Add a long ticks variable, ticksl")
Differential Revision: https://reviews.freebsd.org/D48430
---
sys/kern/subr_ticks.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/kern/subr_ticks.S b/sys/kern/subr_ticks.S
index 52435b194c4f..ad01d5d67165 100644
--- a/sys/kern/subr_ticks.S
+++ b/sys/kern/subr_ticks.S
@@ -26,7 +26,7 @@
GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL)
.global ticksl
.type ticksl, %object
- .align __SIZEOF_LONG__
+ .balign __SIZEOF_LONG__
ticksl: .zero __SIZEOF_LONG__
.size ticksl, __SIZEOF_LONG__
