mirror of
https://github.com/torvalds/linux
synced 2024-10-16 00:10:42 +00:00
kbuild: drop include2/ used for O=... builds
There is no longer any use of the include2/ directory. The generated files has moved to include/generated. Drop all references to said directory. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Michal Marek <mmarek@suse.cz>
This commit is contained in:
parent
3252b11fc4
commit
96f13045b6
9
Makefile
9
Makefile
|
@ -335,7 +335,7 @@ CFLAGS_GCOV = -fprofile-arcs -ftest-coverage
|
||||||
# Use LINUXINCLUDE when you must reference the include/ directory.
|
# Use LINUXINCLUDE when you must reference the include/ directory.
|
||||||
# Needed to be compatible with the O= option
|
# Needed to be compatible with the O= option
|
||||||
LINUXINCLUDE := -I$(srctree)/arch/$(hdr-arch)/include -Iinclude \
|
LINUXINCLUDE := -I$(srctree)/arch/$(hdr-arch)/include -Iinclude \
|
||||||
$(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \
|
$(if $(KBUILD_SRC), -I$(srctree)/include) \
|
||||||
-include include/linux/autoconf.h
|
-include include/linux/autoconf.h
|
||||||
|
|
||||||
KBUILD_CPPFLAGS := -D__KERNEL__
|
KBUILD_CPPFLAGS := -D__KERNEL__
|
||||||
|
@ -954,7 +954,6 @@ PHONY += prepare archprepare prepare0 prepare1 prepare2 prepare3
|
||||||
# prepare3 is used to check if we are building in a separate output directory,
|
# prepare3 is used to check if we are building in a separate output directory,
|
||||||
# and if so do:
|
# and if so do:
|
||||||
# 1) Check that make has not been executed in the kernel src $(srctree)
|
# 1) Check that make has not been executed in the kernel src $(srctree)
|
||||||
# 2) Create the include2 directory, used for the second asm symlink
|
|
||||||
prepare3: include/config/kernel.release
|
prepare3: include/config/kernel.release
|
||||||
ifneq ($(KBUILD_SRC),)
|
ifneq ($(KBUILD_SRC),)
|
||||||
@$(kecho) ' Using $(srctree) as source for kernel'
|
@$(kecho) ' Using $(srctree) as source for kernel'
|
||||||
|
@ -963,10 +962,6 @@ ifneq ($(KBUILD_SRC),)
|
||||||
echo " in the '$(srctree)' directory.";\
|
echo " in the '$(srctree)' directory.";\
|
||||||
/bin/false; \
|
/bin/false; \
|
||||||
fi;
|
fi;
|
||||||
$(Q)if [ ! -d include2 ]; then \
|
|
||||||
mkdir -p include2; \
|
|
||||||
ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \
|
|
||||||
fi
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# prepare2 creates a makefile if using a separate output directory
|
# prepare2 creates a makefile if using a separate output directory
|
||||||
|
@ -1193,7 +1188,7 @@ CLEAN_FILES += vmlinux System.map \
|
||||||
.tmp_kallsyms* .tmp_version .tmp_vmlinux* .tmp_System.map
|
.tmp_kallsyms* .tmp_version .tmp_vmlinux* .tmp_System.map
|
||||||
|
|
||||||
# Directories & files removed with 'make mrproper'
|
# Directories & files removed with 'make mrproper'
|
||||||
MRPROPER_DIRS += include/config include2 usr/include include/generated
|
MRPROPER_DIRS += include/config usr/include include/generated
|
||||||
MRPROPER_FILES += .config .config.old include/asm .version .old_version \
|
MRPROPER_FILES += .config .config.old include/asm .version .old_version \
|
||||||
include/linux/autoconf.h include/linux/version.h \
|
include/linux/autoconf.h include/linux/version.h \
|
||||||
include/linux/utsrelease.h \
|
include/linux/utsrelease.h \
|
||||||
|
|
|
@ -13,10 +13,8 @@ SPU_CC := $(SPU_CROSS)gcc
|
||||||
SPU_AS := $(SPU_CROSS)gcc
|
SPU_AS := $(SPU_CROSS)gcc
|
||||||
SPU_LD := $(SPU_CROSS)ld
|
SPU_LD := $(SPU_CROSS)ld
|
||||||
SPU_OBJCOPY := $(SPU_CROSS)objcopy
|
SPU_OBJCOPY := $(SPU_CROSS)objcopy
|
||||||
SPU_CFLAGS := -O2 -Wall -I$(srctree)/include \
|
SPU_CFLAGS := -O2 -Wall -I$(srctree)/include -D__KERNEL__
|
||||||
-I$(objtree)/include2 -D__KERNEL__
|
SPU_AFLAGS := -c -D__ASSEMBLY__ -I$(srctree)/include -D__KERNEL__
|
||||||
SPU_AFLAGS := -c -D__ASSEMBLY__ -I$(srctree)/include \
|
|
||||||
-I$(objtree)/include2 -D__KERNEL__
|
|
||||||
SPU_LDFLAGS := -N -Ttext=0x0
|
SPU_LDFLAGS := -N -Ttext=0x0
|
||||||
|
|
||||||
$(obj)/switch.o: $(obj)/spu_save_dump.h $(obj)/spu_restore_dump.h
|
$(obj)/switch.o: $(obj)/spu_save_dump.h $(obj)/spu_restore_dump.h
|
||||||
|
|
Loading…
Reference in a new issue