From a8d2d9e857f3e0e5e619a6a7a1a692b947560973 Mon Sep 17 00:00:00 2001
From: guenther <guenther@openbsd.org>
Date: Wed, 25 May 2022 17:32:36 +0000
Subject: [PATCH] Revert the .rodata.cst4 change: results in incorrect value
 read

---
 lib/libc/arch/arm/gen/_setjmp.S   | 10 ++++------
 lib/libc/arch/arm/gen/sigsetjmp.S |  4 +---
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/lib/libc/arch/arm/gen/_setjmp.S b/lib/libc/arch/arm/gen/_setjmp.S
index 8a8c86b467d..56179fa693a 100644
--- a/lib/libc/arch/arm/gen/_setjmp.S
+++ b/lib/libc/arch/arm/gen/_setjmp.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _setjmp.S,v 1.7 2022/05/24 17:21:17 guenther Exp $	*/
+/*	$OpenBSD: _setjmp.S,v 1.8 2022/05/25 17:32:36 guenther Exp $	*/
 /*	$NetBSD: _setjmp.S,v 1.5 2003/04/05 23:08:51 bjh21 Exp $	*/
 
 /*
@@ -85,15 +85,13 @@ ENTRY(_setjmp)
 	mov	r3, r0
 	mov	pc, lr
 
+.L_setjmp_magic:
+	.word	_JB_MAGIC__SETJMP
+
 .L_jmpxor_setjmp:
 	.word	__jmpxor - 1b
 END_STRONG(_setjmp)
 
-	.section	.rodata.cst4, "aM", %progbits, 4
-	.balign	4
-.L_setjmp_magic:
-	.word	_JB_MAGIC__SETJMP
-
 ENTRY(_longjmp)
 	ldr	r2, .L_setjmp_magic
 	ldr	r3, [r0], #4
diff --git a/lib/libc/arch/arm/gen/sigsetjmp.S b/lib/libc/arch/arm/gen/sigsetjmp.S
index f79e9e7e1e9..314b77d47cf 100644
--- a/lib/libc/arch/arm/gen/sigsetjmp.S
+++ b/lib/libc/arch/arm/gen/sigsetjmp.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sigsetjmp.S,v 1.5 2022/05/24 17:21:17 guenther Exp $	*/
+/*	$OpenBSD: sigsetjmp.S,v 1.6 2022/05/25 17:32:36 guenther Exp $	*/
 /*	$NetBSD: sigsetjmp.S,v 1.3 2002/08/17 19:54:30 thorpej Exp $	*/
 
 /*
@@ -52,8 +52,6 @@ ENTRY_NB(sigsetjmp)
 	b	_HIDDEN(setjmp)
 END_WEAK(sigsetjmp)
 
-	.section	.rodata.cst4, "aM", %progbits, 4
-	.balign	4
 .L_setjmp_magic:
 	.word	_JB_MAGIC__SETJMP
 
-- 
2.20.1