From 5d7b51995eab6b609a1f1e58dc3e3f5a5df73b8d Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 21 Jun 2006 10:59:44 +0200 Subject: [PATCH] critical.c (GOMP_critical_name_start): Fix *pptr initialization when gomp_mutex_t is larger than pointer and... * critical.c (GOMP_critical_name_start): Fix *pptr initialization when gomp_mutex_t is larger than pointer and HAVE_SYNC_BUILTINS is defined. From-SVN: r114843 --- libgomp/ChangeLog | 6 ++++++ libgomp/critical.c | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index dc86f86bdac..8cd5519f404 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,9 @@ +2006-06-21 Jakub Jelinek + + * critical.c (GOMP_critical_name_start): Fix *pptr initialization + when gomp_mutex_t is larger than pointer and HAVE_SYNC_BUILTINS is + defined. + 2006-06-20 Jakub Jelinek PR libgomp/26175 diff --git a/libgomp/critical.c b/libgomp/critical.c index 70159ec7a6e..90821634b5e 100644 --- a/libgomp/critical.c +++ b/libgomp/critical.c @@ -72,12 +72,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;