summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorPhilip Guenther <guenther@cvs.openbsd.org>2022-02-24 07:08:22 +0000
committerPhilip Guenther <guenther@cvs.openbsd.org>2022-02-24 07:08:22 +0000
commit3b9d7488bf859fed0bf8ce3b61bcf4fdc9a283c3 (patch)
tree0108c5b44f4fe8b19517dedd73ffd10c0dcbc0f6 /sys
parentbfaa96d42370c04bba436526c4ef380fa785d18b (diff)
Fix PIC_SYM() macro: it never needs to token paste, so it's not
dependent on __STDC__ and doesn't need the ## operator. ok jsg@
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/arm/include/asm.h8
-rw-r--r--sys/arch/arm64/include/asm.h8
-rw-r--r--sys/arch/riscv64/include/asm.h8
3 files changed, 6 insertions, 18 deletions
diff --git a/sys/arch/arm/include/asm.h b/sys/arch/arm/include/asm.h
index e1e5bbc4dd2..1fc98c14e88 100644
--- a/sys/arch/arm/include/asm.h
+++ b/sys/arch/arm/include/asm.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asm.h,v 1.9 2017/06/29 17:36:16 deraadt Exp $ */
+/* $OpenBSD: asm.h,v 1.10 2022/02/24 07:08:21 guenther Exp $ */
/* $NetBSD: asm.h,v 1.4 2001/07/16 05:43:32 matt Exp $ */
/*
@@ -78,11 +78,7 @@
#define END(y) .size y, . - y
#if defined(__PIC__)
-#ifdef __STDC__
-#define PIC_SYM(x,y) x ## ( ## y ## )
-#else
-#define PIC_SYM(x,y) x/**/(/**/y/**/)
-#endif
+#define PIC_SYM(x,y) x(y)
#else
#define PIC_SYM(x,y) x
#endif
diff --git a/sys/arch/arm64/include/asm.h b/sys/arch/arm64/include/asm.h
index 643a19c9889..396940e9db5 100644
--- a/sys/arch/arm64/include/asm.h
+++ b/sys/arch/arm64/include/asm.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asm.h,v 1.7 2022/02/23 07:16:26 jsg Exp $ */
+/* $OpenBSD: asm.h,v 1.8 2022/02/24 07:08:21 guenther Exp $ */
/* $NetBSD: asm.h,v 1.4 2001/07/16 05:43:32 matt Exp $ */
/*
@@ -132,11 +132,7 @@
#define EEND(sym)
#ifdef __PIC__
-#ifdef __STDC__
-#define PIC_SYM(x,y) x ## ( ## y ## )
-#else
-#define PIC_SYM(x,y) x/**/(/**/y/**/)
-#endif
+#define PIC_SYM(x,y) x(y)
#else
#define PIC_SYM(x,y) x
#endif
diff --git a/sys/arch/riscv64/include/asm.h b/sys/arch/riscv64/include/asm.h
index 746c35531d0..44ecf69c88d 100644
--- a/sys/arch/riscv64/include/asm.h
+++ b/sys/arch/riscv64/include/asm.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asm.h,v 1.3 2022/02/23 07:16:26 jsg Exp $ */
+/* $OpenBSD: asm.h,v 1.4 2022/02/24 07:08:21 guenther Exp $ */
/*
* Copyright (c) 2020 Brian Bamsch <bbamsch@google.com>
@@ -92,11 +92,7 @@
#define EEND(sym)
#ifdef __PIC__
-#ifdef __STDC__
-#define PIC_SYM(x,y) x ## ( ## y ## )
-#else
-#define PIC_SYM(x,y) x/**/(/**/y/**/)
-#endif
+#define PIC_SYM(x,y) x(y)
#else
#define PIC_SYM(x,y) x
#endif