diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-10 23:11:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-10 23:11:05 -0400 |
| commit | 593043d35ddff8ab033546c2a89bb1d4080d03e1 (patch) | |
| tree | 81284ecf3ce7dc79e18401d2b76c414556e7f2a1 /scripts/Kbuild.include | |
| parent | 556d994a75790dce8a9c6b35b94cff1d526b2e32 (diff) | |
| parent | f55813b4d8bfc9f35fda87bc1e21b7f26835fc5c (diff) | |
Merge tag 'kbuild-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild updates from Masahiro Yamada:
- improve Clang support
- clean up various Makefiles
- improve build log visibility (objtool, alpha, ia64)
- improve compiler flag evaluation for better build performance
- fix GCC version-dependent warning
- fix genksyms
* tag 'kbuild-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (23 commits)
kbuild: dtbinst: remove unnecessary __dtbs_install_prep target
ia64: beatify build log for gate.so and gate-syms.o
alpha: make short build log available for division routines
alpha: merge build rules of division routines
alpha: add $(src)/ rather than $(obj)/ to make source file path
Makefile: evaluate LDFLAGS_BUILD_ID only once
objtool: make it visible in make V=1 output
kbuild: clang: add -no-integrated-as to KBUILD_[AC]FLAGS
kbuild: Add support to generate LLVM assembly files
kbuild: Add better clang cross build support
kbuild: drop -Wno-unknown-warning-option from clang options
kbuild: fix asm-offset generation to work with clang
kbuild: consolidate redundant sed script ASM offset generation
frv: Use OFFSET macro in DEF_*REG()
kbuild: avoid conflict between -ffunction-sections and -pg on gcc-4.7
kbuild: Consolidate header generation from ASM offset information
kbuild: use -Oz instead of -Os when using clang
kbuild, LLVMLinux: Add -Werror to cc-option to support clang
Kbuild: make designated_init attribute fatal
kbuild: drop unneeded patterns '.*.orig' and '.*.rej' from distclean
...
Diffstat (limited to 'scripts/Kbuild.include')
| -rw-r--r-- | scripts/Kbuild.include | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index afe3fd3af1e4..61f87a99bf0a 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include | |||
| @@ -116,12 +116,12 @@ CC_OPTION_CFLAGS = $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS)) | |||
| 116 | # Usage: cflags-y += $(call cc-option,-march=winchip-c6,-march=i586) | 116 | # Usage: cflags-y += $(call cc-option,-march=winchip-c6,-march=i586) |
| 117 | 117 | ||
| 118 | cc-option = $(call try-run,\ | 118 | cc-option = $(call try-run,\ |
| 119 | $(CC) $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",$(1),$(2)) | 119 | $(CC) -Werror $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",$(1),$(2)) |
| 120 | 120 | ||
| 121 | # cc-option-yn | 121 | # cc-option-yn |
| 122 | # Usage: flag := $(call cc-option-yn,-march=winchip-c6) | 122 | # Usage: flag := $(call cc-option-yn,-march=winchip-c6) |
| 123 | cc-option-yn = $(call try-run,\ | 123 | cc-option-yn = $(call try-run,\ |
| 124 | $(CC) $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",y,n) | 124 | $(CC) -Werror $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",y,n) |
| 125 | 125 | ||
| 126 | # cc-option-align | 126 | # cc-option-align |
| 127 | # Prefix align with either -falign or -malign | 127 | # Prefix align with either -falign or -malign |
| @@ -131,7 +131,7 @@ cc-option-align = $(subst -functions=0,,\ | |||
| 131 | # cc-disable-warning | 131 | # cc-disable-warning |
| 132 | # Usage: cflags-y += $(call cc-disable-warning,unused-but-set-variable) | 132 | # Usage: cflags-y += $(call cc-disable-warning,unused-but-set-variable) |
| 133 | cc-disable-warning = $(call try-run,\ | 133 | cc-disable-warning = $(call try-run,\ |
| 134 | $(CC) $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1))) | 134 | $(CC) -Werror $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1))) |
| 135 | 135 | ||
| 136 | # cc-name | 136 | # cc-name |
| 137 | # Expands to either gcc or clang | 137 | # Expands to either gcc or clang |
