From: jca <jca@openbsd.org>
Date: Sun, 25 Jul 2021 22:58:39 +0000 (+0000)
Subject: Consistently use __asm instead of asm/__asm__
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=78617c59c89332c0d685b9510cde3bfa91c80173;p=openbsd

Consistently use __asm instead of asm/__asm__

ok kettenis@
---

diff --git a/lib/libc/arch/amd64/gen/usertc.c b/lib/libc/arch/amd64/gen/usertc.c
index 6c37a8c5cc1..0eef3d3f6db 100644
--- a/lib/libc/arch/amd64/gen/usertc.c
+++ b/lib/libc/arch/amd64/gen/usertc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usertc.c,v 1.3 2020/08/23 21:38:47 cheloha Exp $ */
+/*	$OpenBSD: usertc.c,v 1.4 2021/07/25 22:58:39 jca Exp $ */
 /*
  * Copyright (c) 2020 Paul Irofti <paul@irofti.net>
  *
@@ -22,7 +22,7 @@ static inline u_int
 rdtsc_lfence(void)
 {
 	uint32_t hi, lo;
-	asm volatile("lfence; rdtsc" : "=a"(lo), "=d"(hi));
+	__asm volatile("lfence; rdtsc" : "=a"(lo), "=d"(hi));
 	return ((uint64_t)lo)|(((uint64_t)hi)<<32);
 }
 
diff --git a/lib/libc/arch/mips64/gen/usertc.c b/lib/libc/arch/mips64/gen/usertc.c
index be7263e1c46..c325ab5383e 100644
--- a/lib/libc/arch/mips64/gen/usertc.c
+++ b/lib/libc/arch/mips64/gen/usertc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usertc.c,v 1.2 2020/07/18 08:37:43 visa Exp $	*/
+/*	$OpenBSD: usertc.c,v 1.3 2021/07/25 22:58:39 jca Exp $	*/
 /*
  * Copyright (c) 2020 Visa Hankala
  *
@@ -23,7 +23,7 @@ get_cp0_count(void)
 {
 	uint32_t count;
 
-	__asm__ volatile (
+	__asm volatile (
 	"	.set	push\n"
 	"	.set	mips64r2\n"
 	"	rdhwr	%0, $2\n"