diff mbox

x86: suppress duplicate symbol warnings for CONFIG_GCOV

Message ID 58D3F07C0200007800146CCE@prv-mh.provo.novell.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jan Beulich March 23, 2017, 2:57 p.m. UTC 
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.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
I wonder whether we shouldn't go further and suppress the duplicate
symbol warnings also when !CONFIG_LIVEPATCH.
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.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
I wonder whether we shouldn't go further and suppress the duplicate
symbol warnings also when !CONFIG_LIVEPATCH.

--- 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_GCOV) :=
+
 $(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 $(BASE
 	$(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) \

Comments

Ross Lagerwall March 23, 2017, 3:20 p.m. UTC | #1 
On 03/23/2017 02:57 PM, Jan Beulich wrote:
> 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.
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

Acked-by: Ross Lagerwall <ross.lagerwall@citrix.com>

> ---
> I wonder whether we shouldn't go further and suppress the duplicate
> symbol warnings also when !CONFIG_LIVEPATCH.

I don't really mind but if that change is made then there's more chance 
that someone accidentally introduces duplicates if they only test with 
CONFIG_LIVEPATCH=y.

--
Ross Lagerwall
Jan Beulich March 23, 2017, 4 p.m. UTC | #2 
>>> On 23.03.17 at 16:20, <ross.lagerwall@citrix.com> wrote:
> On 03/23/2017 02:57 PM, Jan Beulich wrote:
>> I wonder whether we shouldn't go further and suppress the duplicate
>> symbol warnings also when !CONFIG_LIVEPATCH.
> 
> I don't really mind but if that change is made then there's more chance 
> that someone accidentally introduces duplicates if they only test with 
> CONFIG_LIVEPATCH=y.

If you mean "=n", then yes, I can see that as a possible issue.

Jan
diff mbox

Patch

--- 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_GCOV) :=
+
 $(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 $(BASE
 	$(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) \