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

Commit 58ab5e0c authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Michal Marek
Browse files

Kbuild: arch: look for generated headers in obtree 



There are very few files that need add an -I$(obj) gcc for the preprocessor
or the assembler. For C files, we add always these for both the objtree and
srctree, but for the other ones we require the Makefile to add them, and
Kbuild then adds it for both trees.

As a preparation for changing the meaning of the -I$(obj) directive to
only refer to the srctree, this changes the two instances in arch/x86 to use
an explictit $(objtree) prefix where needed, otherwise we won't find the
headers any more, as reported by the kbuild 0day builder.

arch/x86/realmode/rm/realmode.lds.S:75:20: fatal error: pasyms.h: No such file or directory

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMichal Marek <mmarek@suse.com>
parent 3308b285

arch/alpha/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ targets := vmlinux.gz vmlinux \ 
OBJSTRIP	:= $(obj)/tools/objstrip



HOSTCFLAGS	:= -Wall -I$(objtree)/usr/include

BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(obj)

BOOTCFLAGS	+= -I$(objtree)/$(obj) -I$(srctree)/$(obj)



# SRM bootable image.  Copy to offset 512 of a partition.

$(obj)/bootimage: $(addprefix $(obj)/tools/,mkbb lxboot bootlx) $(obj)/vmlinux.nh

arch/powerpc/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ ifeq ($(call cc-option-yn, -fstack-protector),y) 
BOOTCFLAGS	+= -fno-stack-protector

endif



BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(obj)

BOOTCFLAGS	+= -I$(objtree)/$(obj) -I$(srctree)/$(obj)



DTC_FLAGS	?= -p 1024

arch/powerpc/kvm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ common-objs-y += powerpc.o emulate.o emulate_loadstore.o 
obj-$(CONFIG_KVM_EXIT_TIMING) += timing.o

obj-$(CONFIG_KVM_BOOK3S_HANDLER) += book3s_exports.o



AFLAGS_booke_interrupts.o := -I$(obj)

AFLAGS_booke_interrupts.o := -I$(objtree)/$(obj)



kvm-e500-objs := \

	$(common-objs-y) \

arch/s390/boot/compressed/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -31,10 +31,10 @@ quiet_cmd_sizes = GEN $@ 
$(obj)/sizes.h: vmlinux

	$(call if_changed,sizes)



AFLAGS_head.o += -I$(obj)

AFLAGS_head.o += -I$(objtree)/$(obj)

$(obj)/head.o: $(obj)/sizes.h



CFLAGS_misc.o += -I$(obj)

CFLAGS_misc.o += -I$(objtree)/$(obj)

$(obj)/misc.o: $(obj)/sizes.h



OBJCOPYFLAGS_vmlinux.bin :=  -R .comment -S

arch/um/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -78,8 +78,8 @@ include $(ARCH_DIR)/Makefile-os-$(OS) 


KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/include \

		   -I$(srctree)/$(HOST_DIR)/include/uapi \

		   -I$(HOST_DIR)/include/generated \

		   -I$(HOST_DIR)/include/generated/uapi

		   -I$(objtree)/$(HOST_DIR)/include/generated \

		   -I$(objtree)/$(HOST_DIR)/include/generated/uapi



# -Derrno=kernel_errno - This turns all kernel references to errno into

# kernel_errno to separate them from the libc errno.  This allows -fno-common