[Bug libgomp/64972] [5 Regression] Build failure in libgomp for i686-w64-mingw32 target after latest merge from gomp-4_0-branch

[rainer@emrich-ebersheim.de]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64972

--- Comment #8 from Rainer Emrich <rainer@emrich-ebersheim.de> ---
I'm testing the following on x86_64-w64-mingw32 at the moment.

Index: oacc-parallel.c
===================================================================
--- oacc-parallel.c     (Revision 221607)
+++ oacc-parallel.c     (Arbeitskopie)
@@ -99,8 +99,9 @@ GOACC_parallel (int device, void (*fn) (
     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);
+  gomp_debug (0, "%s: mapnum=%ld, hostaddrs=%p, sizes=%p, kinds=%p,
async=%d\n",
+             __FUNCTION__, (unsigned long) mapnum, (void *) hostaddrs,
+             sizes, kinds, (int) async);

   select_acc_device (device);

@@ -178,8 +179,9 @@ GOACC_data_start (int device, size_t map
   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);
+  gomp_debug (0, "%s: mapnum=%ld, hostaddrs=%p, sizes=%p, kinds=%p\n",
+             __FUNCTION__, (unsigned long) mapnum, (void *) hostaddrs,
+             sizes, kinds);

   select_acc_device (device);

Index: target.c
===================================================================
--- target.c    (Revision 221607)
+++ target.c    (Arbeitskopie)
@@ -439,8 +439,8 @@ gomp_map_vars (struct gomp_device_descr
                         was missing.  */
                      size_t size = k->host_end - k->host_start;
                      gomp_fatal ("present clause: !acc_is_present (%p, "
-                                 "%zd (0x%zx))", (void *) k->host_start,
-                                 size, size);
+                                 "%ld (0x%lx))", (void *) k->host_start,
+                                 (unsigned long) size, (unsigned long) size);
                    }
                    break;
                  case GOMP_MAP_FORCE_DEVICEPTR: