diff options
| author | Kees Cook <keescook@chromium.org> | 2017-07-05 07:41:31 +0300 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2017-07-05 07:41:31 +0300 |
| commit | d1185a8c5dd21182012e6dd531b00fd72f4d30cb (patch) | |
| tree | 1c394d6e27bad00e0f3aba4e59ca19823d0486d5 /scripts/gcc-plugins/gcc-common.h | |
| parent | 6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c (diff) | |
| parent | 03232e0ddebdc2c9d088e6748075704885f039a5 (diff) | |
| download | linux-d1185a8c5dd21182012e6dd531b00fd72f4d30cb.tar.xz | |
Merge branch 'merge/randstruct' into for-next/gcc-plugins
Diffstat (limited to 'scripts/gcc-plugins/gcc-common.h')
| -rw-r--r-- | scripts/gcc-plugins/gcc-common.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h index b232ab15624c..6948898b3cdf 100644 --- a/scripts/gcc-plugins/gcc-common.h +++ b/scripts/gcc-plugins/gcc-common.h @@ -63,6 +63,13 @@ #endif #if BUILDING_GCC_VERSION >= 4006 +/* + * The c-family headers were moved into a subdirectory in GCC version + * 4.7, but most plugin-building users of GCC 4.6 are using the Debian + * or Ubuntu package, which has an out-of-tree patch to move this to the + * same location as found in 4.7 and later: + * https://sources.debian.net/src/gcc-4.6/4.6.3-14/debian/patches/pr45078.diff/ + */ #include "c-family/c-common.h" #else #include "c-common.h" @@ -946,4 +953,9 @@ static inline void debug_gimple_stmt(const_gimple s) get_inner_reference(exp, pbitsize, pbitpos, poffset, pmode, punsignedp, preversep, pvolatilep) #endif +#if BUILDING_GCC_VERSION < 7000 +#define SET_DECL_ALIGN(decl, align) DECL_ALIGN(decl) = (align) +#define SET_DECL_MODE(decl, mode) DECL_MODE(decl) = (mode) +#endif + #endif |