From patchwork Fri Feb 16 18:38:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 128608 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp864490ljc; Fri, 16 Feb 2018 10:41:52 -0800 (PST) X-Google-Smtp-Source: AH8x227sXfT+dreU5Cc7kHIZK1QpotL+fVWKGPUrKil0zsdv+6jMazJ5gkqsCEfKE5kZeSuOkyMy X-Received: by 10.101.69.9 with SMTP id n9mr6046272pgq.317.1518806512391; Fri, 16 Feb 2018 10:41:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518806512; cv=none; d=google.com; s=arc-20160816; b=yxiPhglHx5z0v+MZ22LMWEMLcv9ED5rRh7KqGIdTgv8325xiqLR3+9NHHhvOzKtqSe wMxHwyk56M5+vmjFplQKkfc8MXxDWNG/akMo427/qcQA28NrJqNQBJ+ljR8GKXpstegP qLQGZQUBFP60SuNiGzDf/BNtRyQjQaWZ/JK8VoWLLF+kCzV6VsEoXm7wVqSFC84UQLrm 1oqUl3cGir24A2lKs0tgAGU53eC0is7NQzvRSOqbMWf1oPxzxZAhEiVNX8JLswKbFPTP 82RtWJ0Wp7F6PIxJD3rLSIdWWspH27ERa1d3lJBn4y5g2gsCSwzup5VrmAHinj3qR91v icnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=5E3V+lniGkXthizHMXYirjjRQ8c47R+TtsbPm2hC14Y=; b=RdFEQ91E5S/i4wCQ4V9WJEsSpWWsaBi1Bkv7V3u58SKhP1oAxbnpTO8zFAvc0YqkBS uGS1PPMyySjGZirtX7Twfw/6isiqSWyuiWZx4t6yOgU8+zGMJsL+kY19TJGBxxgjoWYE WpBq43XiaOraY6YWWsv077DNUGnjuvCkACXP7YG7/PxOYIPpyn1yvHWX23WmvmU+KLXN KsUNLw6pWrEn0PaYzOnWFM+Rb9/L8ucwqfNt/6TmIwR0PaLigeBuW3iwmp3Z8OAIdjns kSBchldOyyGUxlExltYbCOB9gJEiL8sl0GOGdbG4rZfCbBrr4MQFD4g5ShxvTed29Lyl 0GMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=oJRN23ux; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o1si4429669pfh.238.2018.02.16.10.41.52; Fri, 16 Feb 2018 10:41:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=oJRN23ux; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752985AbeBPSls (ORCPT + 28 others); Fri, 16 Feb 2018 13:41:48 -0500 Received: from conuserg-07.nifty.com ([210.131.2.74]:57824 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752719AbeBPSlU (ORCPT ); Fri, 16 Feb 2018 13:41:20 -0500 Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-07.nifty.com with ESMTP id w1GIdBTL013418; Sat, 17 Feb 2018 03:39:29 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com w1GIdBTL013418 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1518806370; bh=5E3V+lniGkXthizHMXYirjjRQ8c47R+TtsbPm2hC14Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oJRN23ux3B0UQd2L3uUo5l471O4o0PGGEd/jSN8TZr9AYmboOsaPxOGtAahLq/C1i 4hiVj3VfBNrBW+7U4fUk1RNiplWjFs94BeRh4I6sEIR8y1+iAS2JwD7wdt0A8fooye 4EqMB1wbdE0mmm8H0j/4ct1a//RAIKFbvVsGe0pbio7kghfAK6G23vjKsROVhSF67N G9f96uCdFb7Bo/622KHfDs+TMJCKlCIaSSTFaEdPxd2jNUhBRAMgeDfltejp9KrulY +r2d8eoNb28Tz4Y8GocuvxQ4oU6/Hk1hVoXK7HsxwIhaXF6xtTJVLveFKRN+ovmprg 5NiX/LVkV9Ibg== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org, Linus Torvalds Cc: Greg Kroah-Hartman , Arnd Bergmann , Kees Cook , Randy Dunlap , Ulf Magnusson , Sam Ravnborg , Michal Marek , Masahiro Yamada , Peter Oberparleiter , linux-kernel@vger.kernel.org Subject: [PATCH 18/23] gcov: remove CONFIG_GCOV_FORMAT_AUTODETECT Date: Sat, 17 Feb 2018 03:38:46 +0900 Message-Id: <1518806331-7101-19-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518806331-7101-1-git-send-email-yamada.masahiro@socionext.com> References: <1518806331-7101-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org CONFIG_GCOV_FORMAT_AUTODETECT compiles either gcc_3_4.c or gcc_4_7.c according to your GCC version. We can achieve the equivalent behavior by setting reasonable default in the 'choice' with the knowledge of the compiler version. Users are still allowed to change it if they need to do so. Signed-off-by: Masahiro Yamada --- kernel/gcov/Kconfig | 18 ++++++------------ kernel/gcov/Makefile | 2 -- 2 files changed, 6 insertions(+), 14 deletions(-) -- 2.7.4 diff --git a/kernel/gcov/Kconfig b/kernel/gcov/Kconfig index 1276aab..c56bee7 100644 --- a/kernel/gcov/Kconfig +++ b/kernel/gcov/Kconfig @@ -53,20 +53,14 @@ config GCOV_PROFILE_ALL choice prompt "Specify GCOV format" depends on GCOV_KERNEL - default GCOV_FORMAT_AUTODETECT + default GCOV_FORMAT_3_4 if CC_IS_GCC && GCC_VERSION < 40700 + default GCOV_FORMAT_4_7 ---help--- - The gcov format is usually determined by the GCC version, but there are + The gcov format is usually determined by the GCC version, and the + default is chosen according to your GCC version. However, there are exceptions where format changes are integrated in lower-version GCCs. - In such a case use this option to adjust the format used in the kernel - accordingly. - - If unsure, choose "Autodetect". - -config GCOV_FORMAT_AUTODETECT - bool "Autodetect" - ---help--- - Select this option to use the format that corresponds to your GCC - version. + In such a case, change this option to adjust the format used in the + kernel accordingly. config GCOV_FORMAT_3_4 bool "GCC 3.4 format" diff --git a/kernel/gcov/Makefile b/kernel/gcov/Makefile index c6c50e5..ff06d64 100644 --- a/kernel/gcov/Makefile +++ b/kernel/gcov/Makefile @@ -4,5 +4,3 @@ ccflags-y := -DSRCTREE='"$(srctree)"' -DOBJTREE='"$(objtree)"' 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)