diff options
| author | Dmitry Vyukov <dvyukov@gcc.gnu.org> | 2013-01-31 08:57:09 -0800 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2013-01-31 17:57:09 +0100 |
| commit | 3b35cd045fa64576748bec13214631de1a9d8e07 (patch) | |
| tree | 511384c5028ea479fc37eda7be114e6ad0972088 /libgomp/config/linux/ptrlock.c | |
| parent | 246a84e0d98cabfd5fa11f30982983def15ca179 (diff) | |
| download | gcc-3b35cd045fa64576748bec13214631de1a9d8e07.zip gcc-3b35cd045fa64576748bec13214631de1a9d8e07.tar.gz gcc-3b35cd045fa64576748bec13214631de1a9d8e07.tar.bz2 | |
re PR sanitizer/55561 (TSAN: provide a TSAN instrumented libgomp)
PR libgomp/55561
* config/linux/wait.h (do_spin): Use atomic load for addr.
* config/linux/ptrlock.c (gomp_ptrlock_get_slow): Use atomic
for intptr and ptrlock.
* config/linux/ptrlock.h (gomp_ptrlock_get): Use atomic load
for ptrlock.
Co-Authored-By: Joost VandeVondele <Joost.VandeVondele@mat.ethz.ch>
From-SVN: r195618
Diffstat (limited to 'libgomp/config/linux/ptrlock.c')
| -rw-r--r-- | libgomp/config/linux/ptrlock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libgomp/config/linux/ptrlock.c b/libgomp/config/linux/ptrlock.c index 6a9ac47..fa51111 100644 --- a/libgomp/config/linux/ptrlock.c +++ b/libgomp/config/linux/ptrlock.c @@ -50,9 +50,9 @@ gomp_ptrlock_get_slow (gomp_ptrlock_t *ptrlock) #endif do do_wait (intptr, 2); - while (*intptr == 2); + while (__atomic_load_n (intptr, MEMMODEL_RELAXED) == 2); __asm volatile ("" : : : "memory"); - return *ptrlock; + return (void *) __atomic_load_n (ptrlock, MEMMODEL_ACQUIRE); } void |