diff options
| author | Thorsten Blum <thorsten.blum@toblux.com> | 2024-06-30 01:36:09 +0200 |
|---|---|---|
| committer | Kees Cook <kees@kernel.org> | 2024-07-08 12:20:32 -0700 |
| commit | 18c18b1ff6c648ea62571554dfd698110757f894 (patch) | |
| tree | 82db649cbd7a2017f3567a560a96179ac6948b4e /scripts | |
| parent | ef40d28f17bd384d7e0b630c7d83f108a526351b (diff) | |
gcc-plugins: Remove duplicate included header file stringpool.h
The header file stringpool.h is included for GCC version >= 8 and then
again for all versions.
Since the header file stringpool.h was added in GCC 4.9 and the kernel
currently requires GCC 5.1 as a minimum, remove the conditional include.
Including the header file only once removes the following warning
reported by make includecheck:
stringpool.h is included more than once
However, it's important to include stringpool.h before attribs.h
because attribs.h uses some of its functions.
Compile-tested with GCC 14.
Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
Link: https://lore.kernel.org/r/20240629233608.278028-2-thorsten.blum@toblux.com
Signed-off-by: Kees Cook <kees@kernel.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/gcc-plugins/gcc-common.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h index 1ae39b9f4a95..3222c1070444 100644 --- a/scripts/gcc-plugins/gcc-common.h +++ b/scripts/gcc-plugins/gcc-common.h @@ -62,11 +62,7 @@ #include "pass_manager.h" #include "predict.h" #include "ipa-utils.h" - -#if BUILDING_GCC_VERSION >= 8000 #include "stringpool.h" -#endif - #include "attribs.h" #include "varasm.h" #include "stor-layout.h" @@ -78,7 +74,6 @@ #include "context.h" #include "tree-ssa-alias.h" #include "tree-ssa.h" -#include "stringpool.h" #if BUILDING_GCC_VERSION >= 7000 #include "tree-vrp.h" #endif |