Re: [PATCH] gcc-plugin: include memmodel.h and tree_vrp.h for gcc-7

From: Kees Cook
Date: Fri Dec 16 2016 - 14:40:29 EST


On Fri, Dec 16, 2016 at 6:10 AM, Emese Revfy <re.emese@xxxxxxxxx> wrote:
> On Fri, 16 Dec 2016 10:00:22 +0100
> Arnd Bergmann <arnd@xxxxxxxx> wrote:
>
>> Cc: stable@xxxxxxxxxxxxxxx
>> Suggested-by: Kugan <kugan.vivekanandarajah@xxxxxxxxxx>
>> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
>> ---
>> 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

--
Kees Cook
Nexus Security