Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 19:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

gcc-plugins: use KERNELVERSION for plugin version

Browse Source 
Commit 61f60bac8c ("gcc-plugins: Change all version strings match
kernel") broke parallel builds.

Instead of adding the dependency between GCC plugins and utsrelease.h,
let's use KERNELVERSION, which does not require any build artifact.

Another reason why I want to avoid utsrelease.h is because it depends
on CONFIG_LOCALVERSION(_AUTO) and localversion* files.

(include/generated/utsrelease.h depends on include/config/kernel.release,
which is generated by scripts/setlocalversion)

I want to keep host tools independent of the kernel configuration.

There is no good reason to rebuild GCC plugins just because of
CONFIG_LOCALVERSION being changed.

We just want to associate the plugin versions with the kernel source
version. KERNELVERSION should be enough for our purpose.

Fixes: 61f60bac8c ("gcc-plugins: Change all version strings match kernel")
Reported-by: kernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/linux-mm/202205230239.EZxeZ3Fv-lkp@intel.com
Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20220524135541.1453693-1-masahiroy@kernel.org
This commit is contained in:
Masahiro Yamada 2022-05-24 22:55:41 +09:00 committed by Kees Cook
parent ed5edd5a70
commit d37aa2efc8
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/gcc-plugins/Makefile
View File

@ -28,7 +28,7 @@ GCC_PLUGINS_DIR = $(shell $(CC) -print-file-name=plugin)
plugin_cxxflags = -Wp,-MMD,$(depfile) $(KBUILD_HOSTCXXFLAGS) -fPIC \ plugin_cxxflags = -Wp,-MMD,$(depfile) $(KBUILD_HOSTCXXFLAGS) -fPIC \
-include $(srctree)/include/linux/compiler-version.h \ -include $(srctree)/include/linux/compiler-version.h \
-include $(objtree)/include/generated/utsrelease.h \ -DPLUGIN_VERSION=$(call stringify,$(KERNELVERSION)) \
-I $(GCC_PLUGINS_DIR)/include -I $(obj) -std=gnu++11 \ -I $(GCC_PLUGINS_DIR)/include -I $(obj) -std=gnu++11 \
-fno-rtti -fno-exceptions -fasynchronous-unwind-tables \ -fno-rtti -fno-exceptions -fasynchronous-unwind-tables \
-ggdb -Wno-narrowing -Wno-unused-variable \ -ggdb -Wno-narrowing -Wno-unused-variable \

2
scripts/gcc-plugins/latent_entropy_plugin.c
View File

@ -82,7 +82,7 @@ __visible int plugin_is_GPL_compatible;
static GTY(()) tree latent_entropy_decl; static GTY(()) tree latent_entropy_decl;
static struct plugin_info latent_entropy_plugin_info = { static struct plugin_info latent_entropy_plugin_info = {
.version = UTS_RELEASE, .version = PLUGIN_VERSION,
.help = "disable\tturn off latent entropy instrumentation\n", .help = "disable\tturn off latent entropy instrumentation\n",
}; };

2
scripts/gcc-plugins/randomize_layout_plugin.c
View File

@ -34,7 +34,7 @@ __visible int plugin_is_GPL_compatible;
static int performance_mode; static int performance_mode;
static struct plugin_info randomize_layout_plugin_info = { static struct plugin_info randomize_layout_plugin_info = {
.version = UTS_RELEASE, .version = PLUGIN_VERSION,
.help = "disable\t\t\tdo not activate plugin\n" .help = "disable\t\t\tdo not activate plugin\n"
"performance-mode\tenable cacheline-aware layout randomization\n" "performance-mode\tenable cacheline-aware layout randomization\n"
}; };

2
scripts/gcc-plugins/sancov_plugin.c
View File

@ -26,7 +26,7 @@ __visible int plugin_is_GPL_compatible;
tree sancov_fndecl; tree sancov_fndecl;
static struct plugin_info sancov_plugin_info = { static struct plugin_info sancov_plugin_info = {
.version = UTS_RELEASE, .version = PLUGIN_VERSION,
.help = "sancov plugin\n", .help = "sancov plugin\n",
}; };

2
scripts/gcc-plugins/stackleak_plugin.c
View File

@ -44,7 +44,7 @@ static bool verbose = false;
static GTY(()) tree track_function_decl; static GTY(()) tree track_function_decl;
static struct plugin_info stackleak_plugin_info = { static struct plugin_info stackleak_plugin_info = {
.version = UTS_RELEASE, .version = PLUGIN_VERSION,
.help = "track-min-size=nn\ttrack stack for functions with a stack frame size >= nn bytes\n" .help = "track-min-size=nn\ttrack stack for functions with a stack frame size >= nn bytes\n"
"arch=target_arch\tspecify target build arch\n" "arch=target_arch\tspecify target build arch\n"
"disable\t\tdo not activate the plugin\n" "disable\t\tdo not activate the plugin\n"

2
scripts/gcc-plugins/structleak_plugin.c
View File

@ -37,7 +37,7 @@
__visible int plugin_is_GPL_compatible; __visible int plugin_is_GPL_compatible;
static struct plugin_info structleak_plugin_info = { static struct plugin_info structleak_plugin_info = {
.version = UTS_RELEASE, .version = PLUGIN_VERSION,
.help = "disable\tdo not activate plugin\n" .help = "disable\tdo not activate plugin\n"
"byref\tinit structs passed by reference\n" "byref\tinit structs passed by reference\n"
"byref-all\tinit anything passed by reference\n" "byref-all\tinit anything passed by reference\n"