From patchwork Wed Sep 21 15:59:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Rzeszutek Wilk X-Patchwork-Id: 9343797 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6DA1D6077A for ; Wed, 21 Sep 2016 16:02:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 47FAD2A7E9 for ; Wed, 21 Sep 2016 16:02:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3AEF22A7EB; Wed, 21 Sep 2016 16:02:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5701A2A7E9 for ; Wed, 21 Sep 2016 16:02:18 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bmjwJ-0004K4-FH; Wed, 21 Sep 2016 16:00:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bmjwH-0003qB-To for xen-devel@lists.xenproject.org; Wed, 21 Sep 2016 16:00:02 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 47/D1-30284-18EA2E75; Wed, 21 Sep 2016 16:00:01 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrAIsWRWlGSWpSXmKPExsUyZ7p8oG7Dukf hBttaJC2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oydbe8ZC66IVEzcup+9gXGLYBcjF4eQQAeT xNJ/a5m7GDmBnG+MEtsW50MkNjJKHO27yQThdDFK7H/1hBWkikVAVWLv0SdACQ4ONgETiTerH EFMEQFrieYGV5ByZoGtTBL/n4OUc3AIC7hLvJ7pDtLJK2Am8bSpnwli1yJGieY79RBxQYmTM5 +wgNjMAloSN/69BJvOLCAtsfwfB0iYU8Be4u+aY4wgtqiAskTDjAdgJ0sIGEv0zepjmcAoOAv JpFlIJs1CmLSAkXkVo0ZxalFZapGukZleUlFmekZJbmJmjq6hgalebmpxcWJ6ak5iUrFecn7u JkZgyNYzMDDuYLw92e8QoyQHk5Io73PHR+FCfEn5KZUZicUZ8UWlOanFhxhlODiUJHgXrAHKC RalpqdWpGXmAKMHJi3BwaMkwrsNJM1bXJCYW5yZDpE6xagoJc67GCQhAJLIKM2Da4NF7CVGWS lhXkYGBgYhnoLUotzMElT5V4ziHIxKwrxnQKbwZOaVwE1/BbSYCWjxlp8PQBaXJCKkpBoYUzW e3znH6PBjduad/YHHYxZ/ktUpCCi78GpKw53q23rlOb8FIxx+MIo3vjgj+Et+7X4+nvt3W5Lk 559kPJX/+J/v9yniR3Yl58zPUJn8LcDj7+sVwStyDRv3fz1zTjF7ckpMZ/mPh+EvLI6rKGbxL FcJ9vr7ue8B14wtMqm7fu5/eS+unSm/XImlOCPRUIu5qDgRAAXrMsvTAgAA X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1474473598!60533953!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAyODgzMzk=\n X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 59836 invoked from network); 21 Sep 2016 16:00:00 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-6.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 21 Sep 2016 16:00:00 -0000 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u8LFxobs012645 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 21 Sep 2016 15:59:51 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0021.oracle.com (8.13.8/8.13.8) with ESMTP id u8LFxoEo030831 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 21 Sep 2016 15:59:50 GMT Received: from abhmp0004.oracle.com (abhmp0004.oracle.com [141.146.116.10]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id u8LFxmEp016526; Wed, 21 Sep 2016 15:59:48 GMT Received: from x230.dumpdata.com (/10.154.130.120) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 21 Sep 2016 08:59:48 -0700 Date: Wed, 21 Sep 2016 11:59:12 -0400 From: Konrad Rzeszutek Wilk To: Jan Beulich , sstabellini@kernel.org Message-ID: <20160921155902.GA13567@x230.dumpdata.com> References: <57D17990020000780010D10A@prv-mh.provo.novell.com> <20160908162145.GC26186@localhost.localdomain> <57E162290200007800110B26@prv-mh.provo.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <57E162290200007800110B26@prv-mh.provo.novell.com> User-Agent: Mutt/1.6.1 (2016-04-27) X-Source-IP: aserv0021.oracle.com [141.146.126.233] Cc: Stefano Stabellini , Wei Liu , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , xen-devel Subject: Re: [Xen-devel] [PATCH] fix EFI part of "symbols: Generate an xen-sym.map" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP On Tue, Sep 20, 2016 at 08:22:01AM -0600, Jan Beulich wrote: > >>> On 08.09.16 at 18:21, 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. > > > > I really need Fedora to start building ld with PE support. > >> > >> Signed-off-by: Jan Beulich > > > > Reviewed-by: Konrad Rzeszutek Wilk > >> > >> --- 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 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 Signed-off-by: Konrad Rzeszutek Wilk --- Cc: Julien Grall Cc: Stefano Stabellini --- xen/arch/arm/Makefile | 1 + 1 file changed, 1 insertion(+) 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