aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-07-02 20:39:12 -0400
committerKees Cook <keescook@chromium.org>2018-07-02 22:27:00 -0400
commitc17d6179ad5aec2a6ef85f8555454e9cefd4b9fb (patch)
tree03a13e8c3b9754a13a6bf9ce792acbe29e21d230
parent7daf201d7fe8334e2d2364d4e8ed3394ec9af819 (diff)
gcc-plugins: remove unused GCC_PLUGIN_SUBDIR
GCC_PLUGIN_SUBDIR has never been used. If you really need this in the future, please re-add it then. For now, the code is unused. Remove. 'export HOSTLIBS' is not necessary either. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Kees Cook <keescook@chromium.org>
-rw-r--r--scripts/Makefile.gcc-plugins3
-rw-r--r--scripts/gcc-plugins/Makefile5
2 files changed, 1 insertions, 7 deletions
diff --git a/scripts/Makefile.gcc-plugins b/scripts/Makefile.gcc-plugins
index c961b9a65d11..f9942d9ac3fc 100644
--- a/scripts/Makefile.gcc-plugins
+++ b/scripts/Makefile.gcc-plugins
@@ -19,7 +19,7 @@ gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_RANDSTRUCT_PERFORMANCE) += -fplugin-arg-ra
19 19
20GCC_PLUGINS_CFLAGS := $(strip $(addprefix -fplugin=$(objtree)/scripts/gcc-plugins/, $(gcc-plugin-y)) $(gcc-plugin-cflags-y)) 20GCC_PLUGINS_CFLAGS := $(strip $(addprefix -fplugin=$(objtree)/scripts/gcc-plugins/, $(gcc-plugin-y)) $(gcc-plugin-cflags-y))
21 21
22export GCC_PLUGINS_CFLAGS GCC_PLUGIN GCC_PLUGIN_SUBDIR 22export GCC_PLUGINS_CFLAGS GCC_PLUGIN
23export DISABLE_LATENT_ENTROPY_PLUGIN 23export DISABLE_LATENT_ENTROPY_PLUGIN
24 24
25# sancov_plugin.so can be only in CFLAGS_KCOV because avoid duplication. 25# sancov_plugin.so can be only in CFLAGS_KCOV because avoid duplication.
@@ -27,7 +27,6 @@ GCC_PLUGINS_CFLAGS := $(filter-out %/sancov_plugin.so, $(GCC_PLUGINS_CFLAGS))
27 27
28KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS) 28KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
29GCC_PLUGIN := $(gcc-plugin-y) 29GCC_PLUGIN := $(gcc-plugin-y)
30GCC_PLUGIN_SUBDIR := $(gcc-plugin-subdir-y)
31 30
32# Actually do the build, if requested. 31# Actually do the build, if requested.
33PHONY += gcc-plugins 32PHONY += gcc-plugins
diff --git a/scripts/gcc-plugins/Makefile b/scripts/gcc-plugins/Makefile
index 326254653bd0..aa0d0ec6936d 100644
--- a/scripts/gcc-plugins/Makefile
+++ b/scripts/gcc-plugins/Makefile
@@ -14,8 +14,6 @@ else
14 export HOST_EXTRACXXFLAGS 14 export HOST_EXTRACXXFLAGS
15endif 15endif
16 16
17export HOSTLIBS
18
19$(obj)/randomize_layout_plugin.o: $(objtree)/$(obj)/randomize_layout_seed.h 17$(obj)/randomize_layout_plugin.o: $(objtree)/$(obj)/randomize_layout_seed.h
20quiet_cmd_create_randomize_layout_seed = GENSEED $@ 18quiet_cmd_create_randomize_layout_seed = GENSEED $@
21cmd_create_randomize_layout_seed = \ 19cmd_create_randomize_layout_seed = \
@@ -29,7 +27,4 @@ always := $($(HOSTLIBS)-y)
29 27
30$(foreach p,$($(HOSTLIBS)-y:%.so=%),$(eval $(p)-objs := $(p).o)) 28$(foreach p,$($(HOSTLIBS)-y:%.so=%),$(eval $(p)-objs := $(p).o))
31 29
32subdir-y := $(GCC_PLUGIN_SUBDIR)
33subdir- += $(GCC_PLUGIN_SUBDIR)
34
35clean-files += *.so 30clean-files += *.so