libgomp – fix declare target link handling (PR94251)

	PR libgomp/94251
	* target.c (gomp_load_image_to_device): Fix link
	variable handling.

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index f7cd873f498cf44c06e72c3a868d6b73f633779a..c90cbdcc711eceb1958e31017e198aaa8d9d3271 100644 (file)
--- 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 0ff727de47d2a4352bd8bc50537379c872452d54..c99dd5196fab66145335d79b2bd4ebe261a4ca94 100644 (file)
--- 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;