aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCole Robinson <crobinso@redhat.com>2021-10-08 12:21:01 -0400
committerMichael Roth <michael.roth@amd.com>2021-12-15 07:13:37 -0600
commitfddd169de593da46b2ccd316d63c03b416b94437 (patch)
treedd3dfca16ac941974346dc04d2af96274da8ef0f
parent711bd602cc432e4ab0c4c59f19d6611302870248 (diff)
downloadqemu-fddd169de593da46b2ccd316d63c03b416b94437.zip
qemu-fddd169de593da46b2ccd316d63c03b416b94437.tar.gz
qemu-fddd169de593da46b2ccd316d63c03b416b94437.tar.bz2
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@redhat.com> Message-Id: <5ab2a54c262c61f64c22dbb49ade3e2db8a740bb.1633708346.git.crobinso@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> (cherry picked from commit 8e751e9c38e324737fd3d3aa0562f886313bba3c) Signed-off-by: Michael Roth <michael.roth@amd.com>
-rw-r--r--tests/tcg/x86_64/system/kernel.ld5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/tcg/x86_64/system/kernel.ld b/tests/tcg/x86_64/system/kernel.ld
index 49c12b04..ca5d6bd 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