From a0ef76c2e2b4279707180d1b93cca85216019aa8 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Mon, 11 Dec 2023 03:05:15 +0000
Subject: [PATCH] arm just had to be different and change the syntax for
 .pushsection arguments, so we have to cope.

---
 lib/libc/arch/DEFS.h    | 6 ++++--
 libexec/ld.so/arm/SYS.h | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/libc/arch/DEFS.h b/lib/libc/arch/DEFS.h
index d9852ecb17f..472b530b240 100644
--- a/lib/libc/arch/DEFS.h
+++ b/lib/libc/arch/DEFS.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: DEFS.h,v 1.2 2023/12/10 16:45:50 deraadt Exp $	*/
+/*	$OpenBSD: DEFS.h,v 1.3 2023/12/11 03:05:15 deraadt Exp $	*/
 /*
  * Copyright (c) 2015,2018,2021 Philip Guenther <guenther@openbsd.org>
  *
@@ -20,8 +20,10 @@
 /* ARM just had to be different... */
 #ifndef __arm__
 # define _FUNC_TYPE	@function
+# define _PROGBITS	@progbits
 #else
 # define _FUNC_TYPE	#function
+# define _PROGBITS	%progbits
 #endif
 
 /*
@@ -69,7 +71,7 @@
 #define _END(x)		.size x, . - x
 
 #define PINSYSCALL(sysno, label)					\
-	.pushsection .openbsd.syscalls,"",@progbits;			\
+	.pushsection .openbsd.syscalls,"",_PROGBITS;			\
 	.long label;							\
 	.long sysno;							\
 	.popsection;
diff --git a/libexec/ld.so/arm/SYS.h b/libexec/ld.so/arm/SYS.h
index 79f59756e6b..faa5804dc9b 100644
--- a/libexec/ld.so/arm/SYS.h
+++ b/libexec/ld.so/arm/SYS.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: SYS.h,v 1.4 2023/12/10 16:45:50 deraadt Exp $ */
+/*	$OpenBSD: SYS.h,v 1.5 2023/12/11 03:05:17 deraadt Exp $ */
 
 /*
  * Copyright (c) 2004 Dale Rahn
@@ -30,7 +30,7 @@
 #include <sys/syscall.h>
 
 #define PINSYSCALL(sysno, label)				\
-	.pushsection .openbsd.syscalls,"",@progbits		;\
+	.pushsection .openbsd.syscalls,"",%progbits		;\
 	.long label						;\
 	.long sysno						;\
 	.popsection
-- 
2.20.1