From: Thomas Schwinge <thomas@codesourcery.com>
Date: Wed, 11 Feb 2015 14:15:47 +0000 (+0100)
Subject: nvptx mkoffload: Initialize GCC diagnostic machinery before using it.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ce888a99a964f06c912b90dd75a55b79f93c86cd;p=gcc.git

nvptx mkoffload: Initialize GCC diagnostic machinery before using it.

	gcc/
	* config/nvptx/mkoffload.c: Include "diagnostic.h" instead of
	"diagnostic-core.h".
	(main): Initialize progname, and call diagnostic_initialize.

From-SVN: r220621
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bc4a050c105..482b12876da 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2015-02-11  Thomas Schwinge  <thomas@codesourcery.com>
 
+	* config/nvptx/mkoffload.c: Include "diagnostic.h" instead of
+	"diagnostic-core.h".
+	(main): Initialize progname, and call diagnostic_initialize.
+
 	* config/nvptx/mkoffload.c (process): Refer to __OFFLOAD_TABLE__
 	instead of __OPENMP_TARGET__.
 
diff --git a/gcc/config/nvptx/mkoffload.c b/gcc/config/nvptx/mkoffload.c
index 2287316c33d..739aee8af85 100644
--- a/gcc/config/nvptx/mkoffload.c
+++ b/gcc/config/nvptx/mkoffload.c
@@ -33,7 +33,7 @@
 #include "intl.h"
 #include <libgen.h>
 #include "obstack.h"
-#include "diagnostic-core.h"
+#include "diagnostic.h"
 #include "collect-utils.h"
 #include "gomp-constants.h"
 
@@ -828,6 +828,9 @@ main (int argc, char **argv)
   FILE *out = stdout;
   const char *outname = 0;
 
+  progname = "mkoffload";
+  diagnostic_initialize (global_dc, 0);
+
   char *collect_gcc = getenv ("COLLECT_GCC");
   if (collect_gcc == NULL)
     fatal_error (input_location, "COLLECT_GCC must be set.");