[xen master] x86/EFI: don't have an overly large image size

[patchbot@xxxxxxx]

commit 11e7f0fe72ca0060762d18268e0388731fe8ccb6
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Mon Apr 26 10:26:04 2021 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Apr 26 10:26:04 2021 +0200

    x86/EFI: don't have an overly large image size
    
    While without debug info the difference is benign (so far), since we pad
    the image to 16Mb anyway, forcing the .reloc section to a 2Mb boundary
    causes subsequent .debug_* sections to go farther beyond 16Mb than
    needed. There's no reason to advance . for establishing __2M_rwdata_end,
    as all data past _end is of no interest at runtime anymore anyway.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
 xen/arch/x86/xen.lds.S | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S
index bc53ee4597..34f647a44e 100644
--- a/xen/arch/x86/xen.lds.S
+++ b/xen/arch/x86/xen.lds.S
@@ -303,8 +303,7 @@ SECTIONS
   } PHDR(text)
   _end = . ;
 
-  . = ALIGN(SECTION_ALIGN);
-  __2M_rwdata_end = .;
+  __2M_rwdata_end = ALIGN(SECTION_ALIGN);
 
 #ifdef EFI
   .reloc ALIGN(4) : {
--
generated by git-patchbot for /home/xen/git/xen.git#master