path: root/scripts
diff options
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-03-27 21:52:50 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-03-31 12:22:38 +0900
commita95b37e20db9a2b05354eec009b2188523a21c8e (patch)
tree5477ef9dfb131b68d5bff74783447c824f165af6 /scripts
parent127668cf766d0ede207457f9f5f26f5e40ce4127 (diff)
kbuild: get <linux/compiler_types.h> out of <linux/kconfig.h>
Since commit 28128c61e08e ("kconfig.h: Include compiler types to avoid missed struct attributes"), <linux/kconfig.h> pulls in kernel-space headers to unrelated places. Commit 0f9da844d877 ("MIPS: boot: Define __ASSEMBLY__ for its.S build") suppress the build error by defining __ASSEMBLY__, but ITS (i.e. DTS) is not assembly, and should not include <linux/compiler_types.h> in the first place. Looking at arch/s390/tools/Makefile, host programs gen_facilities and gen_opcode_table now pull in <linux/compiler_types.h> as well. The motivation for that commit was to define necessary attributes before any struct is defined. Obviously, this happens only in C. It is enough to include <linux/compiler_types.h> only when compiling C files, and only when compiling kernel space. Move the include to c_flags. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'scripts')
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 194ae707167d..e3215b7652ee 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -152,6 +152,7 @@ __cpp_flags = $(call flags,_cpp_flags)
c_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \
+ -include $(srctree)/include/linux/compiler_types.h \
$(__c_flags) $(modkern_cflags) \
$(basename_flags) $(modname_flags)