This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [libgomp] A couple of patches
> I'd very much prefer, especially given the small size of
> config/posix/{lock.c,omp-lock.h}, to avoid the #ifdef mess
> and instead create config/posix95/ which would contain a Solaris2.[56]*
> override to those two files. config/linux/ overrides them too,
> so there is a precedent in libgomp already.
Thanks to you and Mike for the tip. Revised version attached, tested on
SPARC/Solaris 2.5.1 and 2.6.
2006-10-21 Eric Botcazou <ebotcazou@libertysurf.fr>
PR libgomp/29494
* configure.tgt: Use posix95 configuration for Solaris 2.5.1 and 2.6.
* config/posix95: New directory.
* config/posix95/omp-lock.h: New file.
* config/posix95/lock.c: Likewise.
> This one is obvious.
>
> That said, I'm not libgomp maintainer and can't approve either.
Attached again for completeness.
2006-10-21 Eric Botcazou <ebotcazou@libertysurf.fr>
* configure.tgt: Force initial-exec TLS model on Linux only.
Given that the libgomp maintainer has not be very present on the list lately,
can we use some sort of "approval by consensus" here?
--
Eric Botcazou
Index: configure.tgt
===================================================================
--- configure.tgt (revision 117879)
+++ configure.tgt (working copy)
@@ -95,6 +95,11 @@ case "${target}" in
config_path="mingw32 posix"
;;
+ *-*-solaris2.[56]*)
+ config_path="posix95 posix"
+ XLDFLAGS="${XLDFLAGS} -lposix4"
+ ;;
+
*)
;;
Index: config/posix95/omp-lock.h
===================================================================
--- config/posix95/omp-lock.h (revision 0)
+++ config/posix95/omp-lock.h (revision 0)
@@ -0,0 +1,17 @@
+/* This header is used during the build process to find the size and
+ alignment of the public OpenMP locks, so that we can export data
+ structures without polluting the namespace.
+
+ In this POSIX95 implementation, we map the two locks to the
+ same PTHREADS primitive. */
+
+#include <pthread.h>
+
+typedef pthread_mutex_t omp_lock_t;
+
+typedef struct
+{
+ pthread_mutex_t lock;
+ pthread_t owner;
+ int count;
+} omp_nest_lock_t;
Index: config/posix95/lock.c
===================================================================
--- config/posix95/lock.c (revision 0)
+++ config/posix95/lock.c (revision 0)
@@ -0,0 +1,131 @@
+/* Copyright (C) 2006 Free Software Foundation, Inc.
+
+ This file is part of the GNU OpenMP Library (libgomp).
+
+ Libgomp is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ Libgomp is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
+ more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with libgomp; see the file COPYING.LIB. If not, write to the
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301, USA. */
+
+/* As a special exception, if you link this library with other files, some
+ of which are compiled with GCC, to produce an executable, this library
+ does not by itself cause the resulting executable to be covered by the
+ GNU General Public License. This exception does not however invalidate
+ any other reasons why the executable file might be covered by the GNU
+ General Public License. */
+
+/* This is the POSIX95 implementation of the public OpenMP locking primitives.
+
+ Because OpenMP uses different entry points for normal and recursive
+ locks, and pthreads uses only one entry point, a system may be able
+ to do better and streamline the locking as well as reduce the size
+ of the types exported. */
+
+#include "libgomp.h"
+
+
+void
+omp_init_lock (omp_lock_t *lock)
+{
+ pthread_mutex_init (lock, NULL);
+}
+
+void
+omp_destroy_lock (omp_lock_t *lock)
+{
+ pthread_mutex_destroy (lock);
+}
+
+void
+omp_set_lock (omp_lock_t *lock)
+{
+ pthread_mutex_lock (lock);
+}
+
+void
+omp_unset_lock (omp_lock_t *lock)
+{
+ pthread_mutex_unlock (lock);
+}
+
+int
+omp_test_lock (omp_lock_t *lock)
+{
+ return pthread_mutex_trylock (lock) == 0;
+}
+
+void
+omp_init_nest_lock (omp_nest_lock_t *lock)
+{
+ pthread_mutex_init (&lock->lock, NULL);
+ lock->owner = (pthread_t) 0;
+ lock->count = 0;
+}
+
+void
+omp_destroy_nest_lock (omp_nest_lock_t *lock)
+{
+ pthread_mutex_destroy (&lock->lock);
+}
+
+void
+omp_set_nest_lock (omp_nest_lock_t *lock)
+{
+ pthread_t me = pthread_self ();
+
+ if (lock->owner != me)
+ {
+ pthread_mutex_lock (&lock->lock);
+ lock->owner = me;
+ }
+
+ lock->count++;
+}
+
+void
+omp_unset_nest_lock (omp_nest_lock_t *lock)
+{
+ lock->count--;
+
+ if (lock->count == 0)
+ {
+ lock->owner = (pthread_t) 0;
+ pthread_mutex_unlock (&lock->lock);
+ }
+}
+
+int
+omp_test_nest_lock (omp_nest_lock_t *lock)
+{
+ pthread_t me = pthread_self ();
+
+ if (lock->owner != me)
+ {
+ if (pthread_mutex_trylock (&lock->lock) != 0)
+ return 0;
+ lock->owner = me;
+ }
+
+ return ++lock->count;
+}
+
+ialias (omp_init_lock)
+ialias (omp_init_nest_lock)
+ialias (omp_destroy_lock)
+ialias (omp_destroy_nest_lock)
+ialias (omp_set_lock)
+ialias (omp_set_nest_lock)
+ialias (omp_unset_lock)
+ialias (omp_unset_nest_lock)
+ialias (omp_test_lock)
+ialias (omp_test_nest_lock)
Index: configure.tgt
===================================================================
--- configure.tgt (revision 110691)
+++ configure.tgt (working copy)
@@ -13,9 +13,14 @@
# Optimize TLS usage by avoiding the overhead of dynamic allocation.
# This does require that the library be present during process
# startup, so mark the library as not to be dlopened.
-if test $have_tls = yes && test "$with_gnu_ld" = "yes"; then
+if test $have_tls = yes ; then
+ case "${target}" in
+
+ *-*-linux*)
XCFLAGS="${XCFLAGS} -ftls-model=initial-exec"
XLDFLAGS="${XLDFLAGS} -Wl,-z,nodlopen"
+ ;;
+ esac
fi
# Since we require POSIX threads, assume a POSIX system by default.