From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::642; helo=mail-pl1-x642.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) (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 A60DF2119072E for ; Wed, 14 Nov 2018 18:34:04 -0800 (PST) Received: by mail-pl1-x642.google.com with SMTP id x21-v6so5999019pln.9 for ; Wed, 14 Nov 2018 18:34:04 -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=o/uUvk5YwqjuXUYCcdafYa4Qd+sp+YtBKsgBVSe1XkQ=; b=jBUQ5AsDxSAtMims9DE7QUXp+54JS1GJbuXef4ZgLxLNjyfdzvAkCF8zq8mSLxzDjq yYbbEddt/LUNJN0FAXftxb9yYxDPmNkSt3drGrnPpR8hqN8/M1HZwnQBOccxkPxSEdvO pPC7i++X6Yk0aa7xatSXOordOksNqa/e+qji0= 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=o/uUvk5YwqjuXUYCcdafYa4Qd+sp+YtBKsgBVSe1XkQ=; b=kpV/aUX2ealflhDjDUemVr9JDwEVCc3ieeYgracB8AttjqzQoqy3E+oE5V1dEAiQLj bmJB9MBo7LRmsJiDq0wbQZGCeUbyytxSBsK8sjWzkjsrHr2n2aJ/CiiqaS3pvKgbpx9D 8zEB5VtZdMEB1iyn7K1F+7hUCfw7WKscnoSDjzdNA5IEJHSXu5tVO1AmGHsmwhsOAUs+ iqL/8t1D/KhgUIGlrlx6pyNu4K7X2c0UdOTHdPTNH/TyJRpILmMAzbxm4xjprWjzNbc5 jartGBbGHXoo+27ZoJMZGQkRHxHtRnTQpP834bsoATXEOt04iHwqNE/OWyadSNe27Fq9 w0Yw== X-Gm-Message-State: AGRZ1gIGlcLtygj2DbRQ2W20h/IV2iZs8T3GQ82xG3PwmaRtWqqjbo5c i5A1rdpvAkcnedQ0eTyfNQzYwCi9qZuwgg== X-Google-Smtp-Source: AJdET5eAwYQBxlXoRG9zfjTfzN0RzFl1aUojS2udDcS3CRooW8yHoqqx22eSrGx7UFpq6mhaTXXhNQ== X-Received: by 2002:a17:902:9897:: with SMTP id s23-v6mr4504944plp.229.1542249244091; Wed, 14 Nov 2018 18:34:04 -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.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:03 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Cc: leif.lindholm@linaro.org, maciej.rabeda@intel.com, kamil.kacperski@intel.com, pawel.orlowski@intel.com, philmd@redhat.com, michael.d.kinney@intel.com, harry.l.hsiung@intel.com, eric.jin@intel.com, Ard Biesheuvel Date: Wed, 14 Nov 2018 18:33:35 -0800 Message-Id: <20181115023353.20159-3-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: [PATCH edk2-staging 02/20] IntelUndiPkg/XGigUndiDxe: move MSFT warning overrides to INF file 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: , X-List-Received-Date: Thu, 15 Nov 2018 02:34:04 -0000 GCC chokes on the unknown MSVC specific #pragmas used for suppressing warnings, so remove them and use the INF BuildOptions section instead. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf | 4 ++-- IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h | 10 ---------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf b/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf index ab9c64dac7e8..7ccc52bc9869 100644 --- a/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf +++ b/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf @@ -44,7 +44,7 @@ UNLOAD_IMAGE = UnloadXGigUndiDriver [BuildOptions.common] -MSFT:*_*_*_CC_FLAGS = /FAcs /D MDEPKG_NDEBUG /D UNDI_10G +MSFT:*_*_*_CC_FLAGS = /FAcs /D MDEPKG_NDEBUG /D UNDI_10G /wd4244 /wd4206 /wd4189 GCC:*_*_*_CC_FLAGS = -DUNDI_10G GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG @@ -60,7 +60,7 @@ GCC:*_*_*_CC_FLAGS = -DEFI64 [BuildOptions.IA32] -MSFT:*_*_*_CC_FLAGS = /D EFI32 +MSFT:*_*_*_CC_FLAGS = /D EFI32 /wd4305 GCC:*_*_*_CC_FLAGS = -DEFI32 [sources.common] diff --git a/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h b/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h index 6fa0d1605c7c..368f40811904 100644 --- a/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h +++ b/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h @@ -29,16 +29,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef IXGBE_OSDEP_H_ #define IXGBE_OSDEP_H_ -#pragma warning(disable : 4244) -#pragma warning(disable : 4206) -#pragma warning(disable : 4189) - -#ifdef EFI32 - -// Remove truncation warning in type cast when some 64 bit variables are converted to 32-bit pointers -#pragma warning(disable : 4305) -#endif /* EFI32 */ - #ifndef EFI_SPECIFICATION_VERSION #define EFI_SPECIFICATION_VERSION 0x00020000 #endif /* EFI_SPECIFICATION_VERSION */ -- 2.17.1