Merge tag 'kbuild-v4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild (80fc6238) · Commits · 戴 / test

Makefile

+17 −9

Original line number	Diff line number	Diff line
		@@ -294,10 +294,17 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
		else if [ -x /bin/bash ]; then echo /bin/bash; \
		else echo sh; fi ; fi)

		HOST_LFS_CFLAGS := $(shell getconf LFS_CFLAGS)
		HOST_LFS_LDFLAGS := $(shell getconf LFS_LDFLAGS)
		HOST_LFS_LIBS := $(shell getconf LFS_LIBS)

		HOSTCC = gcc
		HOSTCXX = g++
		HOSTCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89
		HOSTCXXFLAGS = -O2
		HOSTCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 \
		-fomit-frame-pointer -std=gnu89 $(HOST_LFS_CFLAGS)
		HOSTCXXFLAGS := -O2 $(HOST_LFS_CFLAGS)
		HOSTLDFLAGS := $(HOST_LFS_LDFLAGS)
		HOST_LOADLIBES := $(HOST_LFS_LIBS)

		ifeq ($(shell $(HOSTCC) -v 2>&1 \| grep -c "clang version"), 1)
		HOSTCFLAGS += -Wno-unused-value -Wno-unused-parameter \
		@@ -408,7 +415,7 @@ KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(S

		export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
		export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
		export CPP AR NM STRIP OBJCOPY OBJDUMP
		export CPP AR NM STRIP OBJCOPY OBJDUMP HOSTLDFLAGS HOST_LOADLIBES
		export MAKE AWK GENKSYMS INSTALLKERNEL PERL PYTHON UTS_MACHINE
		export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS

		@@ -456,10 +463,11 @@ ifneq ($(KBUILD_SRC),)
		endif

		# Support for using generic headers in asm-generic
		PHONY += asm-generic
		asm-generic:
		PHONY += asm-generic uapi-asm-generic
		asm-generic: uapi-asm-generic
		$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \
		src=asm obj=arch/$(SRCARCH)/include/generated/asm
		uapi-asm-generic:
		$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \
		src=uapi/asm obj=arch/$(SRCARCH)/include/generated/uapi/asm

		@@ -1136,7 +1144,7 @@ firmware_install:
		#Default location for installed headers
		export INSTALL_HDR_PATH = $(objtree)/usr

		# If we do an all arch process set dst to asm-$(hdr-arch)
		# If we do an all arch process set dst to include/arch-$(hdr-arch)
		hdr-dst = $(if $(KBUILD_HEADERS), dst=include/arch-$(hdr-arch), dst=include)

		PHONY += archheaders
		@@ -1146,7 +1154,7 @@ PHONY += archscripts
		archscripts:

		PHONY += __headers
		__headers: $(version_h) scripts_basic asm-generic archheaders archscripts
		__headers: $(version_h) scripts_basic uapi-asm-generic archheaders archscripts
		$(Q)$(MAKE) $(build)=scripts build_unifdef

		PHONY += headers_install_all
		@@ -1157,7 +1165,7 @@ PHONY += headers_install
		headers_install: __headers
		$(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \
		$(error Headers not exportable for the $(SRCARCH) architecture))
		$(Q)$(MAKE) $(hdr-inst)=include/uapi
		$(Q)$(MAKE) $(hdr-inst)=include/uapi dst=include
		$(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst)

		PHONY += headers_check_all
		@@ -1166,7 +1174,7 @@ headers_check_all: headers_install_all

		PHONY += headers_check
		headers_check: headers_install
		$(Q)$(MAKE) $(hdr-inst)=include/uapi HDRCHECK=1
		$(Q)$(MAKE) $(hdr-inst)=include/uapi dst=include HDRCHECK=1
		$(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) HDRCHECK=1

		# ---------------------------------------------------------------------------

arch/arc/include/asm/Kbuild

+0 −24

Original line number	Diff line number	Diff line
		generic-y += auxvec.h
		generic-y += bitsperlong.h
		generic-y += bugs.h
		generic-y += clkdev.h
		generic-y += device.h
		generic-y += div64.h
		generic-y += emergency-restart.h
		generic-y += errno.h
		generic-y += extable.h
		generic-y += fb.h
		generic-y += fcntl.h
		generic-y += ftrace.h
		generic-y += hardirq.h
		generic-y += hw_irq.h
		generic-y += ioctl.h
		generic-y += ioctls.h
		generic-y += ipcbuf.h
		generic-y += irq_regs.h
		generic-y += irq_work.h
		generic-y += kmap_types.h
		generic-y += kvm_para.h
		generic-y += local.h
		generic-y += local64.h
		generic-y += mcs_spinlock.h
		generic-y += mm-arch-hooks.h
		generic-y += mman.h
		generic-y += msgbuf.h
		generic-y += msi.h
		generic-y += param.h
		generic-y += parport.h
		generic-y += pci.h
		generic-y += percpu.h
		generic-y += poll.h
		generic-y += posix_types.h
		generic-y += preempt.h
		generic-y += resource.h
		generic-y += sembuf.h
		generic-y += shmbuf.h
		generic-y += socket.h
		generic-y += sockios.h
		generic-y += stat.h
		generic-y += statfs.h
		generic-y += termbits.h
		generic-y += termios.h
		generic-y += topology.h
		generic-y += trace_clock.h
		generic-y += types.h
		generic-y += ucontext.h
		generic-y += user.h
		generic-y += vga.h
		generic-y += word-at-a-time.h

arch/arc/include/uapi/asm/Kbuild

+24 −0

Original line number	Diff line number	Diff line
		# UAPI Header export list
		include include/uapi/asm-generic/Kbuild.asm

		generic-y += auxvec.h
		generic-y += bitsperlong.h
		generic-y += errno.h
		generic-y += fcntl.h
		generic-y += ioctl.h
		generic-y += ioctls.h
		generic-y += ipcbuf.h
		generic-y += kvm_para.h
		generic-y += mman.h
		generic-y += msgbuf.h
		generic-y += param.h
		generic-y += poll.h
		generic-y += posix_types.h
		generic-y += resource.h
		generic-y += sembuf.h
		generic-y += shmbuf.h
		generic-y += siginfo.h
		generic-y += socket.h
		generic-y += sockios.h
		generic-y += stat.h
		generic-y += statfs.h
		generic-y += termbits.h
		generic-y += termios.h
		generic-y += types.h
		generic-y += ucontext.h

arch/arm/include/asm/Kbuild

+0 −16

Original line number	Diff line number	Diff line


		generic-y += bitsperlong.h
		generic-y += clkdev.h
		generic-y += current.h
		generic-y += early_ioremap.h
		generic-y += emergency-restart.h
		generic-y += errno.h
		generic-y += exec.h
		generic-y += extable.h
		generic-y += ioctl.h
		generic-y += ipcbuf.h
		generic-y += irq_regs.h
		generic-y += kdebug.h
		generic-y += local.h
		generic-y += local64.h
		generic-y += mm-arch-hooks.h
		generic-y += msgbuf.h
		generic-y += msi.h
		generic-y += param.h
		generic-y += parport.h
		generic-y += poll.h
		generic-y += preempt.h
		generic-y += resource.h
		generic-y += rwsem.h
		generic-y += seccomp.h
		generic-y += segment.h
		generic-y += sembuf.h
		generic-y += serial.h
		generic-y += shmbuf.h
		generic-y += simd.h
		generic-y += sizes.h
		generic-y += socket.h
		generic-y += sockios.h
		generic-y += termbits.h
		generic-y += termios.h
		generic-y += timex.h
		generic-y += trace_clock.h
		generic-y += unaligned.h

arch/arm/include/uapi/asm/Kbuild

+14 −0

Original line number	Diff line number	Diff line
		@@ -5,4 +5,18 @@ generated-y += unistd-common.h
		generated-y += unistd-oabi.h
		generated-y += unistd-eabi.h

		generic-y += bitsperlong.h
		generic-y += errno.h
		generic-y += ioctl.h
		generic-y += ipcbuf.h
		generic-y += msgbuf.h
		generic-y += param.h
		generic-y += poll.h
		generic-y += resource.h
		generic-y += sembuf.h
		generic-y += shmbuf.h
		generic-y += siginfo.h
		generic-y += socket.h
		generic-y += sockios.h
		generic-y += termbits.h
		generic-y += termios.h

Admin message