History

kbuild: Fix build with binutils <= 2.19

The D option of ar is only available in newer versions.

Michal Marek committed 15 years ago

Commit 40df7591 parent a8b80174 files · +16 −2Browse files

Unified · Split

4 files
  1. Documentation/kbuild/makefiles.txt +5 −0
  2. Makefile +4 −0
  3. scripts/Kbuild.include +5 −0
  4. scripts/Makefile.build +2 −2
Documentation/kbuild/makefiles.txt+5−0
@@ -955,6 +955,11 @@ When kbuild executes, the following steps are followed (roughly): · 954 unmodified lines
955 used when linking modules. This is often a linker script.955 used when linking modules. This is often a linker script.
956 From commandline LDFLAGS_MODULE shall be used (see kbuild.txt).956 From commandline LDFLAGS_MODULE shall be used (see kbuild.txt).
957 957
958 KBUILD_ARFLAGS Options for $(AR) when creating archives
959
960 $(KBUILD_ARFLAGS) set by the top level Makefile to "D" (deterministic
961 mode) if this option is supported by $(AR).
962
958--- 6.2 Add prerequisites to archprepare:963--- 6.2 Add prerequisites to archprepare:
959 964
960 The archprepare: rule is used to list prerequisites that need to be965 The archprepare: rule is used to list prerequisites that need to be
Makefile+4−0
@@ -382,6 +382,7 @@ export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV · 381 unmodified lines
382export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE382export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
383export KBUILD_AFLAGS_MODULE KBUILD_CFLAGS_MODULE KBUILD_LDFLAGS_MODULE383export KBUILD_AFLAGS_MODULE KBUILD_CFLAGS_MODULE KBUILD_LDFLAGS_MODULE
384export KBUILD_AFLAGS_KERNEL KBUILD_CFLAGS_KERNEL384export KBUILD_AFLAGS_KERNEL KBUILD_CFLAGS_KERNEL
385export KBUILD_ARFLAGS
385 386
386# When compiling out-of-tree modules, put MODVERDIR in the module387# When compiling out-of-tree modules, put MODVERDIR in the module
387# tree rather than in the kernel tree. The kernel tree might388# tree rather than in the kernel tree. The kernel tree might
@@ -612,6 +613,9 @@ KBUILD_CFLAGS += $(call cc-option,-fno-strict-overflow) · 224 unmodified lines
612# conserve stack if available613# 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_GOTO621 KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO
scripts/Kbuild.include+5−0
@@ -141,6 +141,11 @@ cc-ldoption = $(call try-run,\ · 140 unmodified lines
141ld-option = $(call try-run,\141ld-option = $(call try-run,\
142 $(CC) /dev/null -c -o "$$TMPO" ; $(LD) $(1) "$$TMPO" -o "$$TMP",$(1),$(2))142 $(CC) /dev/null -c -o "$$TMPO" ; $(LD) $(1) "$$TMPO" -o "$$TMP",$(1),$(2))
143 143
144# ar-option
145# Usage: KBUILD_ARFLAGS := $(call ar-option,D)
146# Important: no spaces around options
147ar-option = $(call try-run, $(AR) rc$(1) "$$TMP",$(1),$(2))
148
144######149######
145 150
146###151###
scripts/Makefile.build+2−2
@@ -345,7 +345,7 @@ quiet_cmd_link_o_target = LD $@ · 344 unmodified lines
345cmd_link_o_target = $(if $(strip $(obj-y)),\345cmd_link_o_target = $(if $(strip $(obj-y)),\
346 $(LD) $(ld_flags) -r -o $@ $(filter $(obj-y), $^) \346 $(LD) $(ld_flags) -r -o $@ $(filter $(obj-y), $^) \
347 $(cmd_secanalysis),\347 $(cmd_secanalysis),\
348 rm -f $@; $(AR) rcsD $@)348 rm -f $@; $(AR) rcs$(KBUILD_ARFLAGS) $@)
349 349
350$(builtin-target): $(obj-y) FORCE350$(builtin-target): $(obj-y) FORCE
351 $(call if_changed,link_o_target)351 $(call if_changed,link_o_target)
@@ -371,7 +371,7 @@ $(modorder-target): $(subdir-ym) FORCE · 19 unmodified lines
371#371#
372ifdef lib-target372ifdef lib-target
373quiet_cmd_link_l_target = AR $@373quiet_cmd_link_l_target = AR $@
374cmd_link_l_target = rm -f $@; $(AR) rcsD $@ $(lib-y)374cmd_link_l_target = rm -f $@; $(AR) rcs$(KBUILD_ARFLAGS) $@ $(lib-y)
375 375
376$(lib-target): $(lib-y) FORCE376$(lib-target): $(lib-y) FORCE
377 $(call if_changed,link_l_target)377 $(call if_changed,link_l_target)