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

Commit dede6faa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  Kbuild: append missing-syscalls to the default target list
  genksyms: Regenerate lexer and parser
  genksyms: Do not expand internal types
  genksyms: Minor parser cleanup
  Makefile: remove a duplicated line
  fixdep: fix extraneous dependencies
  scripts/Makefile.build: do not reference EXTRA_CFLAGS as CFLAGS replacement
  kbuild: prevent make from deleting _shipped files
  kbuild: Do not delete empty files in make distclean
parents 21404b77 5f7efb4c

Kbuild

+4 −2
Original line number Diff line number Diff line
@@ -88,11 +88,13 @@ $(obj)/$(offsets-file): arch/$(SRCARCH)/kernel/asm-offsets.s Kbuild 
# 3) Check for missing system calls

#



always += missing-syscalls

targets += missing-syscalls



quiet_cmd_syscalls = CALL    $<

      cmd_syscalls = $(CONFIG_SHELL) $< $(CC) $(c_flags)



PHONY += missing-syscalls

missing-syscalls: scripts/checksyscalls.sh FORCE

missing-syscalls: scripts/checksyscalls.sh $(offsets-file) FORCE

	$(call cmd,syscalls)



# Keep these two files during make clean

Makefile

+1 −3
Original line number Diff line number Diff line
@@ -983,7 +983,6 @@ archprepare: prepare1 scripts_basic 


prepare0: archprepare FORCE

	$(Q)$(MAKE) $(build)=.

	$(Q)$(MAKE) $(build)=. missing-syscalls



# All the preparing..

prepare: prepare0
@@ -1198,7 +1197,7 @@ distclean: mrproper 
	@find $(srctree) $(RCS_FIND_IGNORE) \

		\( -name '*.orig' -o -name '*.rej' -o -name '*~' \

		-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \

		-o -name '.*.rej' -o -size 0 \

		-o -name '.*.rej' \

		-o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \

		-type f -print | xargs rm -f
@@ -1296,7 +1295,6 @@ help: 
	@echo  '		2: warnings which occur quite often but may still be relevant'

	@echo  '		3: more obscure warnings, can most likely be ignored'

	@echo  '		Multiple levels can be combined with W=12 or W=123'

	@echo  '  make RECORDMCOUNT_WARN=1 [targets] Warn about ignored mcount sections'

	@echo  ''

	@echo  'Execute "make" or "make all" to build all targets marked with [*] '

	@echo  'For further info see the ./README file'

scripts/Makefile.build

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ include $(kbuild-file) 
# If the save-* variables changed error out

ifeq ($(KBUILD_NOPEDANTIC),)

        ifneq ("$(save-cflags)","$(CFLAGS)")

                $(error CFLAGS was changed in "$(kbuild-file)". Fix it to use EXTRA_CFLAGS)

                $(error CFLAGS was changed in "$(kbuild-file)". Fix it to use ccflags-y)

        endif

endif

scripts/Makefile.lib

+4 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ ifdef REGENERATE_PARSERS 
quiet_cmd_gperf = GPERF $@

      cmd_gperf = gperf -t --output-file $@ -a -C -E -g -k 1,3,$$ -p -t $<



.PRECIOUS: $(src)/%.hash.c_shipped

$(src)/%.hash.c_shipped: $(src)/%.gperf

	$(call cmd,gperf)
@@ -177,6 +178,7 @@ LEX_PREFIX = $(if $(LEX_PREFIX_${baseprereq}),$(LEX_PREFIX_${baseprereq}),yy) 
quiet_cmd_flex = LEX     $@

      cmd_flex = flex -o$@ -L -P $(LEX_PREFIX) $<



.PRECIOUS: $(src)/%.lex.c_shipped

$(src)/%.lex.c_shipped: $(src)/%.l

	$(call cmd,flex)
@@ -187,12 +189,14 @@ YACC_PREFIX = $(if $(YACC_PREFIX_${baseprereq}),$(YACC_PREFIX_${baseprereq}),yy) 
quiet_cmd_bison = YACC    $@

      cmd_bison = bison -o$@ -t -l -p $(YACC_PREFIX) $<



.PRECIOUS: $(src)/%.tab.c_shipped

$(src)/%.tab.c_shipped: $(src)/%.y

	$(call cmd,bison)



quiet_cmd_bison_h = YACC    $@

      cmd_bison_h = bison -o/dev/null --defines=$@ -t -l -p $(YACC_PREFIX) $<



.PRECIOUS: $(src)/%.tab.h_shipped

$(src)/%.tab.h_shipped: $(src)/%.y

	$(call cmd,bison_h)

scripts/basic/fixdep.c

+1 −0
Original line number Diff line number Diff line
@@ -345,6 +345,7 @@ static void parse_dep_file(void *map, size_t len) 
		memcpy(s, m, p-m); s[p-m] = 0;

		if (strrcmp(s, "include/generated/autoconf.h") &&

		    strrcmp(s, "arch/um/include/uml-config.h") &&

		    strrcmp(s, "include/linux/kconfig.h") &&

		    strrcmp(s, ".ver")) {

			/*

			 * Do not list the source file as dependency, so that