diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-08 14:12:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-08 14:12:19 -0700 |
| commit | dab3c3cc4f44273ccf2d7ff57c0a4f5bd45c0528 (patch) | |
| tree | 6bbe14d6ec101bc278a8166469fdaa07d8f6493c /Makefile | |
| parent | 59a47fff0217592e248556a7ab436d5c17365962 (diff) | |
| parent | 5631d9c429857194bd55d7bcd8fa5bdd1a9899a3 (diff) | |
| download | linux-dab3c3cc4f44273ccf2d7ff57c0a4f5bd45c0528.tar.bz2 | |
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull core kbuild updates from Michal Marek:
- modpost portability fix
- linker script fix
- genksyms segfault fix
- fixdep cleanup
- fix for clang detection
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
kbuild: Fix clang detection
kbuild: fixdep: drop meaningless hash table initialization
kbuild: fixdep: optimize code slightly
genksyms: Regenerate parser
genksyms: Duplicate function pointer type definitions segfault
kbuild: Fix .text.unlikely placement
Avoid conflict with host definitions when cross-compiling
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 1 insertions, 8 deletions
@@ -666,14 +666,7 @@ endif endif KBUILD_CFLAGS += $(stackp-flag) -ifeq ($(shell $(CC) -v 2>&1 | grep -c "clang version"), 1) -COMPILER := clang -else -COMPILER := gcc -endif -export COMPILER - -ifeq ($(COMPILER),clang) +ifeq ($(cc-name),clang) KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,) KBUILD_CPPFLAGS += $(call cc-option,-Wno-unknown-warning-option,) KBUILD_CFLAGS += $(call cc-disable-warning, unused-variable) |