diff options
| author | riastradh <riastradh@NetBSD.org> | 2023-05-25 14:29:45 +0000 |
|---|---|---|
| committer | riastradh <riastradh@NetBSD.org> | 2023-05-25 14:29:45 +0000 |
| commit | 02065f76aba9b2ef700c98f24623b86f19e45644 (patch) | |
| tree | ff9d784ca50abaa7ecaecfa56fa1e108be623e8d /lib | |
| parent | 080abee1f450436c21c6ed2b9eda8e5e40381ad1 (diff) | |
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 (limited to 'lib')
| -rw-r--r-- | lib/libpthread/arch/arm/pthread_md.h | 6 | ||||
| -rw-r--r-- | lib/libpthread/pthread_int.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/libpthread/arch/arm/pthread_md.h b/lib/libpthread/arch/arm/pthread_md.h index ff8b8159916..a397f2d3f29 100644 --- a/lib/libpthread/arch/arm/pthread_md.h +++ b/lib/libpthread/arch/arm/pthread_md.h @@ -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 --git a/lib/libpthread/pthread_int.h b/lib/libpthread/pthread_int.h index 465c7e0cd44..75b716d85d0 100644 --- a/lib/libpthread/pthread_int.h +++ b/lib/libpthread/pthread_int.h @@ -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 /* |
