summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-12-25 14:31:25 +0900
committerMichal Marek <mmarek@suse.cz>2015-01-09 17:25:44 +0100
commit842857dedc40df7c86e990b7153a069d0040e552 (patch)
treee05e0ab048ebf070e86ef4d89d627c056693e3da /kernel
parent665d92e38f65d70796aad2b8e49e42e80815d4a4 (diff)
kbuild,gcov: remove unnecessary workaround
Since commit 371fdc77af44 (kbuild: collect shorthands into scripts/Kbuild.include), scripts/Makefile.clean includes scripts/Kbuild.include. The workaround and the comment block in kernel/gcov/Makefile are no longer necessary. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Peter Oberparleiter <oberpar@linux.vnet.ibm.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/gcov/Makefile13
1 files changed, 1 insertions, 12 deletions
diff --git a/kernel/gcov/Makefile b/kernel/gcov/Makefile
index 6f01fa3d9ca1..42323c7ec106 100644
--- a/kernel/gcov/Makefile
+++ b/kernel/gcov/Makefile
@@ -10,18 +10,7 @@ ifeq ($(CONFIG_GCOV_FORMAT_3_4),y)
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 $(cc-version),$(cc-version),0)
+ cc-ver := $(cc-version)
endif
obj-$(CONFIG_GCOV_KERNEL) := base.o fs.o