Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37a8d9f6 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

kbuild: simplify use of genksyms 



Avoid duplicating long list of options in two places

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent a1d94aa5

scripts/Makefile.build

+12 −18
Original line number Diff line number Diff line
@@ -151,16 +151,16 @@ cmd_cc_i_c = $(CPP) $(c_flags) -o $@ $< 
$(obj)/%.i: $(src)/%.c FORCE

	$(call if_changed_dep,cc_i_c)



cmd_gensymtypes =                                                           \

    $(CPP) -D__GENKSYMS__ $(c_flags) $< |                                   \

    $(GENKSYMS) -T $@ -a $(ARCH)                                            \

     $(if $(KBUILD_PRESERVE),-p)                                            \

     $(if $(1),-r $(firstword $(wildcard $(@:.symtypes=.symref) /dev/null)))



quiet_cmd_cc_symtypes_c = SYM $(quiet_modtag) $@

cmd_cc_symtypes_c =                                                         \

    set -e;                                                                 \

		$(CPP) -D__GENKSYMS__ $(c_flags) $<			\

		| $(GENKSYMS) -T $@					\

			      -r $(firstword $(wildcard			\

				     $(@:.symtypes=.symref) /dev/null))	\

			      $(if $(KBUILD_PRESERVE),-p)		\

			      -a $(ARCH)				\

		  >/dev/null;						\

    $(call cmd_gensymtypes, true) >/dev/null;                               \

    test -s $@ || rm -f $@



$(obj)/%.symtypes : $(src)/%.c FORCE
@@ -191,13 +191,7 @@ else 
cmd_cc_o_c = $(CC) $(c_flags) -c -o $(@D)/.tmp_$(@F) $<

cmd_modversions =							\

	if $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then	\

		$(CPP) -D__GENKSYMS__ $(c_flags) $<			\

		| $(GENKSYMS) $(if $(KBUILD_SYMTYPES),			\

			           -T $(@:.o=.symtypes))		\

			      -r $(firstword $(wildcard			\

				     $(@:.o=.symref) /dev/null))	\

			      $(if $(KBUILD_PRESERVE),-p)		\

			      -a $(ARCH)				\

		$(call cmd_gensymtypes, $(KBUILD_SYMTYPES))		\

		    > $(@D)/.tmp_$(@F:.o=.ver);				\

									\

		$(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F) 		\