Remove support for Solaris threads. (#136971, Sebastian Wilhelmi, patch by

2005-12-02  Matthias Clasen  <mclasen@redhat.com>

	* glib/gspawn.c:
	* configure.in: Remove support for Solaris threads.
	(#136971, Sebastian Wilhelmi, patch by Andrew Paprocki)

diff --git a/ChangeLog b/ChangeLog
index 500f365..4128563 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,16 @@
 2005-12-02  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/gspawn.c:
+       * configure.in: Remove support for Solaris threads. 
+       (#136971, Sebastian Wilhelmi, patch by Andrew Paprocki)
+
+2005-12-02  Matthias Clasen  <mclasen@redhat.com>
+
        * configure.in: Define G_GUINT64_CONSTANT in analogy to
        G_GINT64_CONSTANT.  (#322568, Andrew Paprocki)
 
+2005-12-02  Matthias Clasen  <mclasen@redhat.com>
+
        * glib/gslice.c: Win32 portability fixes and C99ism removal,
        pointed out by Kazuki Iwamoto.  (#323052)
        

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 500f365..4128563 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,8 +1,16 @@
 2005-12-02  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/gspawn.c:
+       * configure.in: Remove support for Solaris threads. 
+       (#136971, Sebastian Wilhelmi, patch by Andrew Paprocki)
+
+2005-12-02  Matthias Clasen  <mclasen@redhat.com>
+
        * configure.in: Define G_GUINT64_CONSTANT in analogy to
        G_GINT64_CONSTANT.  (#322568, Andrew Paprocki)
 
+2005-12-02  Matthias Clasen  <mclasen@redhat.com>
+
        * glib/gslice.c: Win32 portability fixes and C99ism removal,
        pointed out by Kazuki Iwamoto.  (#323052)
        

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 500f365..4128563 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,8 +1,16 @@
 2005-12-02  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/gspawn.c:
+       * configure.in: Remove support for Solaris threads. 
+       (#136971, Sebastian Wilhelmi, patch by Andrew Paprocki)
+
+2005-12-02  Matthias Clasen  <mclasen@redhat.com>
+
        * configure.in: Define G_GUINT64_CONSTANT in analogy to
        G_GINT64_CONSTANT.  (#322568, Andrew Paprocki)
 
+2005-12-02  Matthias Clasen  <mclasen@redhat.com>
+
        * glib/gslice.c: Win32 portability fixes and C99ism removal,
        pointed out by Kazuki Iwamoto.  (#323052)
        

diff --git a/configure.in b/configure.in
index 468d95f..57bc53a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1366,7 +1366,7 @@ dnl *** g_thread checks ***
 dnl ***********************
 
 AC_ARG_WITH(threads,
-           [AC_HELP_STRING([--with-threads=@<:@none/posix/dce/solaris/win32@:>@],
+           [AC_HELP_STRING([--with-threads=@<:@none/posix/dce/win32@:>@],
                            [specify a thread implementation to use])],
            [if test "x$with_threads" = x; then
                want_threads=yes
@@ -1428,13 +1428,6 @@ dnl ***************************************
 # have_threads=none means no default thread implementation
 
 have_threads=no
-if test "x$want_threads" = xyes || test "x$want_threads" = xsolaris; then
-               case $host in
-                       *-*-solaris*)
-               AC_CHECK_LIB(thread, cond_init, have_threads=solaris)
-               ;;
-       esac
-fi
 if test "x$want_threads" = xyes || test "x$want_threads" = xposix \
                                || test "x$want_threads" = xdce; then
        # -D_POSIX4_DRAFT_SOURCE -D_POSIX4A_DRAFT10_SOURCE is for DG/UX
@@ -1580,16 +1573,6 @@ if test x"$have_threads" != xno; then
                G_THREAD_CFLAGS="-threads"
                G_THREAD_LIBS=$G_THREAD_CFLAGS
                ;;
-       *-solaris*)
-               if test x"$GCC" = xyes; then
-                  # We are using solaris threads. posix threads are 
-                  # already catched above.
-                       G_THREAD_CFLAGS="-threads"
-               else
-                       G_THREAD_CFLAGS="-mt"
-               fi
-               G_THREAD_LIBS=$G_THREAD_CFLAGS
-               ;;
        *-sysv5uw7*) # UnixWare 7 
                # We are not using gcc with -pthread. Catched above.
                G_THREAD_CFLAGS="-Kthread"
@@ -1727,13 +1710,6 @@ case $have_threads in
          AC_SUBST(GTHREAD_COMPILE_IMPL_DEFINES)
           CPPFLAGS="$glib_save_CPPFLAGS"
           ;;
-        solaris)
-           mutex_has_default=yes
-           mutex_default_type='mutex_t'
-          mutex_default_init="DEFAULTMUTEX"
-           mutex_header_file='thread.h'
-          g_threads_impl="SOLARIS"
-           ;;
        win32)
           g_threads_impl="WIN32"
           ;;
@@ -1884,8 +1860,6 @@ int main () {
        elif test x"$have_threads" = xwin32; then
                # It's a pointer to a private struct
                GLIB_SIZEOF(,struct _GThreadData *, system_thread)
-       elif test x"$have_threads" = xsolaris; then 
-               GLIB_SIZEOF([#include <thread.h>], thread_t, system_thread)
        fi
 
        LIBS="$glib_save_LIBS"

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 7f78f1f..83cdef7 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,5 +1,9 @@
 2005-12-02  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/building.sgml: 
+       * glib/tmpl/threads.sgml: 
+       * glib/glib-sections.txt: Remove G_THREADS_IMPL_SOLARIS
+
        * glib/tmpl/types.sgml: Document G_GUINT64_CONSTANT.
 
 2005-11-27  Matthias Clasen  <mclasen@redhat.com>

diff --git a/docs/reference/glib/building.sgml b/docs/reference/glib/building.sgml
index c5de07c..93c9abf 100644 (file)
--- a/docs/reference/glib/building.sgml
+++ b/docs/reference/glib/building.sgml
@@ -175,7 +175,7 @@ How to compile GLib itself
             <arg>--enable-threads</arg>
           </group>
           <group>
-            <arg>--with-threads=[none|posix|dce|solaris|win32]</arg>
+            <arg>--with-threads=[none|posix|dce|win32]</arg>
           </group>
          <group>
              <arg>--disable-included-printf</arg>
@@ -304,10 +304,6 @@ How to compile GLib itself
               </para></listitem>
 
               <listitem><para>
-                'solaris' uses the native Solaris thread implementation.
-              </para></listitem>
-
-              <listitem><para>
                 'none' means that GLib will be thread safe,
                 but does not have a default thread
                 implementation. This has to be supplied to

diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index 047520e..59be0ca 100644 (file)
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -499,7 +499,6 @@ g_child_watch_funcs
 <SUBSECTION>
 G_THREADS_ENABLED
 G_THREADS_IMPL_POSIX
-G_THREADS_IMPL_SOLARIS
 G_THREADS_IMPL_NONE
 
 <SUBSECTION>

diff --git a/docs/reference/glib/tmpl/threads.sgml b/docs/reference/glib/tmpl/threads.sgml
index 60bfbf7..0a0b726 100644 (file)
--- a/docs/reference/glib/tmpl/threads.sgml
+++ b/docs/reference/glib/tmpl/threads.sgml
@@ -83,14 +83,6 @@ This macro is defined, if POSIX style threads are used.
 
 
 
-<!-- ##### MACRO G_THREADS_IMPL_SOLARIS ##### -->
-
-<para>
-This macro is defined, if the Solaris thread system is used.
-</para>
-
-
-
 <!-- ##### MACRO G_THREADS_IMPL_NONE ##### -->
 
 <para>

diff --git a/glib/gspawn.c b/glib/gspawn.c
index 4c7fa91..6d77b25 100644 (file)
--- a/glib/gspawn.c
+++ b/glib/gspawn.c
@@ -40,17 +40,6 @@
 
 #include "glibintl.h"
 
-/* With solaris threads, fork() duplicates all threads, which
- * a) could cause unexpected side-effects, and b) is expensive.
- * Once we remove support for solaris threads, the FORK1 #define
- * should be removedl
- */
-#ifdef G_THREADS_IMPL_SOLARIS
-#define FORK1() fork1()
-#else
-#define FORK1() fork()
-#endif
-
 static gint g_execute (const gchar  *file,
                        gchar **argv,
                        gchar **envp,
@@ -1094,7 +1083,7 @@ fork_exec_with_pipes (gboolean              intermediate_child,
   if (standard_error && !make_pipe (stderr_pipe, error))
     goto cleanup_and_fail;
 
-  pid = FORK1 ();
+  pid = fork ();
 
   if (pid < 0)
     {      
@@ -1136,7 +1125,7 @@ fork_exec_with_pipes (gboolean              intermediate_child,
            */
           GPid grandchild_pid;
 
-          grandchild_pid = FORK1 ();
+          grandchild_pid = fork ();
 
           if (grandchild_pid < 0)
             {

diff --git a/gthread/ChangeLog b/gthread/ChangeLog
index b4ae1ee..0bfcb72 100644 (file)
--- a/gthread/ChangeLog
+++ b/gthread/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * Makefile.am: Remove gthread-solaris.c
+
 2005-11-17  Matthias Clasen  <mclasen@redhat.com>
 
        * === Released 2.9.0 ===

diff --git a/gthread/Makefile.am b/gthread/Makefile.am
index 5f244ab..0643052 100644 (file)
--- a/gthread/Makefile.am
+++ b/gthread/Makefile.am
@@ -7,7 +7,6 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gthread \
 EXTRA_DIST =                           \
                makefile.msc.in         \
                gthread-posix.c         \
-               gthread-solaris.c       \
                gthread-win32.c         \
                gthread-none.c          \
                gthread.def             \