From bfeb7c1c69130bb13265c49126e6159dbd9b8a5d Mon Sep 17 00:00:00 2001 From: tschwinge Date: Wed, 11 Feb 2015 14:15:47 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@220621 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 4 ++++ gcc/config/nvptx/mkoffload.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) 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 + * 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 #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."); -- 2.11.4.GIT