On Wed, Mar 01, 2017 at 11:20:37AM +0100, Tom de Vries wrote:
> > 2017-02-27 Jakub Jelinek <ja...@redhat.com>
> >
> > * config/i386/i386.c (ix86_option_override_internal): Use
> > cond ? G_("...") : G_("...") instead of just cond ? "..." : "...".
> > * config/nvptx/nvptx.c (nvptx_goacc_validate_dims): Likewise.
>
> > --- gcc/config/nvptx/nvptx.c.jj 2017-02-21 15:36:03.000000000 +0100
> > +++ gcc/config/nvptx/nvptx.c 2017-02-27 15:48:20.031688240 +0100
> > @@ -4542,8 +4542,8 @@ nvptx_goacc_validate_dims (tree decl, in
> > if (fn_level < 0 && dims[GOMP_DIM_VECTOR] >= 0)
> > warning_at (decl ? DECL_SOURCE_LOCATION (decl) : UNKNOWN_LOCATION, 0,
> > dims[GOMP_DIM_VECTOR]
> > - ? "using vector_length (%d), ignoring %d"
> > - : "using vector_length (%d), ignoring runtime setting",
> > + ? G_("using vector_length (%d), ignoring %d")
> > + : G_("using vector_length (%d), ignoring runtime setting"),
> > PTX_VECTOR_LENGTH, dims[GOMP_DIM_VECTOR]);
> > dims[GOMP_DIM_VECTOR] = PTX_VECTOR_LENGTH;
> > changed = true;
>
> This breaks the nvptx build:
> ...
> src/gcc-mainline/gcc/config/nvptx/nvptx.c: In function 'bool
> nvptx_goacc_validate_dims(tree, int*, int)':
> src/gcc-mainline/gcc/config/nvptx/nvptx.c:4545:51: error: 'G_' was not
> declared in this scope
> ...
Oops, sorry, I've fixed it in i386.c and two other files, but missed
nvptx.c. Fixed thusly, committed to trunk:
2017-03-01 Jakub Jelinek <ja...@redhat.com>
* config/nvptx/nvptx.c: Include intl.h.
--- gcc/config/nvptx/nvptx.c.jj 2017-02-28 16:24:05.000000000 +0100
+++ gcc/config/nvptx/nvptx.c 2017-03-01 11:24:04.178802355 +0100
@@ -69,6 +69,7 @@
#include "tree-phinodes.h"
#include "cfgloop.h"
#include "fold-const.h"
+#include "intl.h"
/* This file should be included last. */
#include "target-def.h"
Jakub
