| Message ID | 20161216090033.2007806-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 16 Dec 2016 10:00:22 +0100 Arnd Bergmann <arnd@arndb.de> wrote: > Cc: stable@vger.kernel.org > Suggested-by: Kugan <kugan.vivekanandarajah@linaro.org> > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > scripts/gcc-plugins/gcc-common.h | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h > index 950fd2e64bb7..cb4a9518b58a 100644 > --- a/scripts/gcc-plugins/gcc-common.h > +++ b/scripts/gcc-plugins/gcc-common.h > @@ -18,6 +18,9 @@ > > #include "tree-inline.h" > #include "version.h" > +#if BUILDING_GCC_VERSION >= 7000 > +#include "memmodel.h" > +#endif > #include "rtl.h" > #include "tm_p.h" > #include "flags.h" > @@ -66,6 +69,9 @@ > #include "tree-flow.h" > #else > #include "tree-cfgcleanup.h" > +#if BUILDING_GCC_VERSION >= 7000 > +#include "tree-vrp.h" > +#endif > #include "tree-ssa-operands.h" > #include "tree-into-ssa.h" > #endif Hi, Could you please use the upstream gcc-common.h? You can find it here: https://www.grsecurity.net/~paxguy1/gcc-common.h Thanks
On Fri, Dec 16, 2016 at 6:10 AM, Emese Revfy <re.emese@gmail.com> wrote: > On Fri, 16 Dec 2016 10:00:22 +0100 > Arnd Bergmann <arnd@arndb.de> wrote: > >> Cc: stable@vger.kernel.org >> Suggested-by: Kugan <kugan.vivekanandarajah@linaro.org> >> Signed-off-by: Arnd Bergmann <arnd@arndb.de> >> --- >> scripts/gcc-plugins/gcc-common.h | 6 ++++++ >> 1 file changed, 6 insertions(+) >> >> diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h >> index 950fd2e64bb7..cb4a9518b58a 100644 >> --- a/scripts/gcc-plugins/gcc-common.h >> +++ b/scripts/gcc-plugins/gcc-common.h >> @@ -18,6 +18,9 @@ >> >> #include "tree-inline.h" >> #include "version.h" >> +#if BUILDING_GCC_VERSION >= 7000 >> +#include "memmodel.h" >> +#endif >> #include "rtl.h" >> #include "tm_p.h" >> #include "flags.h" >> @@ -66,6 +69,9 @@ >> #include "tree-flow.h" >> #else >> #include "tree-cfgcleanup.h" >> +#if BUILDING_GCC_VERSION >= 7000 >> +#include "tree-vrp.h" >> +#endif >> #include "tree-ssa-operands.h" >> #include "tree-into-ssa.h" >> #endif > > Hi, > > Could you please use the upstream gcc-common.h? You can find it here: > https://www.grsecurity.net/~paxguy1/gcc-common.h A bunch of the diff between this and the existing gcc-common.h are commented out includes. :) I'll strip out those and send the resulting patch. Thanks! -Kees
diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h index 950fd2e64bb7..cb4a9518b58a 100644 --- a/scripts/gcc-plugins/gcc-common.h +++ b/scripts/gcc-plugins/gcc-common.h @@ -18,6 +18,9 @@ #include "tree-inline.h" #include "version.h" +#if BUILDING_GCC_VERSION >= 7000 +#include "memmodel.h" +#endif #include "rtl.h" #include "tm_p.h" #include "flags.h" @@ -66,6 +69,9 @@ #include "tree-flow.h" #else #include "tree-cfgcleanup.h" +#if BUILDING_GCC_VERSION >= 7000 +#include "tree-vrp.h" +#endif #include "tree-ssa-operands.h" #include "tree-into-ssa.h" #endif
Building our gcc plugins currently fails with the gcc-7 snapshots, due to some slightly modified header interfaces: In file included from /git/arm-soc/scripts/gcc-plugins/gcc-common.h:42:0, from <stdin>:1: /home/arnd/cross-gcc/lib/gcc/x86_64-linux/7.0.0/plugin/include/emit-rtl.h:371:41: error: use of enum ‘memmodel’ without previous declaration extern bool need_atomic_barrier_p (enum memmodel, bool); ^ In file included from /git/arm-soc/scripts/gcc-plugins/gcc-common.h:94:0, from <stdin>:1: /home/arnd/cross-gcc/lib/gcc/x86_64-linux/7.0.0/plugin/include/tree-ssanames.h:70:40: error: use of enum ‘value_range_type’ without previous declaration extern void set_range_info (tree, enum value_range_type, const wide_int_ref &, This makes it work again, which will be important once we turn the plugins on in allmodconfig by default. It probably also makes sense to backport these to v4.9 and v4.8, which added the header file originally. Cc: stable@vger.kernel.org Suggested-by: Kugan <kugan.vivekanandarajah@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- scripts/gcc-plugins/gcc-common.h | 6 ++++++ 1 file changed, 6 insertions(+)