Coalesce host to device transfers in libgomp: not for link pointer

	libgomp/
	* target.c (gomp_map_vars): Call gomp_copy_host2dev instead of
	devicep->host2dev_func.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@266919 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 7ce0cdb42e14b4ccfcdd70637b553e9b6761ab40..99417ef62cf0899f3f0ea19b9d52a24bbef893a0 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,9 @@
+2018-12-09  Thomas Schwinge  <thomas@codesourcery.com>
+           Jakub Jelinek  <jakub@redhat.com>
+
+       * target.c (gomp_map_vars): Call gomp_copy_host2dev instead of
+       devicep->host2dev_func.
+
 2018-12-08  Jakub Jelinek  <jakub@redhat.com>
 
        PR libgomp/87995

diff --git a/libgomp/target.c b/libgomp/target.c
index 8ebc2a370a1656d0a3e3e68664f3048ef668ffb1..a62ae2c3e4b334193f8b9063c267b91012f6a8b5 100644 (file)
--- a/libgomp/target.c
+++ b/libgomp/target.c
@@ -957,9 +957,10 @@ gomp_map_vars (struct gomp_device_descr *devicep, size_t mapnum,
                    /* Set link pointer on target to the device address of the
                       mapped object.  */
                    void *tgt_addr = (void *) (tgt->tgt_start + k->tgt_offset);
-                   devicep->host2dev_func (devicep->target_id,
-                                           (void *) n->tgt_offset,
-                                           &tgt_addr, sizeof (void *));
+                   /* We intentionally do not use coalescing here, as it's not
+                      data allocated by the current call to this function.  */
+                   gomp_copy_host2dev (devicep, (void *) n->tgt_offset,
+                                       &tgt_addr, sizeof (void *), NULL);
                  }
                array++;
              }