From 476bc7b6c28b4ce91f25c4ca0780b71923ecea86 Mon Sep 17 00:00:00 2001
From: guenther <guenther@openbsd.org>
Date: Thu, 17 Apr 2014 09:01:25 +0000
Subject: [PATCH] It's been a quarter century: we can assume volatile is
 present with that name.

---
 lib/libc/arch/ia64/gen/fpgetmask.c      |  2 +-
 lib/libc/arch/ia64/gen/fpgetround.c     |  2 +-
 lib/libc/arch/ia64/gen/fpsetmask.c      |  4 ++--
 lib/libc/arch/ia64/gen/fpsetround.c     |  4 ++--
 lib/libc/arch/powerpc/gen/fabs.c        |  4 ++--
 lib/libc/arch/powerpc/gen/flt_rounds.c  |  4 ++--
 lib/libc/arch/powerpc/gen/fpgetmask.c   |  4 ++--
 lib/libc/arch/powerpc/gen/fpgetround.c  |  4 ++--
 lib/libc/arch/powerpc/gen/fpgetsticky.c |  4 ++--
 lib/libc/arch/powerpc/gen/fpsetmask.c   |  6 +++---
 lib/libc/arch/powerpc/gen/fpsetround.c  |  6 +++---
 lib/libc/arch/powerpc/gen/fpsetsticky.c |  6 +++---
 lib/libc/arch/sparc64/fpu/fpu_arith.h   | 18 +++++++++---------
 lib/libc/arch/sparc64/fpu/fpu_qp.c      | 16 ++++++++--------
 14 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/lib/libc/arch/ia64/gen/fpgetmask.c b/lib/libc/arch/ia64/gen/fpgetmask.c
index 4404ce5ed9f..460971b57ae 100644
--- a/lib/libc/arch/ia64/gen/fpgetmask.c
+++ b/lib/libc/arch/ia64/gen/fpgetmask.c
@@ -35,6 +35,6 @@ fpgetmask(void)
 {
 	uint64_t fpsr;
 
-	__asm __volatile("mov %0=ar.fpsr" : "=r" (fpsr));
+	__asm volatile("mov %0=ar.fpsr" : "=r" (fpsr));
 	return (~fpsr & 0x3d);
 }
diff --git a/lib/libc/arch/ia64/gen/fpgetround.c b/lib/libc/arch/ia64/gen/fpgetround.c
index 407edce7442..c4f82f70265 100644
--- a/lib/libc/arch/ia64/gen/fpgetround.c
+++ b/lib/libc/arch/ia64/gen/fpgetround.c
@@ -34,6 +34,6 @@ fpgetround(void)
 {
 	uint64_t fpsr;
 
-	__asm __volatile("mov %0=ar.fpsr" : "=r"(fpsr));
+	__asm volatile("mov %0=ar.fpsr" : "=r"(fpsr));
 	return ((fp_rnd)((fpsr >> 10) & 3));
 }
diff --git a/lib/libc/arch/ia64/gen/fpsetmask.c b/lib/libc/arch/ia64/gen/fpsetmask.c
index 84f5a29575f..390bdc15b5e 100644
--- a/lib/libc/arch/ia64/gen/fpsetmask.c
+++ b/lib/libc/arch/ia64/gen/fpsetmask.c
@@ -35,9 +35,9 @@ fpsetmask(fp_except mask)
 	int64_t fpsr;
 	int64_t oldmask;
 
-	__asm __volatile("mov %0=ar.fpsr" : "=r" (fpsr));
+	__asm volatile("mov %0=ar.fpsr" : "=r" (fpsr));
 	oldmask = ~fpsr & 0x3d;
 	fpsr = (fpsr & ~0x3d) | (~mask & 0x3d);
-	__asm __volatile("mov ar.fpsr=%0" :: "r" (fpsr));
+	__asm volatile("mov ar.fpsr=%0" :: "r" (fpsr));
 	return (oldmask);
 }
diff --git a/lib/libc/arch/ia64/gen/fpsetround.c b/lib/libc/arch/ia64/gen/fpsetround.c
index 695540692d2..e00b2675f74 100644
--- a/lib/libc/arch/ia64/gen/fpsetround.c
+++ b/lib/libc/arch/ia64/gen/fpsetround.c
@@ -35,9 +35,9 @@ fpsetround(fp_rnd rnd)
 	uint64_t fpsr;
 	fp_rnd prev;
 
-	__asm __volatile("mov %0=ar.fpsr" : "=r"(fpsr));
+	__asm volatile("mov %0=ar.fpsr" : "=r"(fpsr));
 	prev = (fp_rnd)((fpsr >> 10) & 3);
 	fpsr = (fpsr & ~0xC00ULL) | ((unsigned int)rnd << 10);
-	__asm __volatile("mov ar.fpsr=%0" :: "r"(fpsr));
+	__asm volatile("mov ar.fpsr=%0" :: "r"(fpsr));
 	return (prev);
 }
diff --git a/lib/libc/arch/powerpc/gen/fabs.c b/lib/libc/arch/powerpc/gen/fabs.c
index 708cb6fb320..b5e1c9934dc 100644
--- a/lib/libc/arch/powerpc/gen/fabs.c
+++ b/lib/libc/arch/powerpc/gen/fabs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fabs.c,v 1.8 2013/03/28 18:09:38 martynas Exp $	*/
+/*	$OpenBSD: fabs.c,v 1.9 2014/04/17 09:01:25 guenther Exp $	*/
 
 /*
  * Copyright (c) 2002 Theo de Raadt
@@ -30,7 +30,7 @@
 double
 fabs(double x)
 {
-	__asm__ __volatile("fabs %0,%1" : "=f"(x) : "f"(x));
+	__asm__ volatile("fabs %0,%1" : "=f"(x) : "f"(x));
 	return (x);
 }
 
diff --git a/lib/libc/arch/powerpc/gen/flt_rounds.c b/lib/libc/arch/powerpc/gen/flt_rounds.c
index 643fbe3b704..a363eb1b1b2 100644
--- a/lib/libc/arch/powerpc/gen/flt_rounds.c
+++ b/lib/libc/arch/powerpc/gen/flt_rounds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: flt_rounds.c,v 1.4 2012/06/25 17:01:11 deraadt Exp $	*/
+/*	$OpenBSD: flt_rounds.c,v 1.5 2014/04/17 09:01:25 guenther Exp $	*/
 /*	$NetBSD: flt_rounds.c,v 1.5 2001/05/25 12:14:05 simonb Exp $	*/
 
 /*
@@ -52,7 +52,7 @@ __flt_rounds()
 	double tmp;
 	int x;
 
-	__asm__ __volatile("mffs %0; stfiwx %0,0,%1" : "=f"(tmp): "b"(&x));
+	__asm__ volatile("mffs %0; stfiwx %0,0,%1" : "=f"(tmp): "b"(&x));
 	return map[x & 0x03];
 #endif
 }
diff --git a/lib/libc/arch/powerpc/gen/fpgetmask.c b/lib/libc/arch/powerpc/gen/fpgetmask.c
index f2d3181e2a4..c55e6f19dec 100644
--- a/lib/libc/arch/powerpc/gen/fpgetmask.c
+++ b/lib/libc/arch/powerpc/gen/fpgetmask.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpgetmask.c,v 1.2 2008/06/26 05:42:05 ray Exp $	*/
+/*	$OpenBSD: fpgetmask.c,v 1.3 2014/04/17 09:01:25 guenther Exp $	*/
 /*	$NetBSD: fpgetmask.c,v 1.1 1999/07/07 01:55:07 danw Exp $	*/
 
 /*
@@ -38,6 +38,6 @@ fpgetmask()
 {
 	u_int64_t fpscr;
 
-	__asm__ __volatile("mffs %0" : "=f"(fpscr));
+	__asm__ volatile("mffs %0" : "=f"(fpscr));
 	return ((fpscr >> 3) & 0x1f);
 }
diff --git a/lib/libc/arch/powerpc/gen/fpgetround.c b/lib/libc/arch/powerpc/gen/fpgetround.c
index 84c0b4ed8cf..12aa12e7201 100644
--- a/lib/libc/arch/powerpc/gen/fpgetround.c
+++ b/lib/libc/arch/powerpc/gen/fpgetround.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpgetround.c,v 1.2 2008/06/26 05:42:05 ray Exp $	*/
+/*	$OpenBSD: fpgetround.c,v 1.3 2014/04/17 09:01:25 guenther Exp $	*/
 /*	$NetBSD: fpgetround.c,v 1.1 1999/07/07 01:55:08 danw Exp $	*/
 
 /*
@@ -38,6 +38,6 @@ fpgetround()
 {
 	u_int64_t fpscr;
 
-	__asm__ __volatile("mffs %0" : "=f"(fpscr));
+	__asm__ volatile("mffs %0" : "=f"(fpscr));
 	return (fpscr & 0x3);
 }
diff --git a/lib/libc/arch/powerpc/gen/fpgetsticky.c b/lib/libc/arch/powerpc/gen/fpgetsticky.c
index a0c7638df85..fa6662ea725 100644
--- a/lib/libc/arch/powerpc/gen/fpgetsticky.c
+++ b/lib/libc/arch/powerpc/gen/fpgetsticky.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpgetsticky.c,v 1.2 2008/06/26 05:42:05 ray Exp $	*/
+/*	$OpenBSD: fpgetsticky.c,v 1.3 2014/04/17 09:01:25 guenther Exp $	*/
 /*	$NetBSD: fpgetsticky.c,v 1.1 1999/07/07 01:55:08 danw Exp $	*/
 
 /*
@@ -38,6 +38,6 @@ fpgetsticky()
 {
 	u_int64_t fpscr;
 
-	__asm__ __volatile("mffs %0" : "=f"(fpscr));
+	__asm__ volatile("mffs %0" : "=f"(fpscr));
 	return ((fpscr >> 25) & 0x1f);
 }
diff --git a/lib/libc/arch/powerpc/gen/fpsetmask.c b/lib/libc/arch/powerpc/gen/fpsetmask.c
index d4e24afefcc..e74dfc1b8a3 100644
--- a/lib/libc/arch/powerpc/gen/fpsetmask.c
+++ b/lib/libc/arch/powerpc/gen/fpsetmask.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpsetmask.c,v 1.3 2008/06/26 05:42:05 ray Exp $	*/
+/*	$OpenBSD: fpsetmask.c,v 1.4 2014/04/17 09:01:25 guenther Exp $	*/
 /*	$NetBSD: fpsetmask.c,v 1.1 1999/07/07 01:55:08 danw Exp $	*/
 
 /*
@@ -40,9 +40,9 @@ fpsetmask(mask)
 	u_int64_t fpscr;
 	fp_rnd old;
 
-	__asm__ __volatile("mffs %0" : "=f"(fpscr));
+	__asm__ volatile("mffs %0" : "=f"(fpscr));
 	old = (fpscr >> 3) & 0x1f;
 	fpscr = (fpscr & 0xffffff07ULL) | (mask << 3);
-	__asm__ __volatile("mtfsf 0xff,%0" :: "f"(fpscr));
+	__asm__ volatile("mtfsf 0xff,%0" :: "f"(fpscr));
 	return (old);
 }
diff --git a/lib/libc/arch/powerpc/gen/fpsetround.c b/lib/libc/arch/powerpc/gen/fpsetround.c
index efced62a7ef..814d872410c 100644
--- a/lib/libc/arch/powerpc/gen/fpsetround.c
+++ b/lib/libc/arch/powerpc/gen/fpsetround.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpsetround.c,v 1.3 2008/06/26 05:42:05 ray Exp $	*/
+/*	$OpenBSD: fpsetround.c,v 1.4 2014/04/17 09:01:25 guenther Exp $	*/
 /*	$NetBSD: fpsetround.c,v 1.1 1999/07/07 01:55:08 danw Exp $	*/
 
 /*
@@ -40,9 +40,9 @@ fpsetround(rnd_dir)
 	u_int64_t fpscr;
 	fp_rnd old;
 
-	__asm__ __volatile("mffs %0" : "=f"(fpscr));
+	__asm__ volatile("mffs %0" : "=f"(fpscr));
 	old = fpscr & 0x3;
 	fpscr = (fpscr & 0xfffffffcULL) | rnd_dir;
-	__asm__ __volatile("mtfsf 0xff,%0" :: "f"(fpscr));
+	__asm__ volatile("mtfsf 0xff,%0" :: "f"(fpscr));
 	return (old);
 }
diff --git a/lib/libc/arch/powerpc/gen/fpsetsticky.c b/lib/libc/arch/powerpc/gen/fpsetsticky.c
index 08278fd2585..e170da5a0a9 100644
--- a/lib/libc/arch/powerpc/gen/fpsetsticky.c
+++ b/lib/libc/arch/powerpc/gen/fpsetsticky.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpsetsticky.c,v 1.4 2011/05/25 21:26:55 martynas Exp $	*/
+/*	$OpenBSD: fpsetsticky.c,v 1.5 2014/04/17 09:01:25 guenther Exp $	*/
 /*	$NetBSD: fpsetsticky.c,v 1.1 1999/07/07 01:55:08 danw Exp $	*/
 
 /*
@@ -40,13 +40,13 @@ fpsetsticky(mask)
 	u_int64_t fpscr;
 	fp_rnd old;
 
-	__asm__ __volatile("mffs %0" : "=f"(fpscr));
+	__asm__ volatile("mffs %0" : "=f"(fpscr));
 	old = (fpscr >> 25) & 0x1f;
 	fpscr = (fpscr & 0xe1ffffffULL) | ((mask & 0xf) << 25);
 	if (mask & FP_X_INV)
 		fpscr |= 0x400;
 	else
 		fpscr &= 0xfe07f8ffULL;
-	__asm__ __volatile("mtfsf 0xff,%0" :: "f"(fpscr));
+	__asm__ volatile("mtfsf 0xff,%0" :: "f"(fpscr));
 	return (old);
 }
diff --git a/lib/libc/arch/sparc64/fpu/fpu_arith.h b/lib/libc/arch/sparc64/fpu/fpu_arith.h
index c2354b425ad..7d313725b19 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_arith.h
+++ b/lib/libc/arch/sparc64/fpu/fpu_arith.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_arith.h,v 1.2 2011/09/17 08:38:07 miod Exp $	*/
+/*	$OpenBSD: fpu_arith.h,v 1.3 2014/04/17 09:01:25 guenther Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -80,19 +80,19 @@
  * into carry; GET_CARRY sets its argument to 0 or 1.
  */
 #define	FPU_ADDC(r, x, y) \
-	__asm __volatile("addx %1,%2,%0" : "=r"(r) : "r"(x), "r"(y))
+	__asm volatile("addx %1,%2,%0" : "=r"(r) : "r"(x), "r"(y))
 #define	FPU_ADDS(r, x, y) \
-	__asm __volatile("addcc %1,%2,%0" : "=r"(r) : "r"(x), "r"(y))
+	__asm volatile("addcc %1,%2,%0" : "=r"(r) : "r"(x), "r"(y))
 #define	FPU_ADDCS(r, x, y) \
-	__asm __volatile("addxcc %1,%2,%0" : "=r"(r) : "r"(x), "r"(y))
+	__asm volatile("addxcc %1,%2,%0" : "=r"(r) : "r"(x), "r"(y))
 #define	FPU_SUBC(r, x, y) \
-	__asm __volatile("subx %1,%2,%0" : "=r"(r) : "r"(x), "r"(y))
+	__asm volatile("subx %1,%2,%0" : "=r"(r) : "r"(x), "r"(y))
 #define	FPU_SUBS(r, x, y) \
-	__asm __volatile("subcc %1,%2,%0" : "=r"(r) : "r"(x), "r"(y))
+	__asm volatile("subcc %1,%2,%0" : "=r"(r) : "r"(x), "r"(y))
 #define	FPU_SUBCS(r, x, y) \
-	__asm __volatile("subxcc %1,%2,%0" : "=r"(r) : "r"(x), "r"(y))
+	__asm volatile("subxcc %1,%2,%0" : "=r"(r) : "r"(x), "r"(y))
 
-#define	FPU_GET_CARRY(r) __asm __volatile("addx %%g0,%%g0,%0" : "=r"(r))
-#define	FPU_SET_CARRY(v) __asm __volatile("addcc %0,-1,%%g0" : : "r"(v))
+#define	FPU_GET_CARRY(r) __asm volatile("addx %%g0,%%g0,%0" : "=r"(r))
+#define	FPU_SET_CARRY(v) __asm volatile("addcc %0,-1,%%g0" : : "r"(v))
 
 #define	FPU_SHL1_BY_ADD	/* shift left 1 faster by ADDC than (a<<1)|(b>>31) */
diff --git a/lib/libc/arch/sparc64/fpu/fpu_qp.c b/lib/libc/arch/sparc64/fpu/fpu_qp.c
index 8090a3ec6ff..d5d9a8c4a8a 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_qp.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_qp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_qp.c,v 1.4 2012/12/05 23:19:59 deraadt Exp $	*/
+/*	$OpenBSD: fpu_qp.c,v 1.5 2014/04/17 09:01:25 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2002 Jake Burkholder.
@@ -43,7 +43,7 @@ _Qp_ ## op(u_int *c, u_int *a, u_int *b) \
 { \
 	struct fpemu fe; \
 	struct fpn *r; \
-	__asm __volatile("stx %%fsr, [%0]" : : "r" (&fe.fe_fsr)); \
+	__asm volatile("stx %%fsr, [%0]" : : "r" (&fe.fe_fsr)); \
 	fe.fe_f1.fp_sign = a[0] >> 31; \
 	fe.fe_f1.fp_sticky = 0; \
 	fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, a[0], a[1], a[2], a[3]); \
@@ -61,7 +61,7 @@ _Qp_ ## qname ## toq(u_int *c, ntype n) \
 { \
 	struct fpemu fe; \
 	atype *a; \
-	__asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \
+	__asm volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \
 	a = (atype *)&n; \
 	fe.fe_f1.fp_sign = signed ? a[0] >> 31 : 0; \
 	fe.fe_f1.fp_sticky = 0; \
@@ -77,7 +77,7 @@ _Qp_qto ## qname(u_int *c) \
 	struct fpemu fe; \
 	u_int *a; \
 	type n; \
-	__asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \
+	__asm volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \
 	a = (u_int *)&n; \
 	fe.fe_f1.fp_sign = c[0] >> 31; \
 	fe.fe_f1.fp_sticky = 0; \
@@ -94,7 +94,7 @@ _Qp_qto ## qname(u_int *c) \
 	struct fpemu fe; \
 	u_int *a; \
 	type n; \
-	__asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \
+	__asm volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \
 	a = (u_int *)&n; \
 	fe.fe_f1.fp_sign = c[0] >> 31; \
 	fe.fe_f1.fp_sticky = 0; \
@@ -111,7 +111,7 @@ _Qp_qto ## qname(u_int *c) \
 	struct fpemu fe; \
 	u_int *a; \
 	type n; \
-	__asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \
+	__asm volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \
 	a = (u_int *)&n; \
 	fe.fe_f1.fp_sign = c[0] >> 31; \
 	fe.fe_f1.fp_sticky = 0; \
@@ -136,7 +136,7 @@ int \
 _Qp_ ## name(u_int *a, u_int *b) \
 { \
 	struct fpemu fe; \
-	__asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \
+	__asm volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \
 	fe.fe_f1.fp_sign = a[0] >> 31; \
 	fe.fe_f1.fp_sticky = 0; \
 	fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, a[0], a[1], a[2], a[3]); \
@@ -153,7 +153,7 @@ _Qp_sqrt(u_int *c, u_int *a)
 {
 	struct fpemu fe;
 	struct fpn *r;
-	__asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :);
+	__asm volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :);
 	fe.fe_f1.fp_sign = a[0] >> 31;
 	fe.fe_f1.fp_sticky = 0;
 	fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, a[0], a[1], a[2], a[3]);
-- 
2.20.1