From: Linus Torvalds Date: Wed, 15 Apr 2015 18:19:18 +0000 (-0700) Subject: Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild X-Git-Tag: firefly_0821_release~176^2~1971 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b422b75875a3663f08a9ab5aeb265ed2383cbe2f;p=firefly-linux-kernel-4.4.55.git Merge branch 'kbuild' of git://git./linux/kernel/git/mmarek/kbuild Pull kbuild updates from Michal Marek: "Here is the first round of kbuild changes for v4.1-rc1: - kallsyms fix for ARM and cleanup - make dep(end) removed (developers have no sense of nostalgia these days...) - include Makefiles by relative path - stop useless rebuilds of asm-offsets.h and bounds.h" * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: Kbuild: kallsyms: drop special handling of pre-3.0 GCC symbols Kbuild: kallsyms: ignore veneers emitted by the ARM linker kbuild: ia64: use $(src)/Makefile.gate rather than particular path kbuild: include $(src)/Makefile rather than $(obj)/Makefile kbuild: use relative path more to include Makefile kbuild: use relative path to include Makefile kbuild: do not add $(bounds-file) and $(offsets-file) to targets kbuild: remove warning about "make depend" kbuild: Don't reset timestamps in include/generated if not needed --- b422b75875a3663f08a9ab5aeb265ed2383cbe2f diff --cc Makefile index 9b76ce1e08bb,929d805b4f62..6cc5b2434224 --- a/Makefile +++ b/Makefile @@@ -779,11 -777,10 +777,11 @@@ KBUILD_ARFLAGS := $(call ar-option,D # check for 'asm goto' ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC)), y) KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO + KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO endif - include $(srctree)/scripts/Makefile.kasan - include $(srctree)/scripts/Makefile.extrawarn + include scripts/Makefile.kasan + include scripts/Makefile.extrawarn # Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments KBUILD_CPPFLAGS += $(KCPPFLAGS)