From: Ivan Maidanski <ivmai@mail.ru>
Date: Wed, 27 Dec 2017 08:09:48 +0000 (+0300)
Subject: Fix error code in abort message if sem_wait failed in start_world (NetBSD)
X-Git-Tag: v7.4.10~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa73c57a83a3a6eb50d111f9f2cb0a1341dc55e1;p=gc

Fix error code in abort message if sem_wait failed in start_world (NetBSD)
(backport of commit 8f42658f from 'release-7_6')

* pthread_stop_world.c [GC_NETBSD_THREADS_WORKAROUND] (GC_start_world):
Print errno instead of the value returned by sem_wait if the latter has
failed; remove "code" local variable.
---

diff --git a/pthread_stop_world.c b/pthread_stop_world.c
index e8467344..daa00f87 100644
--- a/pthread_stop_world.c
+++ b/pthread_stop_world.c
@@ -800,9 +800,6 @@ GC_INNER void GC_start_world(void)
       register int n_live_threads = 0;
       register int result;
 #   endif
-#   ifdef GC_NETBSD_THREADS_WORKAROUND
-      int code;
-#   endif
 
 #   ifdef DEBUG_THREADS
       GC_log_printf("World starting\n");
@@ -853,10 +850,10 @@ GC_INNER void GC_start_world(void)
     }
 #   ifdef GC_NETBSD_THREADS_WORKAROUND
       for (i = 0; i < n_live_threads; i++) {
-        while (0 != (code = sem_wait(&GC_restart_ack_sem))) {
+        while (0 != sem_wait(&GC_restart_ack_sem)) {
           if (errno != EINTR) {
             ABORT_ARG1("sem_wait() for restart handler failed",
-                       ": errcode= %d", code);
+                       ": errcode= %d", errno);
           }
         }
       }