forked from analogdevicesinc/linux
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/gi…
…t/mmarek/kbuild Pull kbuild updates from Michal Marek: - several cleanups in kbuild - serialize multiple *config targets so that 'make defconfig kvmconfig' works - The cc-ifversion macro got support for an else-branch * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: kbuild,gcov: simplify kernel/gcov/Makefile more kbuild: allow cc-ifversion to have the argument for false condition kbuild,gcov: simplify kernel/gcov/Makefile kbuild,gcov: remove unnecessary workaround kbuild: do not add $(call ...) to invoke cc-version or cc-fullversion kbuild: fix cc-ifversion macro kbuild: drop $(version_h) from MRPROPER_FILES kbuild: use mixed-targets when two or more config targets are given kbuild: remove redundant line from bounds.h/asm-offsets.h kbuild: merge bounds.h and asm-offsets.h rules kbuild: Drop support for clean-rule
- Loading branch information
Showing
9 changed files
with
40 additions
and
90 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,33 +1,7 @@ | ||
ccflags-y := -DSRCTREE='"$(srctree)"' -DOBJTREE='"$(objtree)"' | ||
|
||
# if-lt | ||
# Usage VAR := $(call if-lt, $(a), $(b)) | ||
# Returns 1 if (a < b) | ||
if-lt = $(shell [ $(1) -lt $(2) ] && echo 1) | ||
|
||
ifeq ($(CONFIG_GCOV_FORMAT_3_4),y) | ||
cc-ver := 0304 | ||
else ifeq ($(CONFIG_GCOV_FORMAT_4_7),y) | ||
cc-ver := 0407 | ||
else | ||
# Use cc-version if available, otherwise set 0 | ||
# | ||
# scripts/Kbuild.include, which contains cc-version function, is not included | ||
# during make clean "make -f scripts/Makefile.clean obj=kernel/gcov" | ||
# Meaning cc-ver is empty causing if-lt test to fail with | ||
# "/bin/sh: line 0: [: -lt: unary operator expected" error mesage. | ||
# This has no affect on the clean phase, but the error message could be | ||
# confusing/annoying. So this dummy workaround sets cc-ver to zero if cc-version | ||
# is not available. We can probably move if-lt to Kbuild.include, so it's also | ||
# not defined during clean or to include Kbuild.include in | ||
# scripts/Makefile.clean. But the following workaround seems least invasive. | ||
cc-ver := $(if $(call cc-version),$(call cc-version),0) | ||
endif | ||
|
||
obj-$(CONFIG_GCOV_KERNEL) := base.o fs.o | ||
|
||
ifeq ($(call if-lt, $(cc-ver), 0407),1) | ||
obj-$(CONFIG_GCOV_KERNEL) += gcc_3_4.o | ||
else | ||
obj-$(CONFIG_GCOV_KERNEL) += gcc_4_7.o | ||
endif | ||
obj-y := base.o fs.o | ||
obj-$(CONFIG_GCOV_FORMAT_3_4) += gcc_3_4.o | ||
obj-$(CONFIG_GCOV_FORMAT_4_7) += gcc_4_7.o | ||
obj-$(CONFIG_GCOV_FORMAT_AUTODETECT) += $(call cc-ifversion, -lt, 0407, \ | ||
gcc_3_4.o, gcc_4_7.o) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters