diff mbox

fix EFI part of "symbols: Generate an xen-sym.map"

Message ID 20160921155902.GA13567@x230.dumpdata.com (mailing list archive)
State New, archived
Headers show

Commit Message

Konrad Rzeszutek Wilk Sept. 21, 2016, 3:59 p.m. UTC 
On Tue, Sep 20, 2016 at 08:22:01AM -0600, Jan Beulich wrote:
> >>> On 08.09.16 at 18:21, <konrad.wilk@oracle.com> wrote:
> > On Thu, Sep 08, 2016 at 06:45:36AM -0600, Jan Beulich wrote:
> >> Commit 6ea24e53f1 introduced two problems: It left out a semicolon and
> >> typo-ed the source file name of the EFI map file install command.
> > 
> > <sigh> I really need Fedora to start building ld with PE support.
> >> 
> >> Signed-off-by: Jan Beulich <jbeulich@suse.com>
> > 
> > Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> >> 
> >> --- a/xen/Makefile
> >> +++ b/xen/Makefile
> >> @@ -67,7 +67,7 @@ _install: $(TARGET)$(CONFIG_XEN_INSTALL_
> >>  	if [ -r $(TARGET).efi -a -n '$(EFI_DIR)' ]; then \
> >>  		[ -d $(D)$(EFI_DIR) ] || $(INSTALL_DIR) $(D)$(EFI_DIR); \
> >>  		$(INSTALL_DATA) $(TARGET).efi $(D)$(EFI_DIR)/$(T)-$(XEN_FULLVERSION).efi; \
> >> -		$(INSTALL_DATA) $(TARGET)-efi.map $(D)$(DEBUG_DIR)/$(T)-$(XEN_FULLVERSION).efi.map \
> >> +		$(INSTALL_DATA) $(TARGET).efi.map $(D)$(DEBUG_DIR)/$(T)-$(XEN_FULLVERSION).efi.map; \
> 
> Sadly this has further fallout: The file being installed here does not
> exist in an ARM64 build. Can you please invent a fix for that?


From 24f37051126f04de42dee5cff24b8c05541db2d8 Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 21 Sep 2016 11:39:44 -0400
Subject: [PATCH] Makefile: fix (again) EFI part of "symbols: Generate an
 xen-sym.map

This is a follow-up to commit d14fffcc6a7c054db9e337026a3c850152244ac4
"fix EFI part of "symbols: Generate an xen-sym.map" which fixed most of
the issues.

However we still have an issue - The file being installed (xen.efi.map)
does not exist in an ARM64 build (the xen.efi is linked againts xen).

The fix can be done two ways:
 a) See if xen.efi.map exists and then copy it
 b) Or link xen.efi.map to xen-syms.map (similar to how xen.efi is linked
    against xen).

The patch chooses the latter.

Reported-by: Jan Beulich <JBeulich@suse.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
Cc: Julien Grall <julien.grall@arm.com>
Cc: Stefano Stabellini <sstabellini@kernel.org>
---
 xen/arch/arm/Makefile | 1 +
 1 file changed, 1 insertion(+)

Comments

Jan Beulich Sept. 21, 2016, 4:04 p.m. UTC | #1 
>>> On 21.09.16 at 17:59, <konrad.wilk@oracle.com> wrote:
> The fix can be done two ways:
>  a) See if xen.efi.map exists and then copy it
>  b) Or link xen.efi.map to xen-syms.map (similar to how xen.efi is linked
>     against xen).
> 
> The patch chooses the latter.

Well, if the ARM maintainers like that ... I don't really see a point in
installing the same file twice without its second incarnation having a
specific purpose.

Jan
diff mbox

Patch

diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile
index 1d9051c..09a3518 100644
--- a/xen/arch/arm/Makefile
+++ b/xen/arch/arm/Makefile
@@ -72,6 +72,7 @@  $(TARGET): $(TARGET)-syms $(TARGET).axf
 	$(OBJCOPY) -O binary -S $< $@
 ifeq ($(CONFIG_ARM_64),y)
 	ln -sf $(notdir $@)  ../../$(notdir $@).efi
+	ln -sf $(notdir $@)-syms.map  ../../$(notdir $@).efi.map
 endif
 
 $(TARGET).axf: $(TARGET)-syms