From f1ef35f7c989ad50d0a92f6904b05af6e9d122c3 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Wed, 5 Oct 2016 15:29:59 +0100 Subject: [PATCH] gcov: provide the capability to select gcov format automatically And make it the default in Kconfig. Signed-off-by: Wei Liu Acked-by: Jan Beulich --- xen/Kconfig.debug | 9 ++++++++- xen/common/gcov/Makefile | 4 ++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug index b19b3579c5..813956460d 100644 --- a/xen/Kconfig.debug +++ b/xen/Kconfig.debug @@ -39,10 +39,17 @@ config GCOV choice prompt "Specify Gcov format" depends on GCOV - default GCOV_FORMAT_5 + 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_5 bool "GCC 5 format" ---help--- diff --git a/xen/common/gcov/Makefile b/xen/common/gcov/Makefile index 6a304ab3e7..1b61357114 100644 --- a/xen/common/gcov/Makefile +++ b/xen/common/gcov/Makefile @@ -3,3 +3,7 @@ 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_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, gcc_5.o))) -- 2.39.5