gcov: provide the capability to select gcov format automatically

And make it the default in Kconfig.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug
index b19b3579c50519d32d8e22a9e83ca112a47abcb4..813956460df2d1a4fb56983c5573c9f442959ab1 100644 (file)
--- 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 6a304ab3e78d8c41ca8b03b609bf7a16c21556c3..1b61357114408fca09cc5ec1312375a0b5d767c5 100644 (file)
--- 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)))