From patchwork Thu Nov 9 11:13:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Roger Pau Monne X-Patchwork-Id: 10050815 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D1B7760381 for ; Thu, 9 Nov 2017 11:16:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C31BC2A59D for ; Thu, 9 Nov 2017 11:16:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B80102AB49; Thu, 9 Nov 2017 11:16:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 347A22A59D for ; Thu, 9 Nov 2017 11:16:45 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eCkml-0004c0-W4; Thu, 09 Nov 2017 11:14:15 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eCkml-0004bi-Dm for xen-devel@lists.xenproject.org; Thu, 09 Nov 2017 11:14:15 +0000 Received: from [193.109.254.147] by server-11.bemta-6.messagelabs.com id 16/54-20813-688340A5; Thu, 09 Nov 2017 11:14:14 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrHIsWRWlGSWpSXmKPExsXitHRDpG6bBUu UwfTZXBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bnScvYClaJVyw8EN7AeEe4i5GTQ0LAX+LH zh5GEJtNQEfi4tydbF2MHBwiAioSt/cadDFycTALPGeSeD+hgRmkRlggVOLVhLVg9SxANVM+H QaL8wpYSjS8mcoIMVNPovnTSXYQm1PASmL/xUYWEFsIqObo7T5WiHpBiZMzn4DFmQU0JVq3/2 aHsOUlmrfOZoaoV5Ton/eAbQIj3ywkLbOQtMxC0rKAkXkVo0ZxalFZapGukZFeUlFmekZJbmJ mjq6hgZlebmpxcWJ6ak5iUrFecn7uJkZgqDEAwQ7GNfMDDzFKcjApifI+eMUUJcSXlJ9SmZFY nBFfVJqTWnyIUYaDQ0mCl8OcJUpIsCg1PbUiLTMHGPQwaQkOHiUR3mMgad7igsTc4sx0iNQpR mOOZzNfNzBzTLva2sQsxJKXn5cqJc5bAFIqAFKaUZoHNwgWjZcYZaWEeRmBThPiKUgtys0sQZ V/xSjOwagkzGsKMoUnM68Ebt8roFOYgE6JZgc7pSQRISXVwBhnU6dcrFcd8LFubs/aqP+/is+ 94j63+n5klPnJBTMYV851nXeH0V9ItbiPg+Xjaf4pWqJaFid083PUmoS8lpfNUrN8vcf06Xmn RQK2skmbv/7K+r55IbtaWdWEPvWE1QdkJp7ckLZh94H10x6KSv2bN/Gr85O6SDZNrkiDrtCih 119Gzf/0VdiKc5INNRiLipOBAC11d/iwQIAAA== X-Env-Sender: prvs=4793881c9=roger.pau@citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1510226052!114273850!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 58499 invoked from network); 9 Nov 2017 11:14:13 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-12.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2017 11:14:13 -0000 X-IronPort-AV: E=Sophos;i="5.44,369,1505779200"; d="scan'208";a="450987264" From: Roger Pau Monne To: Date: Thu, 9 Nov 2017 11:13:41 +0000 Message-ID: <20171109111349.95800-2-roger.pau@citrix.com> X-Mailer: git-send-email 2.13.6 (Apple Git-96) In-Reply-To: <20171109111349.95800-1-roger.pau@citrix.com> References: <20171109111349.95800-1-roger.pau@citrix.com> MIME-Version: 1.0 Cc: Stefano Stabellini , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , Jan Beulich , Roger Pau Monne Subject: [Xen-devel] [PATCH v2 for-next 1/9] kconfig/gcov: remove gcc version choice from kconfig X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Use autodetect only. Signed-off-by: Roger Pau Monné --- Cc: Andrew Cooper Cc: George Dunlap Cc: Ian Jackson Cc: Jan Beulich Cc: Konrad Rzeszutek Wilk Cc: Stefano Stabellini Cc: Tim Deegan Cc: Wei Liu --- Changes since v1: - New in this version. --- xen/Kconfig.debug | 46 ---------------------------------------------- xen/common/gcov/Makefile | 15 +++++---------- 2 files changed, 5 insertions(+), 56 deletions(-) diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug index 8d70f63743..7bb0465b5d 100644 --- a/xen/Kconfig.debug +++ b/xen/Kconfig.debug @@ -37,52 +37,6 @@ config GCOV If unsure, say N here. -choice - prompt "Specify Gcov format" - depends on GCOV - default GCOV_FORMAT_AUTODETECT - ---help--- - The gcov format is determined by gcc version. - - If unsure, choose "Autodetect". - -config GCOV_FORMAT_AUTODETECT - bool "Autodetect" - ---help--- - Automatically select gcov format based on gcc version. - -config GCOV_FORMAT_7 - bool "GCC 7 format" - ---help--- - Select this option to use the format specified in GCC 7. - Works in gcc version range [7, ...). - -config GCOV_FORMAT_5 - bool "GCC 5 format" - ---help--- - Select this option to use the format specified in GCC 5. - Works in gcc version range [5, 7). - -config GCOV_FORMAT_4_9 - bool "GCC 4.9 format" - ---help--- - Select this option to use the format specified in GCC 4.9. - Works in gcc version range [4.9, 5). - -config GCOV_FORMAT_4_7 - bool "GCC 4.7 format" - ---help--- - Select this option to use the format specified in GCC 4.7. - Works in gcc version range [4.7, 4.9). - -config GCOV_FORMAT_3_4 - bool "GCC 3.4 format" - ---help--- - Select this option to use the format specified in GCC 3.4. - Works in gcc version range [3.4, 4.7). - -endchoice - config LOCK_PROFILE bool "Lock Profiling" ---help--- diff --git a/xen/common/gcov/Makefile b/xen/common/gcov/Makefile index f68d050eca..a7a48494ca 100644 --- a/xen/common/gcov/Makefile +++ b/xen/common/gcov/Makefile @@ -1,11 +1,6 @@ obj-y += gcov_base.o gcov.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_4_9) += gcc_4_9.o -obj-$(CONFIG_GCOV_FORMAT_5) += gcc_5.o -obj-$(CONFIG_GCOV_FORMAT_7) += gcc_7.o -obj-$(CONFIG_GCOV_FORMAT_AUTODETECT) += $(call cc-ifversion,lt,0x040700, \ - gcc_3_4.o, $(call cc-ifversion,lt,0x040900, \ - gcc_4_7.o, $(call cc-ifversion,lt,0x050000, \ - gcc_4_9.o, $(call cc-ifversion,lt,0x070000, \ - gcc_5.o, gcc_7.o)))) +obj-y += $(call cc-ifversion,lt,0x040700, \ + gcc_3_4.o, $(call cc-ifversion,lt,0x040900, \ + gcc_4_7.o, $(call cc-ifversion,lt,0x050000, \ + gcc_4_9.o, $(call cc-ifversion,lt,0x070000, \ + gcc_5.o, gcc_7.o))))