[qemu-xen stable-4.16] tests: tcg: Fix PVH test with binutils 2.36+

[patchbot@xxxxxxx]

commit fddd169de593da46b2ccd316d63c03b416b94437
Author:     Cole Robinson <crobinso@xxxxxxxxxx>
AuthorDate: Fri Oct 8 12:21:01 2021 -0400
Commit:     Michael Roth <michael.roth@xxxxxxx>
CommitDate: Wed Dec 15 07:13:37 2021 -0600

    tests: tcg: Fix PVH test with binutils 2.36+
    
    binutils started adding a .note.gnu.property ELF section which
    makes the PVH test fail:
    
      TEST    hello on x86_64
    qemu-system-x86_64: Error loading uncompressed kernel without PVH ELF Note
    
    Discard .note.gnu* while keeping the PVH .note bits intact.
    
    This also strips the build-id note, so drop the related comment.
    
    Signed-off-by: Cole Robinson <crobinso@xxxxxxxxxx>
    Message-Id: 
<5ab2a54c262c61f64c22dbb49ade3e2db8a740bb.1633708346.git.crobinso@xxxxxxxxxx>
    Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
    (cherry picked from commit 8e751e9c38e324737fd3d3aa0562f886313bba3c)
    Signed-off-by: Michael Roth <michael.roth@xxxxxxx>
---
 tests/tcg/x86_64/system/kernel.ld | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/tcg/x86_64/system/kernel.ld 
b/tests/tcg/x86_64/system/kernel.ld
index 49c12b04ae..ca5d6bd850 100644
--- a/tests/tcg/x86_64/system/kernel.ld
+++ b/tests/tcg/x86_64/system/kernel.ld
@@ -16,7 +16,10 @@ SECTIONS {
                *(.rodata)
        } :text
 
-        /* Keep build ID and PVH notes in same section */
+        /DISCARD/ : {
+                *(.note.gnu*)
+        }
+
         .notes :  {
                *(.note.*)
         } :note
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.16