backport: re PR libgomp/45240 (parallel.c: GOMP_parallel_end locks a mutex but fails...

	Backport from mainline
	2010-12-02  Jakub Jelinek  <jakub@redhat.com>

	PR libgomp/45240
	* parallel.c (GOMP_parallel_end): Unlock gomp_remaining_threads_lock
	at the end if sync builtins aren't supported.

From-SVN: r167560

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index ce115dafbdfc8c97dfb1196a63d6f2cf0195365b..fbe141a4dd401b051b5d9addcab074b5058a3879 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-07  Jakub Jelinek  <jakub@redhat.com>
+
+       Backport from mainline
+       2010-12-02  Jakub Jelinek  <jakub@redhat.com>
+
+       PR libgomp/45240
+       * parallel.c (GOMP_parallel_end): Unlock gomp_remaining_threads_lock
+       at the end if sync builtins aren't supported.
+
 2010-12-03  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        Backport from mainline:

diff --git a/libgomp/parallel.c b/libgomp/parallel.c
index d83d1698fd5d0d203aa8fb6ff61b3433809ce122..c0966df9f9a54ac7ab5a22c105e9e167de861753 100644 (file)
--- a/libgomp/parallel.c
+++ b/libgomp/parallel.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU OpenMP Library (libgomp).
@@ -123,6 +123,7 @@ GOMP_parallel_end (void)
 #else
          gomp_mutex_lock (&gomp_remaining_threads_lock);
          gomp_remaining_threads_count -= team->nthreads - 1;
+         gomp_mutex_unlock (&gomp_remaining_threads_lock);
 #endif
        }
     }