[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v3 3/3] xen/x86: declare the efi symbol as weak
This allows removing the DEFINED conditional in the linker script, and fixes compilation with lld: ld -melf_x86_64_fbsd -T xen.lds -N prelink.o --build-id=sha1 \ /root/src/xen/xen/common/symbols-dummy.o -o /root/src/xen/xen/.xen-syms.0 ld: error: xen.lds:233: symbol not found: efi Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx> --- Cc: Jan Beulich <jbeulich@xxxxxxxx> Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> Cc: Daniel Kiper <daniel.kiper@xxxxxxxxxx> --- xen/arch/x86/xen.lds.S | 2 -- xen/include/xen/efi.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 326e885402..9fa40a6d48 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -304,8 +304,6 @@ SECTIONS } :text #endif - efi = DEFINED(efi) ? efi : .; - /* Sections to be discarded */ /DISCARD/ : { *(.exit.text) diff --git a/xen/include/xen/efi.h b/xen/include/xen/efi.h index 44b7d3ec3a..5678df72f9 100644 --- a/xen/include/xen/efi.h +++ b/xen/include/xen/efi.h @@ -21,7 +21,7 @@ struct efi { unsigned long smbios3; /* SMBIOS v3 table */ }; -extern struct efi efi; +extern struct efi __weak efi; #ifndef __ASSEMBLY__ -- 2.17.1 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxxxxxxxxx https://lists.xenproject.org/mailman/listinfo/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |