]> xenbits.xensource.com Git - xen.git/commitdiff
x86: work around build issue with GNU ld 2.37
authorJan Beulich <jbeulich@suse.com>
Wed, 25 Aug 2021 13:58:18 +0000 (15:58 +0200)
committerJan Beulich <jbeulich@suse.com>
Wed, 25 Aug 2021 13:58:18 +0000 (15:58 +0200)
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@suse.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
master commit: 58ad654ebce7ccb272a3f4f3482c03aaad850d31
master date: 2021-07-27 15:03:29 +0100

xen/arch/x86/xen.lds.S

index f266969d0dde3625292bc7cc4212e3c6535ff1df..364424e3ce68818b0efda52fd1e86ff31980e989 100644 (file)
@@ -21,7 +21,7 @@ ENTRY(efi_start)
 
 #define FORMAT "elf64-x86-64"
 #define SECTION_ALIGN PAGE_SIZE
-#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)