diff options
| author | Julian Brown <julian@codesourcery.com> | 2019-09-10 08:33:48 -0700 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2020-03-03 12:51:25 +0100 |
| commit | d244bdcbcf9dfc638e1b5a65446cec79ae172519 (patch) | |
| tree | 09dbe47e0a396ba2d9264052d725c6b1bfd20460 | |
| parent | b03f950bf377508c588e488b4e5625ae142c80ac (diff) | |
| download | gcc-d244bdcbcf9dfc638e1b5a65446cec79ae172519.zip gcc-d244bdcbcf9dfc638e1b5a65446cec79ae172519.tar.gz gcc-d244bdcbcf9dfc638e1b5a65446cec79ae172519.tar.bz2 | |
[og9] Fix src_copy mismerge in GOMP_OFFLOAD_openacc_async_host2dev
libgomp/
* plugin/plugin-gcn.c (GOMP_OFFLOAD_openacc_async_host2dev): Enqueue
copy from src_copy not src.
(cherry picked from openacc-gcc-9-branch commit
182c52fc5b247a2bb08a83d27edf269ef668e7dd)
| -rw-r--r-- | libgomp/ChangeLog.omp | 5 | ||||
| -rw-r--r-- | libgomp/plugin/plugin-gcn.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index 59605cd..a15d4a0 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,3 +1,8 @@ +2019-09-10 Julian Brown <julian@codesourcery.com> + + * plugin/plugin-gcn.c (GOMP_OFFLOAD_openacc_async_host2dev): Enqueue + copy from src_copy not src. + 2019-09-10 Kwok Cheung Yeung <kcy@codesourcery.com> * config/gcn/team.c (gomp_gcn_exit_kernel): Free GCN thread list. diff --git a/libgomp/plugin/plugin-gcn.c b/libgomp/plugin/plugin-gcn.c index 9d03e4f..2b17204 100644 --- a/libgomp/plugin/plugin-gcn.c +++ b/libgomp/plugin/plugin-gcn.c @@ -3613,7 +3613,7 @@ GOMP_OFFLOAD_openacc_async_host2dev (int device, void *dst, const void *src, But, that is probably correct. */ void *src_copy = GOMP_PLUGIN_malloc (n); memcpy (src_copy, src, n); - queue_push_copy (aq, dst, src, n, true); + queue_push_copy (aq, dst, src_copy, n, true); return true; } |