Module Name: src
Committed By: riastradh
Date: Thu May 25 14:29:45 UTC 2023
Modified Files:
src/lib/libpthread: pthread_int.h
src/lib/libpthread/arch/arm: pthread_md.h
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/lib/libpthread/pthread_int.h
cvs rdiff -u -r1.11 -r1.12 src/lib/libpthread/arch/arm/pthread_md.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpthread/pthread_int.h
diff -u src/lib/libpthread/pthread_int.h:1.109 src/lib/libpthread/pthread_int.h:1.110
--- src/lib/libpthread/pthread_int.h:1.109 Tue Apr 19 20:32:17 2022
+++ src/lib/libpthread/pthread_int.h Thu May 25 14:29:45 2023
@@ -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
/*
Index: src/lib/libpthread/arch/arm/pthread_md.h
diff -u src/lib/libpthread/arch/arm/pthread_md.h:1.11 src/lib/libpthread/arch/arm/pthread_md.h:1.12
--- src/lib/libpthread/arch/arm/pthread_md.h:1.11 Thu Nov 22 20:38:59 2018
+++ src/lib/libpthread/arch/arm/pthread_md.h Thu May 25 14:29:45 2023
@@ -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])
