From patchwork Thu Feb 2 22:46:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 9553311 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 707AE60236 for ; Thu, 2 Feb 2017 22:49:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A611284CE for ; Thu, 2 Feb 2017 22:49:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5D234284D0; Thu, 2 Feb 2017 22:49:21 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RCVD_IN_SORBS_SPAM,T_DKIM_INVALID 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 896BA284CE for ; Thu, 2 Feb 2017 22:49:19 +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 1cZQ9h-0000ZR-ME; Thu, 02 Feb 2017 22:47:05 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cZQ9h-0000ZG-2W for xen-devel@lists.xenproject.org; Thu, 02 Feb 2017 22:47:05 +0000 Received: from [193.109.254.147] by server-6.bemta-6.messagelabs.com id 36/A8-15112-8E6B3985; Thu, 02 Feb 2017 22:47:04 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphkeJIrShJLcpLzFFi42K5GHr1iO7zbZM jDP6cM7D4vmUykwOjx+EPV1gCGKNYM/OS8isSWDNeLLzEVPCfo+LHt4QGxmPsXYxcHEIC0xgl XrQ/AnNYBNqZJbYs6GUEcSQE3rFI/Fg+FcjhBHJiJO6uPsMCYZdKrF16jg3EFhJQkPg94RATx KiVTBJ3LrxgAkmwCWhIPPk1A6xIREBJ4t6qyWBxZoESib3zfwAN5eAQFrCWuHZWHyTMIqAq8f HIY7ByXgEziYZ1K5ggdslLLDx/hGkCI98CRoZVjOrFqUVlqUW6JnpJRZnpGSW5iZk5uoYGZnq 5qcXFiempOYlJxXrJ+bmbGIFhwgAEOxi7L/sfYpTkYFIS5f25cHKEEF9SfkplRmJxRnxRaU5q 8SFGGQ4OJQne1K1AOcGi1PTUirTMHGDAwqQlOHiURHiNQNK8xQWJucWZ6RCpU4zGHD1dp18yc ezZdfklkxBLXn5eqpQ473yQUgGQ0ozSPLhBsEi6xCgrJczLCHSaEE9BalFuZgmq/CtGcQ5GJW HetSBTeDLzSuD2vQI6hQnolJ+PJ4GcUpKIkJJqYDysme509nN1VHe5Q8/JC/v4RfZ055/0W2x WOV96rwHDrB+c89w/vvTZ9N7eb4G+6nyTzZpLHjTYbnMK6Jtyo9r3+16eudx9y26v9O98qvRo yjTTc/OLIyKq2hxvhahk3vFs1AuUulimWObgabtujl3QYbbXi/f/2m58I/Np+48dx4TPLr15/ qkSS3FGoqEWc1FxIgCh5rnmnwIAAA== X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1486075622!85223463!1 X-Originating-IP: [209.85.213.196] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17849 invoked from network); 2 Feb 2017 22:47:03 -0000 Received: from mail-yb0-f196.google.com (HELO mail-yb0-f196.google.com) (209.85.213.196) by server-9.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 2 Feb 2017 22:47:03 -0000 Received: by mail-yb0-f196.google.com with SMTP id j82so95416ybg.2 for ; Thu, 02 Feb 2017 14:47:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cardoe.com; s=google; h=from:to:cc:subject:date:message-id; bh=mVIFNgMABl+68Kal4RgwLFkggZDle+aa6J8czL4Dc9U=; b=E/vKgqwySA6+tAacZZzeqwtnjgryHKfQCjisWz624Z5BN0+Qv/hRXE4VBYB7tQUGdY 5T0lPDvDC7uPyHmxU4S7GEOPDTUuVDB7PM6F2qvJ4P6Wcf6P4U4Ly/6q3qFce75bzCTI JqyvZwZSeHxOn6RLOByqIkJdH4MAfSk0m8IR4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=mVIFNgMABl+68Kal4RgwLFkggZDle+aa6J8czL4Dc9U=; b=pVUo/hkMLq+KWEXHpOC16sTqZLguoE/s3DRn0oS4hdVVn8eP/nO4ttrKykz0XIXCon n8gefMxWf9v5tFDPMnwSltO9zBBKhRmd3ia2pr39AGFUoILx8jOMq4mwIkcbR8nz64fb jo5m07DuK6kym5lejQ3/pQiJZF8GS0zzLyZqObA1qeKHxAAfeCp+Fc6JZSPwSeW+5ae/ CZWkm+VD9jM3JVPLb606s2VHr4LPPpTmrrgGLFv/qx+tqRMboXQg+jpmZxUj7RA7UwLs qUGqiy0QVlrwJqnmLc7+10e3dWD8aW/8ITxppsu5+NLhLrBOqxQb9m5n0ksJP9iVsyE7 k/AQ== X-Gm-Message-State: AIkVDXJ+jpvf/I/anLgszmifDuKznasb82KG8qJeGBU0iU2wIoAVZiqzHplalwSkeezdjg== X-Received: by 10.37.8.65 with SMTP id 62mr4099746ybi.73.1486075622518; Thu, 02 Feb 2017 14:47:02 -0800 (PST) Received: from swanson.attlocal.net (104-179-196-18.lightspeed.brhmal.sbcglobal.net. [104.179.196.18]) by smtp.gmail.com with ESMTPSA id l27sm13611383ywh.33.2017.02.02.14.47.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 02 Feb 2017 14:47:02 -0800 (PST) From: Doug Goldstein To: xen-devel@lists.xenproject.org Date: Thu, 2 Feb 2017 16:46:42 -0600 Message-Id: <20170202224642.19368-1-cardoe@cardoe.com> X-Mailer: git-send-email 2.10.2 Cc: Andrew Cooper , Doug Goldstein , Jan Beulich Subject: [Xen-devel] [PATCH] x86/EFI: fix build when using GNU Make 4.1 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: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Since c/s eee5909e9d (x86/EFI: use less crude a way of generating the build ID) builds have been broken when using GNU Make 4.1. This is because there are no dependencies on buildid.o and as such GNU Make does not build it. This adds a dependency so that it is built. Note: This patch is different than I was going to originally submit, I had used runtime.o but while testing this I saw Daniel Kiper's v14 of his multiboot2 series come along and I modified my patch so that he would not have to rebase. Signed-off-by: Doug Goldstein --- CC: Jan Beulich CC: Andrew Cooper Jan, This needs to be backported to 4.8 as well. --- xen/arch/x86/efi/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/x86/efi/Makefile b/xen/arch/x86/efi/Makefile index ad3fdf7..af5324f 100644 --- a/xen/arch/x86/efi/Makefile +++ b/xen/arch/x86/efi/Makefile @@ -14,5 +14,7 @@ extra-$(efi) += boot.init.o relocs-dummy.o runtime.o compat.o buildid.o %.o: %.ihex $(OBJCOPY) -I ihex -O binary $< $@ +boot.init.o: buildid.o + stub.o: $(extra-y) nogcov-$(efi) += stub.o