67d7c3023a
I added $(srctree)/ to some included Makefiles in the following commits: -3204a7fb98("kbuild: prefix $(srctree)/ to some included Makefiles") -d828563955("kbuild: do not require sub-make for separate output tree builds") They were a preparation for removing --include-dir flag. I have never thought --include-dir useful. Rather, it _is_ harmful. For example, run the following commands: $ make -s ARCH=x86 mrproper defconfig $ make ARCH=arm O=foo dtbs make[1]: Entering directory '/tmp/linux/foo' HOSTCC scripts/basic/fixdep Error: kernelrelease not valid - run 'make prepare' to update it UPD include/config/kernel.release make[1]: Leaving directory '/tmp/linux/foo' The first command configures the source tree for x86. The next command tries to build ARM device trees in the separate foo/ directory - this must stop because the directory foo/ has not been configured yet. However, due to --include-dir=$(abs_srctree), the top Makefile includes the wrong include/config/auto.conf from the source tree and continues building. Kbuild traverses the directory tree, but of course it does not work correctly. The Error message is also pointless - 'make prepare' does not help at all for fixing the issue. This commit fixes more arch Makefile, and finally removes --include-dir from the top Makefile. There are more breakages under drivers/, but I do not volunteer to fix them all. I just moved --include-dir to drivers/Makefile. With this commit, the second command will stop with a sensible message. $ make -s ARCH=x86 mrproper defconfig $ make ARCH=arm O=foo dtbs make[1]: Entering directory '/tmp/linux/foo' SYNC include/config/auto.conf.cmd *** *** The source tree is not clean, please run 'make ARCH=arm mrproper' *** in /tmp/linux *** make[2]: *** [../Makefile:646: outputmakefile] Error 1 /tmp/linux/Makefile:770: include/config/auto.conf.cmd: No such file or directory make[1]: *** [/tmp/linux/Makefile:793: include/config/auto.conf.cmd] Error 2 make[1]: Leaving directory '/tmp/linux/foo' make: *** [Makefile:226: __sub-make] Error 2 Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
51 lines
1.1 KiB
Makefile
51 lines
1.1 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
core-y += arch/x86/crypto/
|
|
|
|
ifeq ($(CONFIG_X86_32),y)
|
|
START := 0x8048000
|
|
|
|
KBUILD_LDFLAGS += -m elf_i386
|
|
ELF_ARCH := i386
|
|
ELF_FORMAT := elf32-i386
|
|
CHECKFLAGS += -D__i386__
|
|
|
|
KBUILD_CFLAGS += $(call cc-option,-m32)
|
|
KBUILD_AFLAGS += $(call cc-option,-m32)
|
|
LINK-y += $(call cc-option,-m32)
|
|
|
|
LDS_EXTRA := -Ui386
|
|
export LDS_EXTRA
|
|
|
|
# First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y.
|
|
include $(srctree)/arch/x86/Makefile_32.cpu
|
|
|
|
# prevent gcc from keeping the stack 16 byte aligned. Taken from i386.
|
|
cflags-y += $(call cc-option,-mpreferred-stack-boundary=2)
|
|
|
|
# Prevent sprintf in nfsd from being converted to strcpy and resulting in
|
|
# an unresolved reference.
|
|
cflags-y += -ffreestanding
|
|
|
|
KBUILD_CFLAGS += $(cflags-y)
|
|
|
|
else
|
|
|
|
START := 0x60000000
|
|
|
|
KBUILD_CFLAGS += -fno-builtin -m64
|
|
|
|
CHECKFLAGS += -m64 -D__x86_64__
|
|
KBUILD_AFLAGS += -m64
|
|
KBUILD_LDFLAGS += -m elf_x86_64
|
|
KBUILD_CPPFLAGS += -m64
|
|
|
|
ELF_ARCH := i386:x86-64
|
|
ELF_FORMAT := elf64-x86-64
|
|
|
|
# Not on all 64-bit distros /lib is a symlink to /lib64. PLD is an example.
|
|
|
|
LINK-$(CONFIG_LD_SCRIPT_DYN_RPATH) += -Wl,-rpath,/lib64
|
|
LINK-y += -m64
|
|
|
|
endif
|