All of lore.kernel.org
 help / color / mirror / Atom feed
From: Masahiro Yamada <yamada.m@jp.panasonic.com>
To: linux-kbuild@vger.kernel.org
Cc: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>,
	Michal Marek <mmarek@suse.cz>,
	Masahiro Yamada <yamada.m@jp.panasonic.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH 3/6] kbuild,gcov: remove unnecessary workaround
Date: Thu, 25 Dec 2014 14:31:25 +0900	[thread overview]
Message-ID: <1419485488-22336-4-git-send-email-yamada.m@jp.panasonic.com> (raw)
In-Reply-To: <1419485488-22336-1-git-send-email-yamada.m@jp.panasonic.com>

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>
---

 kernel/gcov/Makefile | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/kernel/gcov/Makefile b/kernel/gcov/Makefile
index 6f01fa3..42323c7 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
-- 
1.9.1


  parent reply	other threads:[~2014-12-25  5:31 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-25  5:31 [PATCH 0/6] kbuild: refactor Makefiles related with cc-version Masahiro Yamada
2014-12-25  5:31 ` Masahiro Yamada
2014-12-25  5:31 ` [PATCH 1/6] kbuild: fix cc-ifversion macro Masahiro Yamada
2014-12-25  5:31 ` [PATCH 2/6] kbuild: do not add $(call ...) to invoke cc-version or cc-fullversion Masahiro Yamada
2014-12-25  5:31   ` Masahiro Yamada
2014-12-25 22:41   ` Helge Deller
2014-12-25 22:41     ` Helge Deller
2014-12-25 22:41     ` Helge Deller
2014-12-25  5:31 ` Masahiro Yamada [this message]
2014-12-25  5:31 ` [PATCH 4/6] kbuild,gcov: simplify kernel/gcov/Makefile Masahiro Yamada
2014-12-25  5:31 ` [PATCH 5/6] kbuild: allow cc-ifversion to have the argument for false condition Masahiro Yamada
2014-12-25  5:31 ` [PATCH 6/6] kbuild,gcov: simplify kernel/gcov/Makefile more Masahiro Yamada
2015-01-09 16:27 ` [PATCH 0/6] kbuild: refactor Makefiles related with cc-version Michal Marek
2015-01-09 16:27   ` Michal Marek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1419485488-22336-4-git-send-email-yamada.m@jp.panasonic.com \
    --to=yamada.m@jp.panasonic.com \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mmarek@suse.cz \
    --cc=oberpar@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.