* [PATCH] gcc-plugins: Remove duplicate included header file stringpool.h
@ 2024-06-29 23:36 Thorsten Blum
2024-07-02 21:17 ` Kees Cook
0 siblings, 1 reply; 2+ messages in thread
From: Thorsten Blum @ 2024-06-29 23:36 UTC (permalink / raw)
To: kees; +Cc: linux-hardening, linux-kernel, Thorsten Blum
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>
---
scripts/gcc-plugins/gcc-common.h | 5 -----
1 file changed, 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
--
2.45.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] gcc-plugins: Remove duplicate included header file stringpool.h
2024-06-29 23:36 [PATCH] gcc-plugins: Remove duplicate included header file stringpool.h Thorsten Blum
@ 2024-07-02 21:17 ` Kees Cook
0 siblings, 0 replies; 2+ messages in thread
From: Kees Cook @ 2024-07-02 21:17 UTC (permalink / raw)
To: Thorsten Blum; +Cc: Kees Cook, linux-hardening, linux-kernel
On Sun, 30 Jun 2024 01:36:09 +0200, Thorsten Blum wrote:
> 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:
>
> [...]
Applied to for-next/hardening, thanks!
[1/1] gcc-plugins: Remove duplicate included header file stringpool.h
https://git.kernel.org/kees/c/3a8ccb6a6829
Take care,
--
Kees Cook
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-07-02 21:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-06-29 23:36 [PATCH] gcc-plugins: Remove duplicate included header file stringpool.h Thorsten Blum
2024-07-02 21:17 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®