From: Jan Beulich <jbeulich@suse.com>
Date: Fri, 31 Mar 2017 11:23:53 +0000 (+0200)
Subject: x86: suppress duplicate symbol warnings for CONFIG_GCOV
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~2378
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=064a26522338fb1a50e68f559c1e6fcd5601f441;p=xen.git

x86: suppress duplicate symbol warnings for CONFIG_GCOV

There are quite a few of these, and as the option is a development one
only, duplicate symbol names should not be an issue there. In other
environments allow the user to control this, unless Live patching is
enabled.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Ross Lagerwall <ross.lagerwall@citrix.com>
---

diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug
index 813956460d..689f2974c0 100644
--- a/xen/Kconfig.debug
+++ b/xen/Kconfig.debug
@@ -31,6 +31,7 @@ config FRAME_POINTER
 config GCOV
 	bool "Gcov Support"
 	depends on !LIVEPATCH
+	select SUPPRESS_DUPLICATE_SYMBOL_WARNINGS
 	---help---
 	  Enable gcov (a test coverage program in GCC) support.
 
diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index adc768f0a8..2331246923 100644
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -90,6 +90,9 @@ else
 all_symbols =
 endif
 
+syms-warn-dup-y := --warn-dup
+syms-warn-dup-$(CONFIG_SUPPRESS_DUPLICATE_SYMBOL_WARNINGS) :=
+
 $(TARGET): $(TARGET)-syms $(efi-y) boot/mkelf32
 	./boot/mkelf32 $(notes_phdrs) $(TARGET)-syms $(TARGET) 0x100000 \
 	               `$(NM) $(TARGET)-syms | sed -ne 's/^\([^ ]*\) . __2M_rwdata_end$$/0x\1/p'`
@@ -131,7 +134,7 @@ $(TARGET)-syms: prelink.o xen.lds $(BASEDIR)/common/symbols-dummy.o
 	$(LD) $(LDFLAGS) -T xen.lds -N prelink.o $(build_id_linker) \
 	    $(@D)/.$(@F).0.o -o $(@D)/.$(@F).1
 	$(NM) -pa --format=sysv $(@D)/.$(@F).1 \
-		| $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort --warn-dup \
+		| $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort $(syms-warn-dup-y) \
 		>$(@D)/.$(@F).1.S
 	$(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1.o
 	$(LD) $(LDFLAGS) -T xen.lds -N prelink.o $(build_id_linker) \
diff --git a/xen/common/Kconfig b/xen/common/Kconfig
index 5334be38a9..afbc0e9be9 100644
--- a/xen/common/Kconfig
+++ b/xen/common/Kconfig
@@ -238,6 +238,16 @@ config FAST_SYMBOL_LOOKUP
 
 	  If unsure, say Y.
 
+config SUPPRESS_DUPLICATE_SYMBOL_WARNINGS
+	bool "Suppress duplicate symbol warnings" if !LIVEPATCH
+	default y if !LIVEPATCH
+	---help---
+	  Multiple symbols with the same name aren't generally a problem
+	  unless Live patching is to be used, so these warnings can be
+	  suppressed by enabling this option.  Certain other options (known
+	  to produce many duplicate names) may select this to avoid the
+	  build becoming overly verbose.
+
 config CMDLINE
 	string "Built-in hypervisor command string" if EXPERT = "y"
 	default ""