From patchwork Tue Jan 21 13:59:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 11343995 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E7A16109A for ; Tue, 21 Jan 2020 14:01:43 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C40FF24125 for ; Tue, 21 Jan 2020 14:01:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="ZXqiqpu5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C40FF24125 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1itu4e-0000Ll-BP; Tue, 21 Jan 2020 14:00:08 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1itu4d-0000Jo-NM for xen-devel@lists.xenproject.org; Tue, 21 Jan 2020 14:00:07 +0000 X-Inumbo-ID: 51da8afc-3c56-11ea-b833-bc764e2007e4 Received: from esa4.hc3370-68.iphmx.com (unknown [216.71.155.144]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 51da8afc-3c56-11ea-b833-bc764e2007e4; Tue, 21 Jan 2020 14:00:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1579615202; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wtpMBqUjXBTNLQWEki1dXGxzADeRYoZdTCRuseAfv5M=; b=ZXqiqpu5SA3EVVdwZ0xndneVSReEYv6DUlPGOUAuQd7MkTmZuIIvoNro SEwqweFQHKLKMx7O2hejq65tJH4mX5T+8MyWKZzQshPIXI9eyqZUBof9N Dr/52esA0BmOBzgjXEdduPRK0GgVvZOb7hJIJ/PmQLi6Mu9VSace59fgD c=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=anthony.perard@citrix.com; spf=Pass smtp.mailfrom=anthony.perard@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa4.hc3370-68.iphmx.com: no sender authenticity information available from domain of anthony.perard@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa4.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa4.hc3370-68.iphmx.com: domain of anthony.perard@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa4.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa4.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa4.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: aVtWtStx+qP04iNIVTxFBVcA8lCw/u8yFObJMIqJCzsPzjDgy6udw3hn8IR9trw9magpuOTBhD umTU0DxigKFvnfxQP6qwVnagEVWDAzxDIxSwdQiuUA0KY/4WKg4MsZhWD0cm4FpuRjVTUPzAWf UmMWR+JOX3Zcc++U5nkgRE3xkisIzChdjfWDhjZB0ZrSP4/WrEitu8WnANRbppKZ5Q9/f5GffU 4e4b6QF6D60ssdzvV9Kpoo40LYU6221aSMyW7xFJ3AI2RuoMOAdjuVyqZU9Qcos50Bftywlvkv ki0= X-SBRS: 2.7 X-MesageID: 11799417 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.70,346,1574139600"; d="scan'208";a="11799417" From: Anthony PERARD To: Date: Tue, 21 Jan 2020 13:59:15 +0000 Message-ID: <20200121135916.1140483-2-anthony.perard@citrix.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200117105358.607910-1-anthony.perard@citrix.com> References: <20200117105358.607910-1-anthony.perard@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [XEN PATCH v2.1 14/12] squash! xen/build: introduce ccflags-y and CFLAGS_$@ X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Julien Grall , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Anthony PERARD , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" -DXEN_BUILD_EFI and -DBUILD_ID_EFI seems to only be used in xen.lds.S which is build using the AFLAGS, so add those flags only to asflags-y. Signed-off-by: Anthony PERARD --- That fix build of xen.efi. Should add asflags-y into the patch title. --- xen/Rules.mk | 4 +++- xen/arch/x86/Makefile | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index 4051d60addb5..add7cad93e4e 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -39,6 +39,7 @@ ALL_OBJS-$(CONFIG_CRYPTO) += $(BASEDIR)/crypto/built_in.o # Initialise some variables ccflags-y := +asflags-y := # Allow arch specific cflags, to be calculated for each objects. arch_ccflags = @@ -101,7 +102,8 @@ c_flags = -MMD -MF $(@D)/.$(@F).d \ $(ccflags-y) $(CFLAGS_$(target-stem).o) a_flags = -MMD -MF $(@D)/.$(@F).d \ - $(XEN_AFLAGS) + $(XEN_AFLAGS) \ + $(asflags-y) built_in.o: $(obj-y) $(extra-y) ifeq ($(obj-y),) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 191e2173315a..1e013ee31131 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -174,14 +174,14 @@ EFI_LDFLAGS += --major-subsystem-version=2 --minor-subsystem-version=0 export XEN_BUILD_EFI := $(shell $(CC) $(filter-out $(CFLAGS-y) .%.d,$(CFLAGS)) -c efi/check.c -o efi/check.o 2>/dev/null && echo y) # Check if the linker supports PE. XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(LD) -mi386pep --subsystem=10 -o efi/check.efi efi/check.o 2>/dev/null && echo y)) -ccflags-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI +asflags-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI $(TARGET).efi: VIRT_BASE = 0x$(shell $(NM) efi/relocs-dummy.o | sed -n 's, A VIRT_START$$,,p') $(TARGET).efi: ALT_BASE = 0x$(shell $(NM) efi/relocs-dummy.o | sed -n 's, A ALT_START$$,,p') ifneq ($(build_id_linker),) ifeq ($(call ld-ver-build-id,$(LD) $(filter -m%,$(EFI_LDFLAGS))),y) -ccflags-y += -DBUILD_ID_EFI +asflags-y += -DBUILD_ID_EFI EFI_LDFLAGS += $(build_id_linker) note_file := efi/buildid.o # NB: this must be the last input in the linker call, because inputs following