aboutsummaryrefslogtreecommitdiff
path: root/libgomp/iter.c
diff options
context:
space:
mode:
authorJoost VandeVondele <vondele@gcc.gnu.org>2015-08-24 11:01:25 +0000
committerJoost VandeVondele <vondele@gcc.gnu.org>2015-08-24 11:01:25 +0000
commitbfe7ac89a0be108eaccfa277db28ed6141a3d5af (patch)
tree9ce340525056994200979fde5121c358e4f37981 /libgomp/iter.c
parentd485982286692075d175dbbcf17d00431106ce96 (diff)
downloadgcc-bfe7ac89a0be108eaccfa277db28ed6141a3d5af.zip
gcc-bfe7ac89a0be108eaccfa277db28ed6141a3d5af.tar.gz
gcc-bfe7ac89a0be108eaccfa277db28ed6141a3d5af.tar.bz2
re PR libgomp/66761 (libgomp: ThreadSanitizer: data race in libgomp)
PR libgomp/66761 PR libgomp/67303 * iter.c (gomp_iter_dynamic_next): Employ an atomic load. (gomp_iter_guided_next): Idem. * iter_ull.c (gomp_iter_ull_dynamic_next): Idem. (gomp_iter_ull_guided_next): Idem. * config/linux/wait.h (do_spin): Idem. From-SVN: r227119
Diffstat (limited to 'libgomp/iter.c')
-rw-r--r--libgomp/iter.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libgomp/iter.c b/libgomp/iter.c
index 0ceb41d..1def8bd 100644
--- a/libgomp/iter.c
+++ b/libgomp/iter.c
@@ -218,7 +218,7 @@ gomp_iter_dynamic_next (long *pstart, long *pend)
}
}
- start = ws->next;
+ start = __atomic_load_n (&ws->next, MEMMODEL_RELAXED);
while (1)
{
long left = end - start;
@@ -301,7 +301,7 @@ gomp_iter_guided_next (long *pstart, long *pend)
long start, end, nend, incr;
unsigned long chunk_size;
- start = ws->next;
+ start = __atomic_load_n (&ws->next, MEMMODEL_RELAXED);
end = ws->end;
incr = ws->incr;
chunk_size = ws->chunk_size;