Re: use volatile not __volatile__

2022-08-28 Thread Philip Guenther
On Sat, Aug 27, 2022 at 6:41 PM Jonathan Gray  wrote:

> directly use ansi volatile keyword not __volatile__ builtin
>

Yes, please.  ok guenther@


use volatile not __volatile__

2022-08-27 Thread Jonathan Gray
directly use ansi volatile keyword not __volatile__ builtin

diff --git libexec/ld.so/hppa/rtld_machine.c libexec/ld.so/hppa/rtld_machine.c
index 82c7220725c..9d60c12ae4f 100644
--- libexec/ld.so/hppa/rtld_machine.c
+++ libexec/ld.so/hppa/rtld_machine.c
@@ -446,7 +446,7 @@ _dl_bind(elf_object_t *object, int reloff)
register long arg1 __asm__("r25") = sizeof(buf);
register long arg2 __asm__("r24") = 0x & (cookie >> 32);
register long arg3 __asm__("r23") = 0x & 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 sys/arch/mips64/mips64/cache_mips64r2.c 
sys/arch/mips64/mips64/cache_mips64r2.c
index c8d699b9091..8573c92b676 100644
--- sys/arch/mips64/mips64/cache_mips64r2.c
+++ sys/arch/mips64/mips64/cache_mips64r2.c
@@ -43,7 +43,7 @@
 #defineHitWBInvalidate_S   0x17
 
 #definecache(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 sys/dev/pv/hyperv.c sys/dev/pv/hyperv.c
index dcebd3ae681..f57a5e366c1 100644
--- sys/dev/pv/hyperv.c
+++ 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),