[og9] NVPTX GOMP_OFFLOAD_openacc_async_construct arg fix and gomp_print_* support

	libgomp/
	* config/nvptx/gomp_print.c (gomp_print_string, gomp_print_integer,
	gomp_print_double): New.
	* plugin/plugin-nvptx.c (GOMP_OFFLOAD_openacc_async_construct): Add
	dummy device parameter.

(cherry picked from openacc-gcc-9-branch commit
3df3ea7e8163b9ec0c7227c70c6e1154bf95c24a)

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index c03f87144089e680d3ccfab7c551a9153ac3e8d1..c850203e1455d07881cc02d49c8a6af0ac80b01f 100644 (file)
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,3 +1,10 @@
+2019-07-31  Julian Brown  <julian@codesourcery.com>
+
+       * config/nvptx/gomp_print.c (gomp_print_string, gomp_print_integer,
+       gomp_print_double): New.
+       * plugin/plugin-nvptx.c (GOMP_OFFLOAD_openacc_async_construct): Add
+       dummy device parameter.
+
 2019-07-31  Julian Brown  <julian@codesourcery.com>
 
        * libgomp.map (GOMP_2.0.GOMP_4_BRANCH): Remove GOACC_parallel_keyed_v2.

diff --git a/libgomp/config/nvptx/gomp_print.c b/libgomp/config/nvptx/gomp_print.c
new file mode 100644 (file)
index 0000000..811bdd6
--- /dev/null
+++ b/libgomp/config/nvptx/gomp_print.c
@@ -0,0 +1,20 @@
+#include <stdio.h>
+#include <stdint.h>
+
+void
+gomp_print_string (const char *msg, const char *value)
+{
+  printf ("%s%s\n", msg, value);
+}
+
+void
+gomp_print_integer (const char *msg, int64_t value)
+{
+  printf ("%s%ld\n", msg, value);
+}
+
+void
+gomp_print_double (const char *msg, double value)
+{
+  printf ("%s%f\n", msg, value);
+}

diff --git a/libgomp/plugin/plugin-nvptx.c b/libgomp/plugin/plugin-nvptx.c
index 09567ce852c235e3a528182210778d46d6ec2834..4beb3222e8f887992bbdb9493ec1a093f7b34365 100644 (file)
--- a/libgomp/plugin/plugin-nvptx.c
+++ b/libgomp/plugin/plugin-nvptx.c
@@ -1732,7 +1732,7 @@ GOMP_OFFLOAD_openacc_cuda_set_stream (struct goacc_asyncqueue *aq, void *stream)
 }
 
 struct goacc_asyncqueue *
-GOMP_OFFLOAD_openacc_async_construct (void)
+GOMP_OFFLOAD_openacc_async_construct (int device __attribute__((unused)))
 {
   CUstream stream = NULL;
   CUDA_CALL_ERET (NULL, cuStreamCreate, &stream, CU_STREAM_DEFAULT);