Remove GC_GNU_THREADS macro (HURD)

(code refactoring)

* CMakeLists.txt [CMAKE_USE_PTHREADS_INIT && *-*-gnu*] (GC_GNU_THREADS):
Define GC_THREADS macro instead.
* configure.ac [THREADS=posix && *-*-gnu*] (GC_GNU_THREADS): Likewise.
* configure.ac (GC_GNU_THREADS): Remove AH_TEMPLATE.
* include/gc_config_macros.h: Remove check for GC_GNU_THREADS.
* include/private/gcconfig.h [!CPPCHECK]: Remove consistency check for
GC_GNU_THREADS.
* pthread_support.c [GC_PTHREADS && !GC_WIN32_THREADS] (GC_get_nprocs):
Replace GC_GNU_THREADS to HURD macro check.
* tools/threadlibs.c (main): Replace GC_GNU_THREADS to HURD and
GC_THREADS macros check.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dfa734fe02e9b3686997404835f819d65c874197..82a9bb29063c6f8a9ac6a1534cedf266cb0ba806 100644 (file)
--- 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 5617c3c5134d38777a40218ee9a124037fda9823..a39eb9d33d710c34b161d4d59f496a1e3d50b3a2 100644 (file)
--- 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 df63c9c04d5084e484bb39040589d3c2e123d028..21953ade16a388cedb0dd55ed3c86fc50a26de29 100644 (file)
--- 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 04cfa90efa5c7e268b775de73dc01c31ad8dfa09..8c530557e27811963d77a39a04aa05c2f88243df 100644 (file)
--- 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 ee4c599c73a80ee768939969efd81bf787763eda..7d98d9258eb03fd5c4db9200cf66d243259c8dc0 100644 (file)
--- 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 a97f91b8fc9670b4d29a122147fbf9d176404ae8..879eda7ddfaf8c7323250b3ff3a53a5a44dddc18 100644 (file)
--- 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