[xen stable-4.13] x86/guest: Fix assembler warnings with newer binutils

[patchbot@xxxxxxx]

commit 7d57caa9a26ed0ae46391e0d94cfca397e5bc8ba
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Wed Jun 24 16:23:20 2020 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Wed Jun 24 16:23:20 2020 +0200

    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 <andrew.cooper3@xxxxxxxxxx>
    Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 xen/arch/x86/guest/hypercall_page.S | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/arch/x86/guest/hypercall_page.S 
b/xen/arch/x86/guest/hypercall_page.S
index 6485e9150e..9958d02cfd 100644
--- a/xen/arch/x86/guest/hypercall_page.S
+++ b/xen/arch/x86/guest/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)
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.13