From 430e44c4a37dd2282f58ddc62dc53e43e4bf8724 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Wed, 26 Apr 2023 20:03:23 +0300 Subject: Fix unused GC_parse_version if no SOFT_VDB and no parallel mark on Linux (fix of commit 6e1b82b0a) * include/private/gc_priv.h [GLIBC_2_19_TSX_BUG && THREADS] (GC_parse_version): Do not declare unless GC_PTHREADS_PARAMARK. * os_dep.c [(!SOFT_VDB || NO_SOFT_VDB_LINUX_VER_RUNTIME_CHECK) && GLIBC_2_19_TSX_BUG && THREADS] (GC_parse_version): Do not define unless GC_PTHREADS_PARAMARK. --- os_dep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'os_dep.c') diff --git a/os_dep.c b/os_dep.c index be6776a3..9b436584 100644 --- a/os_dep.c +++ b/os_dep.c @@ -2836,7 +2836,7 @@ GC_API GC_push_other_roots_proc GC_CALL GC_get_push_other_roots(void) } #if defined(SOFT_VDB) && !defined(NO_SOFT_VDB_LINUX_VER_RUNTIME_CHECK) \ - || (defined(GLIBC_2_19_TSX_BUG) && defined(THREADS)) + || (defined(GLIBC_2_19_TSX_BUG) && defined(GC_PTHREADS_PARAMARK)) GC_INNER int GC_parse_version(int *pminor, const char *pverstr) { char *endp; unsigned long value = strtoul(pverstr, &endp, 10); -- cgit v1.2.1