diff options
| author | Tobias Burnus <tobias@codesourcery.com> | 2020-03-23 15:29:05 +0100 |
|---|---|---|
| committer | Tobias Burnus <tobias@codesourcery.com> | 2020-03-23 15:29:05 +0100 |
| commit | 4897bb0045dd68474176be9aafb4d77bac4b363a (patch) | |
| tree | ee7ee000f0bde82e6fb2b2dfda58b068a1e9e5e1 /libgomp | |
| parent | ce6413087deba5888a0a9a24f95f3b796e46add9 (diff) | |
| download | gcc-4897bb0045dd68474176be9aafb4d77bac4b363a.zip gcc-4897bb0045dd68474176be9aafb4d77bac4b363a.tar.gz gcc-4897bb0045dd68474176be9aafb4d77bac4b363a.tar.bz2 | |
libgomp – fix declare target link handling (PR94251)
PR libgomp/94251
* target.c (gomp_load_image_to_device): Fix link
variable handling.
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 6 | ||||
| -rw-r--r-- | libgomp/target.c | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index f7cd873..c90cbdc 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,9 @@ +2020-03-20 Tobias Burnus <tobias@codesourcery.com> + + PR libgomp/94251 + * target.c (gomp_load_image_to_device): Fix link + variable handling. + 2020-03-19 Jakub Jelinek <jakub@redhat.com> PR c++/93931 diff --git a/libgomp/target.c b/libgomp/target.c index 0ff727d..c99dd51 100644 --- a/libgomp/target.c +++ b/libgomp/target.c @@ -1648,8 +1648,9 @@ gomp_load_image_to_device (struct gomp_device_descr *devicep, unsigned version, { struct addr_pair *target_var = &target_table[num_funcs + i]; uintptr_t target_size = target_var->end - target_var->start; + bool is_link_var = link_bit & (uintptr_t) host_var_table[i * 2 + 1]; - if ((uintptr_t) host_var_table[i * 2 + 1] != target_size) + if (!is_link_var && (uintptr_t) host_var_table[i * 2 + 1] != target_size) { gomp_mutex_unlock (&devicep->lock); if (is_register_lock) @@ -1663,7 +1664,7 @@ gomp_load_image_to_device (struct gomp_device_descr *devicep, unsigned version, = k->host_start + (size_mask & (uintptr_t) host_var_table[i * 2 + 1]); k->tgt = tgt; k->tgt_offset = target_var->start; - k->refcount = target_size & link_bit ? REFCOUNT_LINK : REFCOUNT_INFINITY; + k->refcount = is_link_var ? REFCOUNT_LINK : REFCOUNT_INFINITY; k->virtual_refcount = 0; k->aux = NULL; array->left = NULL; |