[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[xen stable-4.15] x86: work around build issue with GNU ld 2.37



commit 1beb196decd86e6512f1e3cbcfd693dace99cc38
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Wed Aug 25 14:40:12 2021 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Wed Aug 25 14:40:12 2021 +0200

    x86: work around build issue with GNU ld 2.37
    
    I suspect it is commit 40726f16a8d7 ("ld script expression parsing")
    which broke the hypervisor build, by no longer accepting section names
    with a dash in them inside ADDR() (and perhaps other script directives
    expecting just a section name, not an expression): .note.gnu.build-id
    is such a section.
    
    Quoting all section names passed to ADDR() via DECL_SECTION() works
    around the regression.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    master commit: 58ad654ebce7ccb272a3f4f3482c03aaad850d31
    master date: 2021-07-27 15:03:29 +0100
---
 xen/arch/x86/xen.lds.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S
index 0273f79152..a02df18a25 100644
--- a/xen/arch/x86/xen.lds.S
+++ b/xen/arch/x86/xen.lds.S
@@ -18,7 +18,7 @@ ENTRY(efi_start)
 #else /* !EFI */
 
 #define FORMAT "elf64-x86-64"
-#define DECL_SECTION(x) x : AT(ADDR(x) - __XEN_VIRT_START)
+#define DECL_SECTION(x) x : AT(ADDR(#x) - __XEN_VIRT_START)
 
 ENTRY(start_pa)
 
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.15



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.