aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2011-04-20 07:45:30 -0400
committerMichal Marek <mmarek@suse.cz>2011-04-20 09:39:22 -0400
commit40df759e2b9ec945f1a5ddc61b3fdfbb6583257e (patch)
tree1d727592c947dbfe33ddf89718201615488088e8 /Makefile
parenta8b8017c34fefcb763d8b06c294b58d1c480b2e4 (diff)
kbuild: Fix build with binutils <= 2.19
The D option of ar is only available in newer versions. Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index c3bd316b16f4..d7c42319fe1e 100644
--- a/Makefile
+++ b/Makefile
@@ -382,6 +382,7 @@ export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV
382export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE 382export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
383export KBUILD_AFLAGS_MODULE KBUILD_CFLAGS_MODULE KBUILD_LDFLAGS_MODULE 383export KBUILD_AFLAGS_MODULE KBUILD_CFLAGS_MODULE KBUILD_LDFLAGS_MODULE
384export KBUILD_AFLAGS_KERNEL KBUILD_CFLAGS_KERNEL 384export KBUILD_AFLAGS_KERNEL KBUILD_CFLAGS_KERNEL
385export KBUILD_ARFLAGS
385 386
386# When compiling out-of-tree modules, put MODVERDIR in the module 387# When compiling out-of-tree modules, put MODVERDIR in the module
387# tree rather than in the kernel tree. The kernel tree might 388# tree rather than in the kernel tree. The kernel tree might
@@ -612,6 +613,9 @@ KBUILD_CFLAGS += $(call cc-option,-fno-strict-overflow)
612# conserve stack if available 613# conserve stack if available
613KBUILD_CFLAGS += $(call cc-option,-fconserve-stack) 614KBUILD_CFLAGS += $(call cc-option,-fconserve-stack)
614 615
616# use the deterministic mode of AR if available
617KBUILD_ARFLAGS := $(call ar-option,D)
618
615# check for 'asm goto' 619# check for 'asm goto'
616ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC)), y) 620ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC)), y)
617 KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO 621 KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO