From: Andrew Cooper Date: Tue, 12 May 2020 16:21:33 +0000 (+0100) Subject: x86/guest: Fix assembler warnings with newer binutils X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~278 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9f74a7b66b0b03fe563779bb2c133051f1595ece;p=xen.git x86/guest: Fix assembler warnings with newer binutils GAS of at least version 2.34 complains: hypercall_page.S: Assembler messages: hypercall_page.S:24: Warning: symbol 'HYPERCALL_set_trap_table' already has its type set ... hypercall_page.S:71: Warning: symbol 'HYPERCALL_arch_7' already has its type set which is because the whole page is declared as STT_OBJECT already. Rearrange .set with respect to .type in DECLARE_HYPERCALL() so STT_FUNC is already in place. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- diff --git a/xen/arch/x86/guest/xen/hypercall_page.S b/xen/arch/x86/guest/xen/hypercall_page.S index 6485e9150e..9958d02cfd 100644 --- a/xen/arch/x86/guest/xen/hypercall_page.S +++ b/xen/arch/x86/guest/xen/hypercall_page.S @@ -17,9 +17,9 @@ GLOBAL(hypercall_page) */ #define DECLARE_HYPERCALL(name) \ .globl HYPERCALL_ ## name; \ - .set HYPERCALL_ ## name, hypercall_page + __HYPERVISOR_ ## name * 32; \ .type HYPERCALL_ ## name, STT_FUNC; \ - .size HYPERCALL_ ## name, 32 + .size HYPERCALL_ ## name, 32; \ + .set HYPERCALL_ ## name, hypercall_page + __HYPERVISOR_ ## name * 32 DECLARE_HYPERCALL(set_trap_table) DECLARE_HYPERCALL(mmu_update)