[xen stable-4.12] build32: don't discard .shstrtab in linker script

[patchbot@xxxxxxx]

commit 7641573b333966271ddedae849dde3e72bf4d457
Author:     Roger Pau Monné <roger.pau@xxxxxxxxxx>
AuthorDate: Wed Jun 24 17:14:40 2020 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Wed Jun 24 17:14:40 2020 +0200

    build32: don't discard .shstrtab in linker script
    
    LLVM linker doesn't support discarding .shstrtab, and complains with:
    
    ld -melf_i386_fbsd -N -T build32.lds -o reloc.lnk reloc.o
    ld: error: discarding .shstrtab section is not allowed
    
    Add an explicit .shstrtab, .strtab and .symtab sections to the linker
    script after the text section in order to make LLVM LD happy and match
    the behavior of GNU LD.
    
    Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
    Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
    master commit: 10d27b48b5b4dfbead2d9bf03290984bba4806e4
    master date: 2020-06-02 13:37:53 +0200
---
 xen/arch/x86/boot/build32.lds | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/xen/arch/x86/boot/build32.lds b/xen/arch/x86/boot/build32.lds
index 97454b40ff..1ab9418793 100644
--- a/xen/arch/x86/boot/build32.lds
+++ b/xen/arch/x86/boot/build32.lds
@@ -50,6 +50,20 @@ SECTIONS
         *(.got.plt)
   }
 
+  /*
+   * Discarding .shstrtab is not supported by LLD (LLVM LD) and will trigger an
+   * error. Also keep the rest of the control sections to match GNU LD 
behavior.
+   */
+  .shstrtab : {
+        *(.shstrtab)
+  }
+  .strtab : {
+        *(.strtab)
+  }
+  .symtab : {
+        *(.symtab)
+  }
+
   /DISCARD/ : {
         /*
          * Discard everything else, to prevent linkers from putting
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.12