From patchwork Thu Nov 15 02:33:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151138 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6453310ljp; Wed, 14 Nov 2018 18:34:07 -0800 (PST) X-Google-Smtp-Source: AJdET5f5LlysbJ8YhbuxiqNyYQ4ThStLz1OxCO1i/7zyTCyul+Is/LVXcHn9FJ6+2p1ryRvb7+13 X-Received: by 2002:a17:902:8648:: with SMTP id y8-v6mr4427201plt.159.1542249247052; Wed, 14 Nov 2018 18:34:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542249247; cv=none; d=google.com; s=arc-20160816; b=K4/7LHOMFM/hzACNwvKZ0cZynnzSlMa1f+l+GbiXUbZKa2RaadDiisWV952rmYsULK fhNU3MusL2PB296EVS0EmAMgif/SffvrNSN34BFa3uAFv17s/tTbk4CyHte0HtE36qir R58O4Al/DfaYfqFtvF2N6USPsAO+3OJTL26Kf5O+4zDNLN2b2fK7df5ZzSyZ7R4+UPNM 4jr+JMHTXT7n5P6fiMx7ne5cCE8C2CvZCwJcWHC/X1Uo/H8oz4M+lUCgSlhe2Sh6mB4I 3K9lQo5NojdNRIqKBfMPTHH34DPoRn/0ICRntdwYPzVzOZKI5yVpVJ9R+DZugJxpvk1C q/jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=Ri12gT9FLir7vA6hnu/GbvHZFoHWJoYwBXyxW29HyyM=; b=XsLuTUk0woB4SvJo1vZpDMSD7EoEehw/2rf+CpYX5Mx4gCiRvqSPUTHonhW3SPPRvO cuRF9Tw7MHB7gVy4i8nzUgXuHNI3Nfa5LeED/gPJvXXe1YaQw7KYARRHYLr8xIgzIq3i T/tFc7kg8YU9kkEKCTm6KlMS7aY3f/yHsA7R7DzMc6+vs83RLjSkqzf8coZ0PigwKozp xyhoc95VhmPPRj0ENuXJNhLgB1QSFpyyWQaRX6Rusw6crkfgt+/KCda2w7xxbeGhkAzQ 8VCc8bIsDOJKVzdkfwu7qgrcVYlVyQxGhgYLSyrJMiXeUR761bYJbOqkYvJesCzLvmK9 NeOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=HnndQCeJ; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id r22-v6si34078736pfr.18.2018.11.14.18.34.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:07 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=HnndQCeJ; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 02F002119072E; Wed, 14 Nov 2018 18:34:05 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::444; helo=mail-pf1-x444.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 8E7EE21A07A92 for ; Wed, 14 Nov 2018 18:34:03 -0800 (PST) Received: by mail-pf1-x444.google.com with SMTP id b81-v6so8399069pfe.11 for ; Wed, 14 Nov 2018 18:34:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=V/HFYwedJhL15kbdN/2Xas6CQ/6NHa+u1C1NobMXK0o=; b=HnndQCeJgX+16IpzmSlpNEP2vO3pmvkmx8cx+G9jXytSmzC70QE+8QRQOOKpps8WE4 68PGnm0KNEkUAaXoch+8GC8cIi1YJ99RoPiSDNuhBBLuxhn7dRI/kpX2fVQPpwNk/AnG f7ZBM9JVXosZhJ2fG5DGU25YSc/KAN/Og4/bo= 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:in-reply-to :references; bh=V/HFYwedJhL15kbdN/2Xas6CQ/6NHa+u1C1NobMXK0o=; b=R+FrF316pcH8R+mMJf2wxADef6KSC0r5IZTPN9GyAZqKP82K4c4B2eJKB04ZSJg1H4 aTx7EWWnM0AFfpsCQnaWTvygrA/yG5gC8rni6712Ii4fJXW6G2O7zWV+oZhN+XlLnvZZ NDYhJXy4iLGr6UddD8n8VSTk2aaCV/3SKvSt2vxz7QxlTikdK+Dmy1pXwyV81OnFqExv cEkZq8Eg64o8lMtRxkUB5WHNDdY1B+ielbkOeCAY/zPNFwEoAPt3oIOwqjSktiKt8u0C D48DrtcaXg+KUvFydS+YM4dwXmVdw9Ixl/X+QCQS0lT1HFAds1H4C+kcDx3sBlaLphjL uAFQ== X-Gm-Message-State: AGRZ1gJNY6P9l8tH7WPCYN2DGlNSKZlVnSqUX1j0l0742KecP7PBxxEy EG5H7sK4n5rNiQt2XOOCOsm+4JR5UASs8w== X-Received: by 2002:aa7:814f:: with SMTP id d15-v6mr4615846pfn.78.1542249242843; Wed, 14 Nov 2018 18:34:02 -0800 (PST) Received: from mba13.psav.com ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id v185-v6sm27323393pfv.48.2018.11.14.18.34.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:02 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 14 Nov 2018 18:33:34 -0800 Message-Id: <20181115023353.20159-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181115023353.20159-1-ard.biesheuvel@linaro.org> References: <20181115023353.20159-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-staging 01/20] IntelUndiPkg/XGigUndiDxe: create GCC alternatives for MSFT build options X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kamil.kacperski@intel.com, eric.jin@intel.com, pawel.orlowski@intel.com, michael.d.kinney@intel.com, harry.l.hsiung@intel.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Prefix the existing MSFT-only build option overrides with MSFT: and create the GCC: counterparts so we can build this code with GCC as well. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ryszard Knop diff --git a/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf b/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf index 9e0e4aff0885..ab9c64dac7e8 100644 --- a/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf +++ b/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf @@ -44,19 +44,24 @@ UNLOAD_IMAGE = UnloadXGigUndiDriver [BuildOptions.common] -*_*_*_CC_FLAGS = /FAcs /D MDEPKG_NDEBUG /D UNDI_10G +MSFT:*_*_*_CC_FLAGS = /FAcs /D MDEPKG_NDEBUG /D UNDI_10G +GCC:*_*_*_CC_FLAGS = -DUNDI_10G +GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG [BuildOptions.X64] -*_*_*_CC_FLAGS = /D EFIX64 +MSFT:*_*_*_CC_FLAGS = /D EFIX64 +GCC:*_*_*_CC_FLAGS = -DEFIX64 [BuildOptions.IPF] -*_*_*_CC_FLAGS = /D EFI64 +MSFT:*_*_*_CC_FLAGS = /D EFI64 +GCC:*_*_*_CC_FLAGS = -DEFI64 [BuildOptions.IA32] -*_*_*_CC_FLAGS = /D EFI32 +MSFT:*_*_*_CC_FLAGS = /D EFI32 +GCC:*_*_*_CC_FLAGS = -DEFI32 [sources.common] InventoryStrings.uni