Use autodetect only.
Signed-off-by: Roger Pau Monné <roger....@citrix.com>
---
Cc: Andrew Cooper <andrew.coop...@citrix.com>
Cc: George Dunlap <george.dun...@eu.citrix.com>
Cc: Ian Jackson <ian.jack...@eu.citrix.com>
Cc: Jan Beulich <jbeul...@suse.com>
Cc: Konrad Rzeszutek Wilk <konrad.w...@oracle.com>
Cc: Stefano Stabellini <sstabell...@kernel.org>
Cc: Tim Deegan <t...@xen.org>
Cc: Wei Liu <wei.l...@citrix.com>
---
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))))
--
2.13.6 (Apple Git-96)
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
