diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2023-04-26 20:03:23 +0300 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2023-04-26 20:03:23 +0300 |
| commit | 430e44c4a37dd2282f58ddc62dc53e43e4bf8724 (patch) | |
| tree | 7729df5a1cf66718e90fc6b72658a0be5883ccad | |
| parent | fef1ce084af6dc3a0051025c12e04a1eaa5eb1b0 (diff) | |
| download | bdwgc-430e44c4a37dd2282f58ddc62dc53e43e4bf8724.tar.gz | |
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.
| -rw-r--r-- | include/private/gc_priv.h | 2 | ||||
| -rw-r--r-- | os_dep.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/private/gc_priv.h b/include/private/gc_priv.h index 9b3eaeea..8091b7f3 100644 --- a/include/private/gc_priv.h +++ b/include/private/gc_priv.h @@ -2799,7 +2799,7 @@ GC_EXTERN signed_word GC_bytes_found; GC_INNER void GC_mark_thread_local_free_lists(void); #endif -#if defined(GLIBC_2_19_TSX_BUG) && defined(THREADS) +#if defined(GLIBC_2_19_TSX_BUG) && defined(GC_PTHREADS_PARAMARK) /* Parse string like <major>[.<minor>[<tail>]] and return major value. */ GC_INNER int GC_parse_version(int *pminor, const char *pverstr); #endif @@ -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); |