Merge branch 'vd/pthread-setspecific-g11-fix' into next

* vd/pthread-setspecific-g11-fix: async_die_is_recursing: work around GCC v11.x issue on Fedora
git · Nov 4, 2021 · b4fce69 · b4fce69
2 parents 1ee6274 + 4b540cf
commit b4fce69
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/run-command.c b/run-command.c
@@ -1099,7 +1099,7 @@ static NORETURN void die_async(const char *err, va_list params)
 static int async_die_is_recursing(void)
 {
 	void *ret = pthread_getspecific(async_die_counter);
-	pthread_setspecific(async_die_counter, (void *)1);
+	pthread_setspecific(async_die_counter, &async_die_counter); /* set to any non-NULL valid pointer */
 	return ret != NULL;
 }