diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | include/gc_config_macros.h | 2 | ||||
| -rw-r--r-- | include/private/gcconfig.h | 3 | ||||
| -rw-r--r-- | pthread_support.c | 2 | ||||
| -rw-r--r-- | tools/threadlibs.c | 2 |
6 files changed, 5 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index dfa734fe..82a9bb29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -141,7 +141,7 @@ IF(CMAKE_USE_PTHREADS_INIT) SET(SRC ${SRC} thread_local_alloc.c) ENDIF() IF ( HOST MATCHES .*-.*-gnu.*) - ADD_DEFINITIONS("-DGC_GNU_THREADS") + ADD_DEFINITIONS("-DGC_THREADS") ADD_DEFINITIONS("-D_REENTRANT") IF(enable_parallel_mark) ADD_DEFINITIONS("-DPARALLEL_MARK") diff --git a/configure.ac b/configure.ac index 5617c3c5..a39eb9d3 100644 --- a/configure.ac +++ b/configure.ac @@ -139,7 +139,6 @@ AH_TEMPLATE([GC_THREADS], [Define to support platform-specific AH_TEMPLATE([GC_AIX_THREADS], [Define to support IBM AIX threads.]) AH_TEMPLATE([GC_DARWIN_THREADS], [Define to support Darwin pthreads.]) AH_TEMPLATE([GC_FREEBSD_THREADS], [Define to support FreeBSD pthreads.]) -AH_TEMPLATE([GC_GNU_THREADS], [Define to support GNU pthreads.]) AH_TEMPLATE([GC_HPUX_THREADS], [Define to support HP/UX 11 pthreads.]) AH_TEMPLATE([GC_IRIX_THREADS], [Define to support Irix pthreads.]) AH_TEMPLATE([GC_LINUX_THREADS], [Define to support pthreads on Linux.]) @@ -245,7 +244,7 @@ case "$THREADS" in AC_DEFINE(USE_COMPILER_TLS) ;; *-*-gnu*) - AC_DEFINE(GC_GNU_THREADS) + AC_DEFINE(GC_THREADS) AC_DEFINE(_REENTRANT) if test "${enable_parallel_mark}" != no; then AC_DEFINE(PARALLEL_MARK) diff --git a/include/gc_config_macros.h b/include/gc_config_macros.h index df63c9c0..21953ade 100644 --- a/include/gc_config_macros.h +++ b/include/gc_config_macros.h @@ -72,7 +72,7 @@ #if defined(GC_AIX_THREADS) || defined(GC_DARWIN_THREADS) \ || defined(GC_DGUX386_THREADS) || defined(GC_FREEBSD_THREADS) \ - || defined(GC_GNU_THREADS) || defined(GC_HPUX_THREADS) \ + || defined(GC_HPUX_THREADS) \ || defined(GC_IRIX_THREADS) || defined(GC_LINUX_THREADS) \ || defined(GC_NETBSD_THREADS) || defined(GC_OPENBSD_THREADS) \ || defined(GC_OSF1_THREADS) || defined(GC_SOLARIS_THREADS) \ diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h index 04cfa90e..8c530557 100644 --- a/include/private/gcconfig.h +++ b/include/private/gcconfig.h @@ -2984,9 +2984,6 @@ #if defined(GC_AIX_THREADS) && !defined(_AIX) # error --> inconsistent configuration #endif -#if defined(GC_GNU_THREADS) && !defined(HURD) -# error --> inconsistent configuration -#endif #if defined(GC_WIN32_THREADS) && !defined(MSWIN32) && !defined(CYGWIN32) \ && !defined(MSWINCE) # error --> inconsistent configuration diff --git a/pthread_support.c b/pthread_support.c index ee4c599c..7d98d925 100644 --- a/pthread_support.c +++ b/pthread_support.c @@ -841,7 +841,7 @@ STATIC void GC_remove_all_threads_but_me(void) # define GC_get_nprocs() pthread_num_processors_np() #elif defined(GC_OSF1_THREADS) || defined(GC_AIX_THREADS) \ - || defined(GC_SOLARIS_THREADS) || defined(GC_GNU_THREADS) \ + || defined(GC_SOLARIS_THREADS) || defined(HURD) \ || defined(PLATFORM_ANDROID) || defined(NACL) GC_INLINE int GC_get_nprocs(void) { diff --git a/tools/threadlibs.c b/tools/threadlibs.c index a97f91b8..879eda7d 100644 --- a/tools/threadlibs.c +++ b/tools/threadlibs.c @@ -29,7 +29,7 @@ int main(void) # endif # if (defined(GC_LINUX_THREADS) && !defined(PLATFORM_ANDROID)) \ || defined(GC_IRIX_THREADS) || defined(GC_DARWIN_THREADS) \ - || defined(GC_AIX_THREADS) || defined(GC_GNU_THREADS) + || defined(GC_AIX_THREADS) || (defined(HURD) && defined(GC_THREADS)) # ifdef GC_USE_DLOPEN_WRAP printf("-ldl "); # endif |