kbuild: move shared library build rules to scripts/gcc-plugins/Makefile
Subsystems (2)
PATCH 1/2 kbuild: move shared library build rules to scripts/gcc-plugins/Makefile
The shared library build rules are currently implemented in scripts/Makefile.host, but actually GCC-plugin is the only user of them. Hence, they do not need to be treewide available.
Move all the relevant build rules to scripts/gcc-plugins/Makefile.
I also optimized the build steps so *.so is directly built from .c because every upstream plugin is compiled from a single source file.
I am still keeping the infrastructure to build a plugin from multiple files because Kees suggested to do so in my previous attempt.
(https://lkml.org/lkml/2019/1/11/1107)
If the plugin, foo.so, is compiled from two files foo.c and foo2.c, then you can do like follows:
foo-objs := foo.o foo2.o
Single-file plugins do not need the *-objs notation.
---
scripts/Makefile.build | 4 +-- scripts/Makefile.clean | 3 +- scripts/Makefile.host | 30 ++---------------- scripts/gcc-plugins/Makefile | 61 +++++++++++++++++++++++++++++------- 4 files changed, 55 insertions(+), 43 deletions(-)
scripts/Makefile.build +2 -2
@@ -45,8 +45,8 @@ include $(kbuild-file) include scripts/Makefile.lib -# Do not include host rules unless needed -ifneq ($(hostprogs)$(hostcxxlibs-y)$(hostcxxlibs-m),) +# Do not include hostprogs rules unless needed +ifneq ($(hostprogs),) include scripts/Makefile.host endif
scripts/Makefile.clean +1 -2
@@ -29,8 +29,7 @@ subdir-ymn := $(addprefix $(obj)/,$(subdir-ymn)) __clean-files := $(extra-y) $(extra-m) $(extra-) \ $(always) $(always-y) $(always-m) $(always-) $(targets) $(clean-files) \ - $(hostprogs) $(hostprogs-y) $(hostprogs-m) $(hostprogs-) $(userprogs) \ - $(hostcxxlibs-y) $(hostcxxlibs-m) + $(hostprogs) $(hostprogs-y) $(hostprogs-m) $(hostprogs-) $(userprogs) __clean-files := $(filter-out $(no-clean-files), $(__clean-files))
scripts/Makefile.host +2 -28
@@ -39,7 +39,6 @@ $(obj)/%.tab.c $(obj)/%.tab.h: $(src)/%.y FORCE # They are linked as C++ code to the executable qconf __hostprogs := $(sort $(hostprogs)) -host-cxxshlib := $(sort $(hostcxxlibs-y) $(hostcxxlibs-m)) # C code # Executables compiled from a single .c file
@@ -61,16 +60,11 @@ host-cxxmulti := $(foreach m,$(__hostprogs),$(if $($(m)-cxxobjs),$(m))) # C++ Object (.o) files compiled from .cc files host-cxxobjs := $(sort $(foreach m,$(host-cxxmulti),$($(m)-cxxobjs))) -# Object (.o) files used by the shared libaries -host-cxxshobjs := $(sort $(foreach m,$(host-cxxshlib),$($(m:.so=-objs)))) - host-csingle := $(addprefix $(obj)/,$(host-csingle)) host-cmulti := $(addprefix $(obj)/,$(host-cmulti)) host-cobjs := $(addprefix $(obj)/,$(host-cobjs)) host-cxxmulti := $(addprefix $(obj)/,$(host-cxxmulti)) host-cxxobjs := $(addprefix $(obj)/,$(host-cxxobjs)) -host-cxxshlib := $(addprefix $(obj)/,$(host-cxxshlib)) -host-cxxshobjs := $(addprefix $(obj)/,$(host-cxxshobjs)) ##### # Handle options to gcc. Support building with separate output directory
@@ -136,25 +130,5 @@ quiet_cmd_host-cxxobjs = HOSTCXX $@ $(host-cxxobjs): $(obj)/%.o: $(src)/%.cc FORCE $(call if_changed_dep,host-cxxobjs) -# Compile .c file, create position independent .o file -# Note that plugin capable gcc versions can be either C or C++ based -# therefore plugin source files have to be compilable in both C and C++ mode. -# This is why a C++ compiler is invoked on a .c file. -# host-cxxshobjs -> .o -quiet_cmd_host-cxxshobjs = HOSTCXX -fPIC $@ - cmd_host-cxxshobjs = $(HOSTCXX) $(hostcxx_flags) -fPIC -c -o $@ $< -$(host-cxxshobjs): $(obj)/%.o: $(src)/%.c FORCE - $(call if_changed_dep,host-cxxshobjs) - -# Link a shared library, based on position independent .o files -# *.o -> .so shared library (host-cxxshlib) -quiet_cmd_host-cxxshlib = HOSTLLD -shared $@ - cmd_host-cxxshlib = $(HOSTCXX) $(KBUILD_HOSTLDFLAGS) -shared -o $@ \ - $(addprefix $(obj)/, $($(target-stem)-objs)) \ - $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(target-stem).so) -$(host-cxxshlib): FORCE - $(call if_changed,host-cxxshlib) -$(call multi_depend, $(host-cxxshlib), .so, -objs) - -targets += $(host-csingle) $(host-cmulti) $(host-cobjs)\ - $(host-cxxmulti) $(host-cxxobjs) $(host-cxxshlib) $(host-cxxshobjs) +targets += $(host-csingle) $(host-cmulti) $(host-cobjs) \ + $(host-cxxmulti) $(host-cxxobjs)
scripts/gcc-plugins/Makefile +50 -11
72 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 2/2 kbuild: sort hostprogs before passing it to ifneq
The conditional:
ifneq ($(hostprogs),)
... is evaluated to true if $(hostprogs) does not contain any word but whitespace characters.
ifneq ($(strip $(hostprogs)),)
... is a safe way to avoid interpreting whitespace as a non-empty value, but I'd rather want to use the side-effect of $(sort ...) to do the equivalent.
$(sort ...) is used in scripts/Makefile.host in order to drop duplication in $(hostprogs). It is also useful to strip excessive spaces.
Move $(sort ...) before evaluating the ifneq.
---
scripts/Makefile.build | 5 ++++- scripts/Makefile.host | 10 ++++------ 2 files changed, 8 insertions(+), 7 deletions(-)
scripts/Makefile.build +4 -1
@@ -45,12 +45,15 @@ include $(kbuild-file) include scripts/Makefile.lib -# Do not include hostprogs rules unless needed +# Do not include hostprogs rules unless needed. +# $(sort ...) is used here to remove duplicated words and excessive spaces. +hostprogs := $(sort $(hostprogs)) ifneq ($(hostprogs),) include scripts/Makefile.host endif # Do not include userprogs rules unless needed. +# $(sort ...) is used here to remove duplicated words and excessive spaces. userprogs := $(sort $(userprogs)) ifneq ($(userprogs),) include scripts/Makefile.userprogs
scripts/Makefile.host +4 -6
@@ -38,24 +38,22 @@ $(obj)/%.tab.c $(obj)/%.tab.h: $(src)/%.y FORCE # Will compile qconf as a C++ program, and menu as a C program. # They are linked as C++ code to the executable qconf -__hostprogs := $(sort $(hostprogs)) - # C code # Executables compiled from a single .c file -host-csingle := $(foreach m,$(__hostprogs), \ +host-csingle := $(foreach m,$(hostprogs), \ $(if $($(m)-objs)$($(m)-cxxobjs),,$(m))) # C executables linked based on several .o files -host-cmulti := $(foreach m,$(__hostprogs),\ +host-cmulti := $(foreach m,$(hostprogs),\ $(if $($(m)-cxxobjs),,$(if $($(m)-objs),$(m)))) # Object (.o) files compiled from .c files -host-cobjs := $(sort $(foreach m,$(__hostprogs),$($(m)-objs))) +host-cobjs := $(sort $(foreach m,$(hostprogs),$($(m)-objs))) # C++ code # C++ executables compiled from at least one .cc file # and zero or more .c files -host-cxxmulti := $(foreach m,$(__hostprogs),$(if $($(m)-cxxobjs),$(m))) +host-cxxmulti := $(foreach m,$(hostprogs),$(if $($(m)-cxxobjs),$(m))) # C++ Object (.o) files compiled from .cc files host-cxxobjs := $(sort $(foreach m,$(host-cxxmulti),$($(m)-cxxobjs)))
Signature · 1 line
2.25.1
Quoted 3 lines · Masahiro Yamada
The shared library build rules are currently implemented in
scripts/Makefile.host, but actually GCC-plugin is the only user of them. Hence, they do not need to be treewide available.
Are none of the VDSOs intending to use these rules?
Quoted 9 lines
Move all the relevant build rules to
scripts/gcc-plugins/Makefile.I also optimized the build steps so *.so is directly built from .c because every upstream plugin is compiled from a single source file.
I am still keeping the infrastructure to build a plugin from multiple files because Kees suggested to do so in my previous attempt.
(https://lkml.org/lkml/2019/1/11/1107)
Quoted 8 lines
If the plugin, foo.so, is compiled from two files
foo.candfoo2.c, then you can do like follows:foo-objs := foo.o foo2.o
Single-file plugins do not need the *-objs notation.
Signed-off-by Masahiro Yamada <[email protected]>
But, yeah, sure!
Unrelated, but I do note that objtool maybe has the wrong indentation, path name reporting, and tool names (HOSTLD vs CC)?
...
HOSTCC scripts/asn1_compiler HOSTCC scripts/extract-cert HOSTCC scripts/genksyms/genksyms.o YACC scripts/genksyms/parse.tab.[ch] LEX scripts/genksyms/lex.lex.c DESCEND objtool HOSTCXX scripts/gcc-plugins/cyc_complexity_plugin.so HOSTCXX scripts/gcc-plugins/latent_entropy_plugin.so HOSTCXX scripts/gcc-plugins/structleak_plugin.so GENSEED scripts/gcc-plugins/randomize_layout_seed.h HOSTCXX scripts/gcc-plugins/stackleak_plugin.so HOSTCC scripts/genksyms/parse.tab.o HOSTCC scripts/genksyms/lex.lex.o HOSTCC /home/kees/src/linux-build/plugins/tools/objtool/fixdep.o HOSTLD arch/x86/tools/relocs HOSTLD /home/kees/src/linux-build/plugins/tools/objtool/fixdep-in.o LINK /home/kees/src/linux-build/plugins/tools/objtool/fixdep CC /home/kees/src/linux-build/plugins/tools/objtool/exec-cmd.o CC /home/kees/src/linux-build/plugins/tools/objtool/help.o CC /home/kees/src/linux-build/plugins/tools/objtool/weak.o
...
Signature · 1 line
Kees Cook
Quoted 7 lines · Kees Cook
Quoted 3 lines · Masahiro Yamada
The shared library build rules are currently implemented in
scripts/Makefile.host, but actually GCC-plugin is the only user of them. Hence, they do not need to be treewide available.Are none of the VDSOs intending to use these rules?
Right.
GCC plugin .so files are compiled for the _host_ architecture. vDSO .so files are compiled for the _target_ architecture.
They are built in completely different ways.
Quoted 16 lines
Quoted 16 lines
Move all the relevant build rules to
scripts/gcc-plugins/Makefile.I also optimized the build steps so *.so is directly built from .c because every upstream plugin is compiled from a single source file.
I am still keeping the infrastructure to build a plugin from multiple files because Kees suggested to do so in my previous attempt.
(https://lkml.org/lkml/2019/1/11/1107)If the plugin, foo.so, is compiled from two files
foo.candfoo2.c, then you can do like follows:foo-objs := foo.o foo2.o
Single-file plugins do not need the *-objs notation.
Quoted 8 lines
Quoted 1 line
Signed-off-by Masahiro Yamada <[email protected]>But, yeah, sure!
Acked-by Kees Cook <[email protected]>Unrelated, but I do note that objtool maybe has the wrong indentation, path name reporting, and tool names (HOSTLD vs CC)?
Right.
Many people know it.
objtool opts out the Kbuild instructure.
I wrote a patch to make objtool join the Kbuild:
https://patchwork.kernel.org/patch/10839051/
The objtool maintainers refused to do this.
Quoted 21 lines
...
HOSTCC scripts/asn1_compiler HOSTCC scripts/extract-cert HOSTCC scripts/genksyms/genksyms.o YACC scripts/genksyms/parse.tab.[ch] LEX scripts/genksyms/lex.lex.c DESCEND objtool HOSTCXX scripts/gcc-plugins/cyc_complexity_plugin.so HOSTCXX scripts/gcc-plugins/latent_entropy_plugin.so HOSTCXX scripts/gcc-plugins/structleak_plugin.so GENSEED scripts/gcc-plugins/randomize_layout_seed.h HOSTCXX scripts/gcc-plugins/stackleak_plugin.so HOSTCC scripts/genksyms/parse.tab.o HOSTCC scripts/genksyms/lex.lex.o HOSTCC /home/kees/src/linux-build/plugins/tools/objtool/fixdep.o HOSTLD arch/x86/tools/relocs HOSTLD /home/kees/src/linux-build/plugins/tools/objtool/fixdep-in.o LINK /home/kees/src/linux-build/plugins/tools/objtool/fixdep CC /home/kees/src/linux-build/plugins/tools/objtool/exec-cmd.o CC /home/kees/src/linux-build/plugins/tools/objtool/help.o CC /home/kees/src/linux-build/plugins/tools/objtool/weak.o
Quoted 4 lines
...
--
Kees Cook
--
Best Regards
Masahiro Yamada