diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2016-02-02 14:53:55 +0100 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gcc.gnu.org> | 2016-02-02 14:53:55 +0100 |
| commit | 18f60146494a8c90d5dfc1f640b48f2f34a1588c (patch) | |
| tree | a23d05493cf5649ac0a0266a05895a9348d75e4b /gcc | |
| parent | 1a06f5e6a34797a74e86d2d76369eb9d78c4c538 (diff) | |
| download | gcc-18f60146494a8c90d5dfc1f640b48f2f34a1588c.zip gcc-18f60146494a8c90d5dfc1f640b48f2f34a1588c.tar.gz gcc-18f60146494a8c90d5dfc1f640b48f2f34a1588c.tar.bz2 | |
Merge BUILT_IN_GOACC_HOST_DATA into BUILT_IN_GOACC_DATA_START
gcc/
* omp-builtins.def (BUILT_IN_GOACC_HOST_DATA): Remove.
* omp-low.c (expand_omp_target): Use BUILT_IN_GOACC_DATA_START
instead.
libgomp/
* libgomp.map (GOACC_2.0): Remove GOACC_host_data.
* oacc-parallel.c (GOACC_host_data): Remove function definition.
From-SVN: r233074
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/omp-builtins.def | 2 | ||||
| -rw-r--r-- | gcc/omp-low.c | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 05741331..9a2cec8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2016-02-02 Thomas Schwinge <thomas@codesourcery.com> + + * omp-builtins.def (BUILT_IN_GOACC_HOST_DATA): Remove. + * omp-low.c (expand_omp_target): Use BUILT_IN_GOACC_DATA_START + instead. + 2016-02-02 Richard Biener <rguenther@suse.de> PR tree-optimization/69606 diff --git a/gcc/omp-builtins.def b/gcc/omp-builtins.def index 60199b0..ea012df 100644 --- a/gcc/omp-builtins.def +++ b/gcc/omp-builtins.def @@ -47,8 +47,6 @@ DEF_GOACC_BUILTIN (BUILT_IN_GOACC_UPDATE, "GOACC_update", DEF_GOACC_BUILTIN (BUILT_IN_GOACC_WAIT, "GOACC_wait", BT_FN_VOID_INT_INT_VAR, ATTR_NOTHROW_LIST) -DEF_GOACC_BUILTIN (BUILT_IN_GOACC_HOST_DATA, "GOACC_host_data", - BT_FN_VOID_INT_SIZE_PTR_PTR_PTR, ATTR_NOTHROW_LIST) DEF_GOACC_BUILTIN_COMPILER (BUILT_IN_ACC_ON_DEVICE, "acc_on_device", BT_FN_INT_INT, ATTR_CONST_NOTHROW_LEAF_LIST) diff --git a/gcc/omp-low.c b/gcc/omp-low.c index 0b70274..d41688b 100644 --- a/gcc/omp-low.c +++ b/gcc/omp-low.c @@ -13186,6 +13186,7 @@ expand_omp_target (struct omp_region *region) start_ix = BUILT_IN_GOACC_PARALLEL; break; case GF_OMP_TARGET_KIND_OACC_DATA: + case GF_OMP_TARGET_KIND_OACC_HOST_DATA: start_ix = BUILT_IN_GOACC_DATA_START; break; case GF_OMP_TARGET_KIND_OACC_UPDATE: @@ -13197,9 +13198,6 @@ expand_omp_target (struct omp_region *region) case GF_OMP_TARGET_KIND_OACC_DECLARE: start_ix = BUILT_IN_GOACC_DECLARE; break; - case GF_OMP_TARGET_KIND_OACC_HOST_DATA: - start_ix = BUILT_IN_GOACC_HOST_DATA; - break; default: gcc_unreachable (); } @@ -13324,7 +13322,6 @@ expand_omp_target (struct omp_region *region) case BUILT_IN_GOACC_DATA_START: case BUILT_IN_GOACC_DECLARE: case BUILT_IN_GOMP_TARGET_DATA: - case BUILT_IN_GOACC_HOST_DATA: break; case BUILT_IN_GOMP_TARGET: case BUILT_IN_GOMP_TARGET_UPDATE: |