diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2021-11-29 07:28:03 +0300 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2021-11-29 11:07:38 +0300 |
| commit | 68682b4cba1c33b1f732acd8b127b4f7b42a5f00 (patch) | |
| tree | 3f1bb41c76f4f49808daf3679e653a7446f57622 | |
| parent | 44f3def4259435bd24d6a2c3ce02e247f465250d (diff) | |
| download | bdwgc-68682b4cba1c33b1f732acd8b127b4f7b42a5f00.tar.gz | |
Revert "Force BASE_ATOMIC_OPS_EMULATED definition if AO_USE_PTHREAD_DEFS"
This reverts commit d87fe3febafa61af26c3c4a9469205bdd1780782.
The reason: BASE_ATOMIC_OPS_EMULATED should be defined by configure.ac;
passing -D AO_USE_PTHREAD_DEFS to CFLAGS_EXTRA should test the
algorithm which defines BASE_ATOMIC_OPS_EMULATED.
| -rw-r--r-- | include/private/gcconfig.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h index 0cfcae17..2601b18b 100644 --- a/include/private/gcconfig.h +++ b/include/private/gcconfig.h @@ -2817,15 +2817,13 @@ EXTERN_C_BEGIN # undef GWW_VDB #endif -#if defined(AO_USE_PTHREAD_DEFS) && !defined(BASE_ATOMIC_OPS_EMULATED) - /* For a test purpose only. */ -# define BASE_ATOMIC_OPS_EMULATED 1 -#endif - -#if defined(BASE_ATOMIC_OPS_EMULATED) \ - || (defined(USE_PROC_FOR_LIBRARIES) && defined(GC_LINUX_THREADS)) +#if defined(BASE_ATOMIC_OPS_EMULATED) /* GC_write_fault_handler() cannot use lock-based atomic primitives */ /* as this could lead to a deadlock. */ +# undef MPROTECT_VDB +#endif + +#if defined(USE_PROC_FOR_LIBRARIES) && defined(GC_LINUX_THREADS) /* Incremental GC based on mprotect is incompatible with /proc roots. */ # undef MPROTECT_VDB #endif |