It's been a quarter century: we can assume volatile is present with that name.

24 files changed, 57 insertions, 57 deletions

diff --git a/lib/libc/arch/hppa/gen/fabs.c b/lib/libc/arch/hppa/gen/fabs.c
index 9b9b80b5867..dade90ce9bf 100644
--- a/lib/libc/arch/hppa/gen/fabs.c
+++ b/lib/libc/arch/hppa/gen/fabs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fabs.c,v 1.10 2013/11/13 15:21:51 deraadt Exp $	*/
+/*	$OpenBSD: fabs.c,v 1.11 2014/04/18 15:09:52 guenther Exp $	*/
 
 /*
  * Written by Miodrag Vallat.  Public domain
@@ -11,7 +11,7 @@ double
 fabs(double val)
 {
 
-	__asm__ __volatile__("fabs,dbl %0,%0" : "+f" (val));
+	__asm__ volatile("fabs,dbl %0,%0" : "+f" (val));
 	return (val);
 }
 
diff --git a/lib/libc/arch/hppa/gen/flt_rounds.c b/lib/libc/arch/hppa/gen/flt_rounds.c
index a5133c7502c..6defc4fb09e 100644
--- a/lib/libc/arch/hppa/gen/flt_rounds.c
+++ b/lib/libc/arch/hppa/gen/flt_rounds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: flt_rounds.c,v 1.4 2012/06/25 17:01:10 deraadt Exp $	*/
+/*	$OpenBSD: flt_rounds.c,v 1.5 2014/04/18 15:09:52 guenther Exp $	*/
 
 /*
  * Written by Miodrag Vallat.  Public domain.
@@ -19,6 +19,6 @@ __flt_rounds()
 {
 	u_int64_t fpsr;
 
-	__asm__ __volatile__("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
+	__asm__ volatile("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
 	return map[(fpsr >> 41) & 0x03];
 }
diff --git a/lib/libc/arch/hppa/gen/fpgetmask.c b/lib/libc/arch/hppa/gen/fpgetmask.c
index 36c46818159..7692c120f91 100644
--- a/lib/libc/arch/hppa/gen/fpgetmask.c
+++ b/lib/libc/arch/hppa/gen/fpgetmask.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpgetmask.c,v 1.3 2002/10/21 18:41:05 mickey Exp $	*/
+/*	$OpenBSD: fpgetmask.c,v 1.4 2014/04/18 15:09:52 guenther Exp $	*/
 
 /*
  * Written by Miodrag Vallat.  Public domain
@@ -12,6 +12,6 @@ fpgetmask()
 {
 	u_int64_t fpsr;
 
-	__asm__ __volatile__("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
+	__asm__ volatile("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
 	return ((fpsr >> 32) & 0x1f);
 }
diff --git a/lib/libc/arch/hppa/gen/fpgetround.c b/lib/libc/arch/hppa/gen/fpgetround.c
index e7438f7db19..8ec62343404 100644
--- a/lib/libc/arch/hppa/gen/fpgetround.c
+++ b/lib/libc/arch/hppa/gen/fpgetround.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpgetround.c,v 1.3 2002/10/21 18:41:05 mickey Exp $	*/
+/*	$OpenBSD: fpgetround.c,v 1.4 2014/04/18 15:09:52 guenther Exp $	*/
 
 /*
  * Written by Miodrag Vallat.  Public domain
@@ -12,6 +12,6 @@ fpgetround()
 {
 	u_int64_t fpsr;
 
-	__asm__ __volatile__("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
+	__asm__ volatile("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
 	return ((fpsr >> 41) & 0x3);
 }
diff --git a/lib/libc/arch/hppa/gen/fpgetsticky.c b/lib/libc/arch/hppa/gen/fpgetsticky.c
index 56f61b8cccb..cb5b384c61f 100644
--- a/lib/libc/arch/hppa/gen/fpgetsticky.c
+++ b/lib/libc/arch/hppa/gen/fpgetsticky.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpgetsticky.c,v 1.3 2002/10/21 18:41:05 mickey Exp $	*/
+/*	$OpenBSD: fpgetsticky.c,v 1.4 2014/04/18 15:09:52 guenther Exp $	*/
 
 /*
  * Written by Miodrag Vallat.  Public domain
@@ -12,6 +12,6 @@ fpgetsticky()
 {
 	u_int64_t fpsr;
 
-	__asm__ __volatile__("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
+	__asm__ volatile("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
 	return ((fpsr >> 59) & 0x1f);
 }
diff --git a/lib/libc/arch/hppa/gen/fpsetmask.c b/lib/libc/arch/hppa/gen/fpsetmask.c
index 804c2169ef8..8ccbe320bc5 100644
--- a/lib/libc/arch/hppa/gen/fpsetmask.c
+++ b/lib/libc/arch/hppa/gen/fpsetmask.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpsetmask.c,v 1.4 2004/01/05 06:06:16 otto Exp $	*/
+/*	$OpenBSD: fpsetmask.c,v 1.5 2014/04/18 15:09:52 guenther Exp $	*/
 
 /*
  * Written by Miodrag Vallat.  Public domain
@@ -14,9 +14,9 @@ fpsetmask(mask)
 	u_int64_t fpsr;
 	fp_except old;
 
-	__asm__ __volatile__("fstd %%fr0,0(%1)" : "=m"(fpsr) : "r"(&fpsr));
+	__asm__ volatile("fstd %%fr0,0(%1)" : "=m"(fpsr) : "r"(&fpsr));
 	old = (fpsr >> 32) & 0x1f;
 	fpsr = (fpsr & 0xffffffe000000000LL) | ((u_int64_t)(mask & 0x1f) << 32);
-	__asm__ __volatile__("fldd 0(%0),%%fr0" : : "r"(&fpsr));
+	__asm__ volatile("fldd 0(%0),%%fr0" : : "r"(&fpsr));
 	return (old);
 }
diff --git a/lib/libc/arch/hppa/gen/fpsetround.c b/lib/libc/arch/hppa/gen/fpsetround.c
index 4943efa18ad..086b29a5a9e 100644
--- a/lib/libc/arch/hppa/gen/fpsetround.c
+++ b/lib/libc/arch/hppa/gen/fpsetround.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpsetround.c,v 1.3 2002/10/21 18:41:05 mickey Exp $	*/
+/*	$OpenBSD: fpsetround.c,v 1.4 2014/04/18 15:09:52 guenther Exp $	*/
 
 /*
  * Written by Miodrag Vallat.  Public domain
@@ -14,10 +14,10 @@ fpsetround(rnd_dir)
 	u_int64_t fpsr;
 	fp_rnd old;
 
-	__asm__ __volatile__("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
+	__asm__ volatile("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
 	old = (fpsr >> 41) & 0x03;
 	fpsr = (fpsr & 0xfffff9ff00000000LL) |
 	    ((u_int64_t)(rnd_dir & 0x03) << 41);
-	__asm__ __volatile__("fldd 0(%0),%%fr0" : : "r" (&fpsr));
+	__asm__ volatile("fldd 0(%0),%%fr0" : : "r" (&fpsr));
 	return (old);
 }
diff --git a/lib/libc/arch/hppa/gen/fpsetsticky.c b/lib/libc/arch/hppa/gen/fpsetsticky.c
index 74620aa2a5e..fa506c10464 100644
--- a/lib/libc/arch/hppa/gen/fpsetsticky.c
+++ b/lib/libc/arch/hppa/gen/fpsetsticky.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpsetsticky.c,v 1.5 2011/04/22 14:44:08 martynas Exp $	*/
+/*	$OpenBSD: fpsetsticky.c,v 1.6 2014/04/18 15:09:52 guenther Exp $	*/
 
 /*
  * Written by Miodrag Vallat.  Public domain
@@ -14,9 +14,9 @@ fpsetsticky(mask)
 	u_int64_t fpsr;
 	fp_except old;
 
-	__asm__ __volatile__("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
+	__asm__ volatile("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
 	old = (fpsr >> 59) & 0x1f;
 	fpsr = (fpsr & 0x07ffffff00000000LL) | ((u_int64_t)(mask & 0x1f) << 59);
-	__asm__ __volatile__("fldd 0(%0),%%fr0" : : "r" (&fpsr));
+	__asm__ volatile("fldd 0(%0),%%fr0" : : "r" (&fpsr));
 	return (old);
 }
diff --git a/lib/libc/arch/hppa64/gen/fabs.c b/lib/libc/arch/hppa64/gen/fabs.c
index ebde6369046..888a2559d4f 100644
--- a/lib/libc/arch/hppa64/gen/fabs.c
+++ b/lib/libc/arch/hppa64/gen/fabs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fabs.c,v 1.7 2013/11/13 15:21:51 deraadt Exp $	*/
+/*	$OpenBSD: fabs.c,v 1.8 2014/04/18 15:09:52 guenther Exp $	*/
 
 /*
  * Written by Miodrag Vallat.  Public domain
@@ -11,7 +11,7 @@ double
 fabs(double val)
 {
 
-	__asm__ __volatile__("fabs,dbl %0,%0" : "+f" (val));
+	__asm__ volatile("fabs,dbl %0,%0" : "+f" (val));
 	return (val);
 }
 
diff --git a/lib/libc/arch/hppa64/gen/flt_rounds.c b/lib/libc/arch/hppa64/gen/flt_rounds.c
index fe5274863ef..2947ce7e5c0 100644
--- a/lib/libc/arch/hppa64/gen/flt_rounds.c
+++ b/lib/libc/arch/hppa64/gen/flt_rounds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: flt_rounds.c,v 1.2 2012/06/25 17:01:10 deraadt Exp $	*/
+/*	$OpenBSD: flt_rounds.c,v 1.3 2014/04/18 15:09:52 guenther Exp $	*/
 
 /*
  * Written by Miodrag Vallat.  Public domain.
@@ -19,6 +19,6 @@ __flt_rounds()
 {
 	u_int64_t fpsr;
 
-	__asm__ __volatile__("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
+	__asm__ volatile("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
 	return map[(fpsr >> 41) & 0x03];
 }
diff --git a/lib/libc/arch/hppa64/gen/fpgetmask.c b/lib/libc/arch/hppa64/gen/fpgetmask.c
index db64a22e41b..297f3372b76 100644
--- a/lib/libc/arch/hppa64/gen/fpgetmask.c
+++ b/lib/libc/arch/hppa64/gen/fpgetmask.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpgetmask.c,v 1.1 2005/04/01 10:54:27 mickey Exp $	*/
+/*	$OpenBSD: fpgetmask.c,v 1.2 2014/04/18 15:09:52 guenther Exp $	*/
 
 /*
  * Written by Miodrag Vallat.  Public domain
@@ -12,6 +12,6 @@ fpgetmask()
 {
 	u_int64_t fpsr;
 
-	__asm__ __volatile__("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
+	__asm__ volatile("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
 	return ((fpsr >> 32) & 0x1f);
 }
diff --git a/lib/libc/arch/hppa64/gen/fpgetround.c b/lib/libc/arch/hppa64/gen/fpgetround.c
index c27df493366..4616ccbbe5a 100644
--- a/lib/libc/arch/hppa64/gen/fpgetround.c
+++ b/lib/libc/arch/hppa64/gen/fpgetround.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpgetround.c,v 1.1 2005/04/01 10:54:27 mickey Exp $	*/
+/*	$OpenBSD: fpgetround.c,v 1.2 2014/04/18 15:09:52 guenther Exp $	*/
 
 /*
  * Written by Miodrag Vallat.  Public domain
@@ -12,6 +12,6 @@ fpgetround()
 {
 	u_int64_t fpsr;
 
-	__asm__ __volatile__("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
+	__asm__ volatile("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
 	return ((fpsr >> 41) & 0x3);
 }
diff --git a/lib/libc/arch/hppa64/gen/fpgetsticky.c b/lib/libc/arch/hppa64/gen/fpgetsticky.c
index de112641fa9..c43de9bc694 100644
--- a/lib/libc/arch/hppa64/gen/fpgetsticky.c
+++ b/lib/libc/arch/hppa64/gen/fpgetsticky.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpgetsticky.c,v 1.1 2005/04/01 10:54:27 mickey Exp $	*/
+/*	$OpenBSD: fpgetsticky.c,v 1.2 2014/04/18 15:09:52 guenther Exp $	*/
 
 /*
  * Written by Miodrag Vallat.  Public domain
@@ -12,6 +12,6 @@ fpgetsticky()
 {
 	u_int64_t fpsr;
 
-	__asm__ __volatile__("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
+	__asm__ volatile("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
 	return ((fpsr >> 59) & 0x1f);
 }
diff --git a/lib/libc/arch/hppa64/gen/fpsetmask.c b/lib/libc/arch/hppa64/gen/fpsetmask.c
index 757690ea3b9..bc92959feae 100644
--- a/lib/libc/arch/hppa64/gen/fpsetmask.c
+++ b/lib/libc/arch/hppa64/gen/fpsetmask.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpsetmask.c,v 1.1 2005/04/01 10:54:27 mickey Exp $	*/
+/*	$OpenBSD: fpsetmask.c,v 1.2 2014/04/18 15:09:52 guenther Exp $	*/
 
 /*
  * Written by Miodrag Vallat.  Public domain
@@ -14,9 +14,9 @@ fpsetmask(mask)
 	u_int64_t fpsr;
 	fp_except old;
 
-	__asm__ __volatile__("fstd %%fr0,0(%1)" : "=m"(fpsr) : "r"(&fpsr));
+	__asm__ volatile("fstd %%fr0,0(%1)" : "=m"(fpsr) : "r"(&fpsr));
 	old = (fpsr >> 32) & 0x1f;
 	fpsr = (fpsr & 0xffffffe000000000LL) | ((u_int64_t)(mask & 0x1f) << 32);
-	__asm__ __volatile__("fldd 0(%0),%%fr0" : : "r"(&fpsr));
+	__asm__ volatile("fldd 0(%0),%%fr0" : : "r"(&fpsr));
 	return (old);
 }
diff --git a/lib/libc/arch/hppa64/gen/fpsetround.c b/lib/libc/arch/hppa64/gen/fpsetround.c
index c64cd406bc8..17879c9c265 100644
--- a/lib/libc/arch/hppa64/gen/fpsetround.c
+++ b/lib/libc/arch/hppa64/gen/fpsetround.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpsetround.c,v 1.1 2005/04/01 10:54:27 mickey Exp $	*/
+/*	$OpenBSD: fpsetround.c,v 1.2 2014/04/18 15:09:52 guenther Exp $	*/
 
 /*
  * Written by Miodrag Vallat.  Public domain
@@ -14,10 +14,10 @@ fpsetround(rnd_dir)
 	u_int64_t fpsr;
 	fp_rnd old;
 
-	__asm__ __volatile__("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
+	__asm__ volatile("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
 	old = (fpsr >> 41) & 0x03;
 	fpsr = (fpsr & 0xfffff9ff00000000LL) |
 	    ((u_int64_t)(rnd_dir & 0x03) << 41);
-	__asm__ __volatile__("fldd 0(%0),%%fr0" : : "r" (&fpsr));
+	__asm__ volatile("fldd 0(%0),%%fr0" : : "r" (&fpsr));
 	return (old);
 }
diff --git a/lib/libc/arch/hppa64/gen/fpsetsticky.c b/lib/libc/arch/hppa64/gen/fpsetsticky.c
index c2b1c263964..3b4bb46a94f 100644
--- a/lib/libc/arch/hppa64/gen/fpsetsticky.c
+++ b/lib/libc/arch/hppa64/gen/fpsetsticky.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpsetsticky.c,v 1.2 2011/04/23 21:40:52 martynas Exp $	*/
+/*	$OpenBSD: fpsetsticky.c,v 1.3 2014/04/18 15:09:52 guenther Exp $	*/
 
 /*
  * Written by Miodrag Vallat.  Public domain
@@ -14,9 +14,9 @@ fpsetsticky(mask)
 	u_int64_t fpsr;
 	fp_except old;
 
-	__asm__ __volatile__("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
+	__asm__ volatile("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
 	old = (fpsr >> 59) & 0x1f;
 	fpsr = (fpsr & 0x07ffffff00000000LL) | ((u_int64_t)(mask & 0x1f) << 59);
-	__asm__ __volatile__("fldd 0(%0),%%fr0" : : "r" (&fpsr));
+	__asm__ volatile("fldd 0(%0),%%fr0" : : "r" (&fpsr));
 	return (old);
 }
diff --git a/lib/libc/arch/sh/gen/fabs.c b/lib/libc/arch/sh/gen/fabs.c
index 32412293982..93883d56780 100644
--- a/lib/libc/arch/sh/gen/fabs.c
+++ b/lib/libc/arch/sh/gen/fabs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fabs.c,v 1.11 2013/03/28 18:09:38 martynas Exp $	*/
+/*	$OpenBSD: fabs.c,v 1.12 2014/04/18 15:09:52 guenther Exp $	*/
 /*
  * Copyright (c) 2006 Miodrag Vallat.
  *
@@ -27,7 +27,7 @@ double
 fabs(double d)
 {
 #if defined(__SH4__) && !defined(__SH4_NOFPU__)
-	__asm__ __volatile__("fabs %0" : "+f" (d));
+	__asm__ volatile("fabs %0" : "+f" (d));
 #else
 	struct ieee_double *p = (struct ieee_double *)&d;
 
diff --git a/lib/libc/arch/sh/gen/flt_rounds.c b/lib/libc/arch/sh/gen/flt_rounds.c
index 67687ef74a9..ae4b588223f 100644
--- a/lib/libc/arch/sh/gen/flt_rounds.c
+++ b/lib/libc/arch/sh/gen/flt_rounds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: flt_rounds.c,v 1.3 2012/06/25 17:01:11 deraadt Exp $	*/
+/*	$OpenBSD: flt_rounds.c,v 1.4 2014/04/18 15:09:52 guenther Exp $	*/
 /*
  * Copyright (c) 2006 Miodrag Vallat.
  *
@@ -33,7 +33,7 @@ __flt_rounds()
 #if !defined(SOFTFLOAT)
 	register_t fpscr;
 
-	__asm__ __volatile__ ("sts fpscr, %0" : "=r" (fpscr));
+	__asm__ volatile ("sts fpscr, %0" : "=r" (fpscr));
 	return rndmap[fpscr & 0x03];
 #else
 	return rndmap[fpgetround()];
diff --git a/lib/libc/arch/sh/gen/fpgetmask.c b/lib/libc/arch/sh/gen/fpgetmask.c
index 9a6fad84e65..30a2e32c439 100644
--- a/lib/libc/arch/sh/gen/fpgetmask.c
+++ b/lib/libc/arch/sh/gen/fpgetmask.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpgetmask.c,v 1.1 2006/10/10 22:07:10 miod Exp $	*/
+/*	$OpenBSD: fpgetmask.c,v 1.2 2014/04/18 15:09:52 guenther Exp $	*/
 /*
  * Copyright (c) 2006 Miodrag Vallat.
  *
@@ -24,6 +24,6 @@ fpgetmask()
 {
 	register_t fpscr;
 
-	__asm__ __volatile__ ("sts fpscr, %0" : "=r" (fpscr));
+	__asm__ volatile ("sts fpscr, %0" : "=r" (fpscr));
 	return ((fpscr >> 7) & 0x1f);
 }
diff --git a/lib/libc/arch/sh/gen/fpgetround.c b/lib/libc/arch/sh/gen/fpgetround.c
index ab76c2ae7e1..3f45ea139ed 100644
--- a/lib/libc/arch/sh/gen/fpgetround.c
+++ b/lib/libc/arch/sh/gen/fpgetround.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpgetround.c,v 1.1 2006/10/10 22:07:10 miod Exp $	*/
+/*	$OpenBSD: fpgetround.c,v 1.2 2014/04/18 15:09:52 guenther Exp $	*/
 /*
  * Copyright (c) 2006 Miodrag Vallat.
  *
@@ -24,6 +24,6 @@ fpgetround()
 {
 	register_t fpscr;
 
-	__asm__ __volatile__ ("sts fpscr, %0" : "=r" (fpscr));
+	__asm__ volatile ("sts fpscr, %0" : "=r" (fpscr));
 	return (fpscr & 0x3);
 }
diff --git a/lib/libc/arch/sh/gen/fpgetsticky.c b/lib/libc/arch/sh/gen/fpgetsticky.c
index 72df4fd93b0..a93761235e4 100644
--- a/lib/libc/arch/sh/gen/fpgetsticky.c
+++ b/lib/libc/arch/sh/gen/fpgetsticky.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpgetsticky.c,v 1.1 2006/10/10 22:07:10 miod Exp $	*/
+/*	$OpenBSD: fpgetsticky.c,v 1.2 2014/04/18 15:09:52 guenther Exp $	*/
 /*
  * Copyright (c) 2006 Miodrag Vallat.
  *
@@ -24,6 +24,6 @@ fpgetsticky()
 {
 	register_t fpscr;
 
-	__asm__ __volatile__ ("sts fpscr, %0" : "=r" (fpscr));
+	__asm__ volatile ("sts fpscr, %0" : "=r" (fpscr));
 	return ((fpscr >> 2) & 0x1f);
 }
diff --git a/lib/libc/arch/sh/gen/fpsetmask.c b/lib/libc/arch/sh/gen/fpsetmask.c
index 122d9d36e70..117f27e5eab 100644
--- a/lib/libc/arch/sh/gen/fpsetmask.c
+++ b/lib/libc/arch/sh/gen/fpsetmask.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpsetmask.c,v 1.2 2007/03/02 06:11:54 miod Exp $	*/
+/*	$OpenBSD: fpsetmask.c,v 1.3 2014/04/18 15:09:52 guenther Exp $	*/
 /*
  * Copyright (c) 2006 Miodrag Vallat.
  *
@@ -29,8 +29,8 @@ fpsetmask(fp_except mask)
 	__fpscr_values[0] = (__fpscr_values[0] & ~(0x1f << 7)) | (mask << 7);
 	__fpscr_values[1] = (__fpscr_values[1] & ~(0x1f << 7)) | (mask << 7);
 #endif
-	__asm__ __volatile__ ("sts fpscr, %0" : "=r" (fpscr));
+	__asm__ volatile ("sts fpscr, %0" : "=r" (fpscr));
 	nfpscr = (fpscr & ~(0x1f << 7)) | (mask << 7);
-	__asm__ __volatile__ ("lds %0, fpscr" : : "r" (nfpscr));
+	__asm__ volatile ("lds %0, fpscr" : : "r" (nfpscr));
 	return ((fpscr >> 7) & 0x1f);
 }
diff --git a/lib/libc/arch/sh/gen/fpsetround.c b/lib/libc/arch/sh/gen/fpsetround.c
index 9090f647fce..2462a3f4b32 100644
--- a/lib/libc/arch/sh/gen/fpsetround.c
+++ b/lib/libc/arch/sh/gen/fpsetround.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpsetround.c,v 1.2 2007/03/02 06:11:54 miod Exp $	*/
+/*	$OpenBSD: fpsetround.c,v 1.3 2014/04/18 15:09:52 guenther Exp $	*/
 /*
  * Copyright (c) 2006 Miodrag Vallat.
  *
@@ -27,14 +27,14 @@ fpsetround(fp_rnd rnd_dir)
 	extern register_t __fpscr_values[2];
 #endif
 
-	__asm__ __volatile__ ("sts fpscr, %0" : "=r" (fpscr));
+	__asm__ volatile ("sts fpscr, %0" : "=r" (fpscr));
 	if (rnd_dir == FP_RN || rnd_dir == FP_RZ) {
 		nfpscr = (fpscr & ~0x03) | rnd_dir;
 #if defined(__SH4__) && !defined(__SH4_NOFPU__)
 		__fpscr_values[0] = (__fpscr_values[0] & ~0x03) | rnd_dir;
 		__fpscr_values[1] = (__fpscr_values[1] & ~0x03) | rnd_dir;
 #endif
-		__asm__ __volatile__ ("lds %0, fpscr" : : "r" (nfpscr));
+		__asm__ volatile ("lds %0, fpscr" : : "r" (nfpscr));
 	}
 	/* else how report an error? */
 
diff --git a/lib/libc/arch/sh/gen/fpsetsticky.c b/lib/libc/arch/sh/gen/fpsetsticky.c
index 09f13bb94b5..c87da34f2d8 100644
--- a/lib/libc/arch/sh/gen/fpsetsticky.c
+++ b/lib/libc/arch/sh/gen/fpsetsticky.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpsetsticky.c,v 1.2 2007/03/02 06:11:54 miod Exp $	*/
+/*	$OpenBSD: fpsetsticky.c,v 1.3 2014/04/18 15:09:52 guenther Exp $	*/
 /*
  * Copyright (c) 2006 Miodrag Vallat.
  *
@@ -29,8 +29,8 @@ fpsetsticky(fp_except mask)
 	__fpscr_values[0] = (__fpscr_values[0] & ~(0x1f << 2)) | (mask << 2);
 	__fpscr_values[1] = (__fpscr_values[1] & ~(0x1f << 2)) | (mask << 2);
 #endif
-	__asm__ __volatile__ ("sts fpscr, %0" : "=r" (fpscr));
+	__asm__ volatile ("sts fpscr, %0" : "=r" (fpscr));
 	nfpscr = (fpscr & ~(0x1f << 2)) | (mask << 2);
-	__asm__ __volatile__ ("lds %0, fpscr" : : "r" (nfpscr));
+	__asm__ volatile ("lds %0, fpscr" : : "r" (nfpscr));
 	return ((fpscr >> 2) & 0x1f);
 }