While preparing the patch to move gthr* to toplevel libgcc, I noticed that we still have half-hearted support for the posix95 thread model. No port uses it as the default, and the posix95 subdir in libgomp/config isn't referenced anywhere and cannot be used. Thus, I propose to remove this model completely.
Bootstrapped on i386-pc-solaris2.11 to make sure there are no syntax errors. Ok for mainline? Thanks. Rainer 2011-08-07 Rainer Orth <r...@cebitec.uni-bielefeld.de> boehm-gc: * configure.ac (THREADS): Remove posix95. * configure: Regenerate. gcc: * gthr-posix95.h: Remove. * gthr.h [_PTHREADS95]: Remove. * configure.ac (enable_threads): Remove posix95. * configure: Regenerate. * doc/install.texi (Configuration, --enable-threads): Remove posix95. libgomp: * config/posix95/lock.c, posix95/omp-lock.h: Remove. libjava: * configure.ac (THREADS): Remove posix95. * configure: Regenerate. diff --git a/boehm-gc/configure.ac b/boehm-gc/configure.ac --- a/boehm-gc/configure.ac +++ b/boehm-gc/configure.ac @@ -129,7 +129,7 @@ case "$THREADS" in no | none | single) THREADS=none ;; - posix | posix95 | pthreads) + posix | pthreads) THREADS=posix THREADLIBS=-lpthread case "$host" in diff --git a/gcc/configure.ac b/gcc/configure.ac --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -1354,7 +1354,7 @@ case ${enable_threads} in # default target_thread_file='single' ;; - aix | dce | lynx | mipssde | posix | posix95 | rtems | \ + aix | dce | lynx | mipssde | posix | rtems | \ single | tpf | vxworks | win32) target_thread_file=${enable_threads} ;; diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi --- a/gcc/doc/install.texi +++ b/gcc/doc/install.texi @@ -1145,8 +1145,6 @@ MIPS SDE thread support. This is an alias for @samp{single}. @item posix Generic POSIX/Unix98 thread support. -@item posix95 -Generic POSIX/Unix95 thread support. @item rtems RTEMS thread support. @item single diff --git a/gcc/gthr-posix95.h b/gcc/gthr-posix95.h deleted file mode 100644 diff --git a/gcc/gthr.h b/gcc/gthr.h --- a/gcc/gthr.h +++ b/gcc/gthr.h @@ -135,7 +135,6 @@ see the files COPYING3 and COPYING.RUNTI Currently supported threads packages are TPF threads with -D__tpf__ POSIX/Unix98 threads with -D_PTHREADS - POSIX/Unix95 threads with -D_PTHREADS95 DCE threads with -D_DCE_THREADS */ @@ -145,8 +144,6 @@ see the files COPYING3 and COPYING.RUNTI #include "gthr-tpf.h" #elif _PTHREADS #include "gthr-posix.h" -#elif _PTHREADS95 -#include "gthr-posix95.h" #elif _DCE_THREADS #include "gthr-dce.h" diff --git a/libgomp/config/posix95/lock.c b/libgomp/config/posix95/lock.c deleted file mode 100644 diff --git a/libgomp/config/posix95/omp-lock.h b/libgomp/config/posix95/omp-lock.h deleted file mode 100644 diff --git a/libjava/configure.ac b/libjava/configure.ac --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -1043,7 +1043,7 @@ case "$THREADS" in no | none | single) THREADS=none ;; - aix | posix | posix95 | pthreads) + aix | posix | pthreads) THREADS=posix case "$host" in *-*-linux*) -- ----------------------------------------------------------------------------- Rainer Orth, Center for Biotechnology, Bielefeld University