1 files changed, 11 insertions, 7 deletions
diff --git a/libgomp/config/posix95/omp-lock.h b/libgomp/config/posix95/omp-lock.h
index c446aec01e5..b542ba13192 100644
--- a/libgomp/config/posix95/omp-lock.h
+++ b/libgomp/config/posix95/omp-lock.h
@@ -6,12 +6,16 @@
    same PTHREADS primitive.  */
 
 #include <pthread.h>
+#include <semaphore.h>
 
+typedef pthread_mutex_t omp_lock_25_t;
+typedef struct { pthread_mutex_t lock; pthread_t owner; int count; } omp_nest_lock_25_t;
+#ifdef HAVE_BROKEN_POSIX_SEMAPHORES
+/* If we don't have working semaphores, we'll make all explicit tasks
+   tied to the creating thread.  */
 typedef pthread_mutex_t omp_lock_t;
-
-typedef struct
-{
-  pthread_mutex_t lock;
-  pthread_t owner;
-  int count;
-} omp_nest_lock_t;
+typedef struct { pthread_mutex_t lock; int count; void *owner; } omp_nest_lock_t;
+#else
+typedef sem_t omp_lock_t;
+typedef struct { sem_t lock; int count; void *owner; } omp_nest_lock_t;
+#endif