diff options
| author | ktietz <ktietz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-03-25 15:05:02 +0000 |
|---|---|---|
| committer | ktietz <ktietz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-03-25 15:05:02 +0000 |
| commit | 2634aed9cfbda253e73e633afcaade558530f60a (patch) | |
| tree | 32f64e21dd3368fee112baede09275f2dc53bbf6 /libgomp | |
| parent | 6f7b15df3cbec3f4931d19fd75581181a3d4dbc6 (diff) | |
| download | gcc-2634aed9cfbda253e73e633afcaade558530f60a.tar.gz | |
PR libgomp/64972
* oacc-parallel.c (GOACC_parallel): Use PRIu64 if available.
(GOACC_data_start): Likewise.
* target.c (gomp_map_vars): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@221665 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 7 | ||||
| -rw-r--r-- | libgomp/oacc-parallel.c | 24 | ||||
| -rw-r--r-- | libgomp/target.c | 14 |
3 files changed, 38 insertions, 7 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 03f66ea04ce..6536fd3c775 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,10 @@ +2015-03-25 Kai Tietz <ktietz@redhat.com> + + PR libgomp/64972 + * oacc-parallel.c (GOACC_parallel): Use PRIu64 if available. + (GOACC_data_start): Likewise. + * target.c (gomp_map_vars): Likewise. + 2015-03-21 John David Anglin <danglin@gcc.gnu.org> * testsuite/libgomp.oacc-c-c++-common/reduction-4.c: Don't run on diff --git a/libgomp/oacc-parallel.c b/libgomp/oacc-parallel.c index a3007428a86..0c74f547a24 100644 --- a/libgomp/oacc-parallel.c +++ b/libgomp/oacc-parallel.c @@ -31,6 +31,9 @@ #include "libgomp_g.h" #include "gomp-constants.h" #include "oacc-int.h" +#ifdef HAVE_INTTYPES_H +# include <inttypes.h> /* For PRIu64. */ +#endif #include <string.h> #include <stdarg.h> #include <assert.h> @@ -99,9 +102,15 @@ GOACC_parallel (int device, void (*fn) (void *), gomp_fatal ("num_workers (%d) different from one is not yet supported", num_workers); - gomp_debug (0, "%s: mapnum=%zd, hostaddrs=%p, sizes=%p, kinds=%p, async=%d\n", - __FUNCTION__, mapnum, hostaddrs, sizes, kinds, async); - +#ifdef HAVE_INTTYPES_H + gomp_debug (0, "%s: mapnum=%"PRIu64", hostaddrs=%p, size=%p, kinds=%p, " + "async = %d\n", + __FUNCTION__, (uint64_t) mapnum, hostaddrs, sizes, kinds, async); +#else + gomp_debug (0, "%s: mapnum=%lu, hostaddrs=%p, sizes=%p, kinds=%p, async=%d\n", + __FUNCTION__, (unsigned long) mapnum, hostaddrs, sizes, kinds, + async); +#endif select_acc_device (device); thr = goacc_thread (); @@ -178,8 +187,13 @@ GOACC_data_start (int device, size_t mapnum, bool host_fallback = device == GOMP_DEVICE_HOST_FALLBACK; struct target_mem_desc *tgt; - gomp_debug (0, "%s: mapnum=%zd, hostaddrs=%p, sizes=%p, kinds=%p\n", - __FUNCTION__, mapnum, hostaddrs, sizes, kinds); +#ifdef HAVE_INTTYPES_H + gomp_debug (0, "%s: mapnum=%"PRIu64", hostaddrs=%p, size=%p, kinds=%p\n", + __FUNCTION__, (uint64_t) mapnum, hostaddrs, sizes, kinds); +#else + gomp_debug (0, "%s: mapnum=%lu, hostaddrs=%p, sizes=%p, kinds=%p\n", + __FUNCTION__, (unsigned long) mapnum, hostaddrs, sizes, kinds); +#endif select_acc_device (device); diff --git a/libgomp/target.c b/libgomp/target.c index 50baa4d1319..c5dda3f0c93 100644 --- a/libgomp/target.c +++ b/libgomp/target.c @@ -33,6 +33,9 @@ #include <limits.h> #include <stdbool.h> #include <stdlib.h> +#ifdef HAVE_INTTYPES_H +# include <inttypes.h> /* For PRIu64. */ +#endif #include <string.h> #include <assert.h> @@ -438,9 +441,16 @@ gomp_map_vars (struct gomp_device_descr *devicep, size_t mapnum, /* We already looked up the memory region above and it was missing. */ size_t size = k->host_end - k->host_start; +#ifdef HAVE_INTTYPES_H + gomp_fatal ("present clause: !acc_is_present (%p, " + "%"PRIu64" (0x%"PRIx64"))", + (void *) k->host_start, + (uint64_t) size, (uint64_t) size); +#else gomp_fatal ("present clause: !acc_is_present (%p, " - "%zd (0x%zx))", (void *) k->host_start, - size, size); + "%lu (0x%lx))", (void *) k->host_start, + (unsigned long) size, (unsigned long) size); +#endif } break; case GOMP_MAP_FORCE_DEVICEPTR: |