| Message ID | 20151115232235.GA15533@two.firstfloor.org |
|---|---|
| State | New |
| Headers | show |
On Mon, 16 Nov 2015, Andi Kleen wrote: > diff --git a/gcc/configure b/gcc/configure > index d5f6dd4..1f68744 100755 > --- a/gcc/configure > +++ b/gcc/configure > @@ -11794,10 +11794,11 @@ rm -f conftest.out > > cat > configargs.h <<EOF > /* Generated automatically. */ > -static const char configuration_arguments[] = "$gcc_config_arguments_str"; > -static const char thread_model[] = "$thread_file"; > +char configuration_arguments[] = "$gcc_config_arguments_str"; > +char thread_model[] = "$thread_file"; > > -static const struct { > +/* struct has to have a name to pacify C++ */ > +struct gcc_opts { > const char *name, *value; > } configure_default_options[] = $configure_default_options; But we want these to be const rather than going in writable storage, and static given that they are initialized in a header. I'd suggest marking them with ATTRIBUTE_UNUSED to reflect that files including this header may not use all the values.
diff --git a/gcc/configure b/gcc/configure index d5f6dd4..1f68744 100755 --- a/gcc/configure +++ b/gcc/configure @@ -11794,10 +11794,11 @@ rm -f conftest.out cat > configargs.h <<EOF /* Generated automatically. */ -static const char configuration_arguments[] = "$gcc_config_arguments_str"; -static const char thread_model[] = "$thread_file"; +char configuration_arguments[] = "$gcc_config_arguments_str"; +char thread_model[] = "$thread_file"; -static const struct { +/* struct has to have a name to pacify C++ */ +struct gcc_opts { const char *name, *value; } configure_default_options[] = $configure_default_options; EOF diff --git a/gcc/configure.ac b/gcc/configure.ac index 34df549..4fb7993 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -1707,10 +1707,11 @@ rm -f conftest.out cat > configargs.h <<EOF /* Generated automatically. */ -static const char configuration_arguments[] = "$gcc_config_arguments_str"; -static const char thread_model[] = "$thread_file"; +char configuration_arguments[] = "$gcc_config_arguments_str"; +char thread_model[] = "$thread_file"; -static const struct { +/* struct has to have a name to pacify C++ */ +struct gcc_opts { const char *name, *value; } configure_default_options[] = $configure_default_options; EOF
Without this patch bootstrap errors out with In file included from ./plugin-version.h:1:0, from ../../gcc/gcc/plugin.c:34: ./configargs.h:3:19: error: 'thread_model' defined but not used [-Werror=unused-variable] static const char thread_model[] = "posix"; ^~~~~~~~~~~~ gcc/: 2015-11-15 Andi Kleen <ak@linux.intel.com> * configure.ac: Make configargs.h variables global. Add name to structure. * configure: dito.