From: jsg <jsg@openbsd.org>
Date: Mon, 29 Aug 2022 02:08:13 +0000 (+0000)
Subject: use ansi volatile keyword, not __volatile__
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=07c7d596a12cd69c29a54967c1ad35cdd24dbd4f;p=openbsd

use ansi volatile keyword, not __volatile__
ok miod@ guenther@
---

diff --git a/libexec/ld.so/hppa/rtld_machine.c b/libexec/ld.so/hppa/rtld_machine.c
index 82c7220725c..f62ea8854b3 100644
--- a/libexec/ld.so/hppa/rtld_machine.c
+++ b/libexec/ld.so/hppa/rtld_machine.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtld_machine.c,v 1.43 2022/01/08 06:49:41 guenther Exp $	*/
+/*	$OpenBSD: rtld_machine.c,v 1.44 2022/08/29 02:08:13 jsg Exp $	*/
 
 /*
  * Copyright (c) 2004 Michael Shalayeff
@@ -446,7 +446,7 @@ _dl_bind(elf_object_t *object, int reloff)
 		register long arg1 __asm__("r25") = sizeof(buf);
 		register long arg2 __asm__("r24") = 0xffffffff & (cookie >> 32);
 		register long arg3 __asm__("r23") = 0xffffffff & cookie;
-		__asm__ __volatile__ ("ble 4(%%sr7, %%r1) ! ldi %0, %%r22"
+		__asm__ volatile ("ble 4(%%sr7, %%r1) ! ldi %0, %%r22"
 		    :
 		    : "i" (SYS_kbind), "r" (r1), "r"(arg0), "r"(arg1),
 		      "r"(arg2), "r"(arg3)
diff --git a/sys/arch/mips64/mips64/cache_mips64r2.c b/sys/arch/mips64/mips64/cache_mips64r2.c
index c8d699b9091..8f346989170 100644
--- a/sys/arch/mips64/mips64/cache_mips64r2.c
+++ b/sys/arch/mips64/mips64/cache_mips64r2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cache_mips64r2.c,v 1.3 2017/08/26 13:53:46 visa Exp $	*/
+/*	$OpenBSD: cache_mips64r2.c,v 1.4 2022/08/29 02:08:13 jsg Exp $	*/
 
 /*
  * Copyright (c) 2014 Miodrag Vallat.
@@ -43,7 +43,7 @@
 #define	HitWBInvalidate_S	0x17
 
 #define	cache(op,addr) \
-    __asm__ __volatile__ \
+    __asm__ volatile \
       ("cache %0, 0(%1)" :: "i"(op), "r"(addr) : "memory")
 
 static __inline__ void	mips64r2_hitinv_primary(vaddr_t, vsize_t, vsize_t);
diff --git a/sys/dev/pv/hyperv.c b/sys/dev/pv/hyperv.c
index dcebd3ae681..f57a5e366c1 100644
--- a/sys/dev/pv/hyperv.c
+++ b/sys/dev/pv/hyperv.c
@@ -408,8 +408,8 @@ hv_hypercall(struct hv_softc *sc, uint64_t control, void *input,
 	}
 
 #ifdef __amd64__
-	__asm__ __volatile__ ("mov %0, %%r8" : : "r" (output_pa) : "r8");
-	__asm__ __volatile__ ("call *%3" : "=a" (status) : "c" (control),
+	__asm__ volatile ("mov %0, %%r8" : : "r" (output_pa) : "r8");
+	__asm__ volatile ("call *%3" : "=a" (status) : "c" (control),
 	    "d" (input_pa), "m" (sc->sc_hc));
 #else  /* __i386__ */
 	{
@@ -418,7 +418,7 @@ hv_hypercall(struct hv_softc *sc, uint64_t control, void *input,
 		uint32_t status_hi = 1;
 		uint32_t status_lo = 1;
 
-		__asm__ __volatile__ ("call *%8" :
+		__asm__ volatile ("call *%8" :
 		    "=d" (status_hi), "=a"(status_lo) :
 		    "d" (control_hi), "a" (control_lo),
 		    "b" (0), "c" (input_pa), "D" (0), "S" (output_pa),