nvptx mkoffload: Don't hard-code GOMP_DEVICE_NVIDIA_PTX.

	gcc/
	* config/nvptx/mkoffload.c: Include "gomp-constants.h".
	(process): Use its GOMP_DEVICE_NVIDIA_PTX instead of (wrongly)
	hard-coding PTX_ID.

From-SVN: r220619

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2fa7ff2..1479dcb 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-11  Thomas Schwinge  <thomas@codesourcery.com>
+
+       * config/nvptx/mkoffload.c: Include "gomp-constants.h".
+       (process): Use its GOMP_DEVICE_NVIDIA_PTX instead of (wrongly)
+       hard-coding PTX_ID.
+
 2015-02-11  H.J. Lu  <hongjiu.lu@intel.com>
 
        * doc/sourcebuild.texi (pie_enabled): Document.

diff --git a/gcc/config/nvptx/mkoffload.c b/gcc/config/nvptx/mkoffload.c
index 38ccdba..8f359cf 100644 (file)
--- a/gcc/config/nvptx/mkoffload.c
+++ b/gcc/config/nvptx/mkoffload.c
@@ -35,6 +35,7 @@
 #include "obstack.h"
 #include "diagnostic-core.h"
 #include "collect-utils.h"
+#include "gomp-constants.h"
 
 const char tool_name[] = "nvptx mkoffload";
 
@@ -791,9 +792,9 @@ process (FILE *in, FILE *out)
   fprintf (out, "extern void GOMP_offload_register (const void *, int, void *);\n");
 
   fprintf (out, "extern void *__OPENMP_TARGET__[];\n\n");
-  fprintf (out, "#define PTX_ID 1\n");
   fprintf (out, "static __attribute__((constructor)) void init (void)\n{\n");
-  fprintf (out, "  GOMP_offload_register (__OPENMP_TARGET__, PTX_ID,\n");
+  fprintf (out, "  GOMP_offload_register (__OPENMP_TARGET__, %d,\n",
+          GOMP_DEVICE_NVIDIA_PTX);
   fprintf (out, "                         &target_data);\n");
   fprintf (out, "};\n");
 }