git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR libgomp/64972 (Build failure in libgomp for i686-w64-mingw32 target after latest merge from gomp-4_0-branch) 

PR libgomp/64972
	* oacc-parallel.c (GOACC_parallel): Use PRIu64 if available.
	(GOACC_data_start): Likewise.
	* target.c (gomp_map_vars): Likewise.

From-SVN: r221665
This commit is contained in:
Kai Tietz 2015-03-25 16:05:02 +01:00 committed by Kai Tietz
parent 40916d5021
commit 01c0b3b076
3 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libgomp/ChangeLog
View File

@ -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> 2015-03-21 John David Anglin <danglin@gcc.gnu.org>
* testsuite/libgomp.oacc-c-c++-common/reduction-4.c: Don't run on * testsuite/libgomp.oacc-c-c++-common/reduction-4.c: Don't run on

24
libgomp/oacc-parallel.c
View File

@ -31,6 +31,9 @@
#include "libgomp_g.h" #include "libgomp_g.h"
#include "gomp-constants.h" #include "gomp-constants.h"
#include "oacc-int.h" #include "oacc-int.h"
#ifdef HAVE_INTTYPES_H
# include <inttypes.h> /* For PRIu64. */
#endif
#include <string.h> #include <string.h>
#include <stdarg.h> #include <stdarg.h>
#include <assert.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", gomp_fatal ("num_workers (%d) different from one is not yet supported",
num_workers); num_workers);
gomp_debug (0, "%s: mapnum=%zd, hostaddrs=%p, sizes=%p, kinds=%p, async=%d\n", #ifdef HAVE_INTTYPES_H
__FUNCTION__, mapnum, hostaddrs, sizes, kinds, async); 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); select_acc_device (device);
thr = goacc_thread (); thr = goacc_thread ();
@ -178,8 +187,13 @@ GOACC_data_start (int device, size_t mapnum,
bool host_fallback = device == GOMP_DEVICE_HOST_FALLBACK; bool host_fallback = device == GOMP_DEVICE_HOST_FALLBACK;
struct target_mem_desc *tgt; struct target_mem_desc *tgt;
gomp_debug (0, "%s: mapnum=%zd, hostaddrs=%p, sizes=%p, kinds=%p\n", #ifdef HAVE_INTTYPES_H
__FUNCTION__, mapnum, hostaddrs, sizes, kinds); 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); select_acc_device (device);

14
libgomp/target.c
View File

@ -33,6 +33,9 @@
#include <limits.h> #include <limits.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef HAVE_INTTYPES_H
# include <inttypes.h> /* For PRIu64. */
#endif
#include <string.h> #include <string.h>
#include <assert.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 /* We already looked up the memory region above and it
was missing. */ was missing. */
size_t size = k->host_end - k->host_start; size_t size = k->host_end - k->host_start;
#ifdef HAVE_INTTYPES_H
gomp_fatal ("present clause: !acc_is_present (%p, " gomp_fatal ("present clause: !acc_is_present (%p, "
"%zd (0x%zx))", (void *) k->host_start, "%"PRIu64" (0x%"PRIx64"))",
size, size); (void *) k->host_start,
(uint64_t) size, (uint64_t) size);
#else
gomp_fatal ("present clause: !acc_is_present (%p, "
"%lu (0x%lx))", (void *) k->host_start,
(unsigned long) size, (unsigned long) size);
#endif
} }
break; break;
case GOMP_MAP_FORCE_DEVICEPTR: case GOMP_MAP_FORCE_DEVICEPTR: