[src/trunk]: src/lib/libpthread libpthread: Use __nothing, not /* nothing */,...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a571680208f3
branches:  trunk
changeset: 375998:a571680208f3
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu May 25 14:29:45 2023 +0000

description:
libpthread: Use __nothing, not /* nothing */, for empty macros.

No functional change intended -- just safer to do it this way in case
the macros are used in if branches or comma expressions.

PR port-arm/57437 (pthread__smt_pause/wake issue)

XXX pullup-10

diffstat:

 lib/libpthread/arch/arm/pthread_md.h |  6 +++---
 lib/libpthread/pthread_int.h         |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (42 lines):

diff -r e6de9d6035f4 -r a571680208f3 lib/libpthread/arch/arm/pthread_md.h
--- a/lib/libpthread/arch/arm/pthread_md.h      Thu May 25 13:18:44 2023 +0000
+++ b/lib/libpthread/arch/arm/pthread_md.h      Thu May 25 14:29:45 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pthread_md.h,v 1.11 2018/11/22 20:38:59 skrll Exp $    */
+/*     $NetBSD: pthread_md.h,v 1.12 2023/05/25 14:29:45 riastradh Exp $        */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -56,8 +56,8 @@ pthread__sp(void)
 #define pthread__smt_pause()   __asm __volatile(".inst 0xe320f002") /* wfe */
 #define pthread__smt_wake()    __asm __volatile(".inst 0xe320f004") /* sev */
 #else
-#define pthread__smt_pause()
-#define pthread__smt_wake()
+#define pthread__smt_pause()   __nothing
+#define pthread__smt_wake()    __nothing
 #endif
 
 #define        pthread__uc_sp(ucp)     ((ucp)->uc_mcontext.__gregs[_REG_SP])
diff -r e6de9d6035f4 -r a571680208f3 lib/libpthread/pthread_int.h
--- a/lib/libpthread/pthread_int.h      Thu May 25 13:18:44 2023 +0000
+++ b/lib/libpthread/pthread_int.h      Thu May 25 14:29:45 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pthread_int.h,v 1.109 2022/04/19 20:32:17 rillig Exp $ */
+/*     $NetBSD: pthread_int.h,v 1.110 2023/05/25 14:29:45 riastradh Exp $      */
 
 /*-
  * Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008, 2020
@@ -301,10 +301,10 @@ int       pthread__checkpri(int) PTHREAD_HIDE;
 int    pthread__add_specific(pthread_t, pthread_key_t, const void *) PTHREAD_HIDE;
 
 #ifndef pthread__smt_pause
-#define        pthread__smt_pause()    /* nothing */
+#define        pthread__smt_pause()    __nothing
 #endif
 #ifndef pthread__smt_wake
-#define        pthread__smt_wake()     /* nothing */
+#define        pthread__smt_wake()     __nothing
 #endif
 
 /*