gcc/

[pf3gnuchains/gcc-fork.git] / libgomp / critical.c

diff --git a/libgomp/critical.c b/libgomp/critical.c
index 70159ec..daf1ffc 100644 (file)
--- a/libgomp/critical.c
+++ b/libgomp/critical.c
@@ -1,29 +1,26 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2009 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    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.
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, 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
+   FOR A PARTICULAR PURPOSE.  See the GNU 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.  */
+   Under Section 7 of GPL version 3, you are granted additional
+   permissions described in the GCC Runtime Library Exception, version
+   3.1, as published by the Free Software Foundation.
 
-/* 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.  */
+   You should have received a copy of the GNU General Public License and
+   a copy of the GCC Runtime Library Exception along with this program;
+   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+   <http://www.gnu.org/licenses/>.  */
 
 /* This file handles the CRITICAL construct.  */
 
@@ -72,12 +69,14 @@ GOMP_critical_name_start (void **pptr)
          gomp_mutex_t *nlock = gomp_malloc (sizeof (gomp_mutex_t));
          gomp_mutex_init (nlock);
 
-         plock = __sync_val_compare_and_swap (pptr, plock, nlock);
-         if (plock != nlock)
+         plock = __sync_val_compare_and_swap (pptr, NULL, nlock);
+         if (plock != NULL)
            {
              gomp_mutex_destroy (nlock);
              free (nlock);
            }
+         else
+           plock = nlock;
 #else
          gomp_mutex_lock (&create_lock_lock);
          plock = *pptr;