On 05/09/19 07:23, Xiaoyu lu wrote: > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1089 > > Disable warning for building OpenSSL_1_1_1b > > add /wd4132 /wd4700 /wd4310 for Visual Studio in OpensslLib[Crypto].inf > > add -Wno-error=unused-but-set-variable for GCC in OpensslLib[Crypto].inf > Although this option is set in some build environments by default. > But this is only for OpenSSL compilation, no matter how the > default options change. > > Cc: Jian J Wang <jian.j.w...@intel.com> > Cc: Ting Ye <ting...@intel.com> > Signed-off-by: Xiaoyu Lu <xiaoyux...@intel.com> > --- > CryptoPkg/Library/OpensslLib/OpensslLib.inf | 16 ++++++++++------ > CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 16 ++++++++++------ > 2 files changed, 20 insertions(+), 12 deletions(-) > > diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf > b/CryptoPkg/Library/OpensslLib/OpensslLib.inf > index 530ac5f..f4d7772 100644 > --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf > +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf > @@ -530,17 +530,20 @@ > # Disables the following Visual Studio compiler warnings brought by > openssl source, > # so we do not break the build with /WX option: > # C4090: 'function' : different 'const' qualifiers > + # C4132: 'object' : const object should be initialized (tls13_enc.c) > # C4244: conversion from type1 to type2, possible loss of data > # C4245: conversion from type1 to type2, signed/unsigned mismatch > # C4267: conversion from size_t to type, possible loss of data > # C4306: 'identifier' : conversion from 'type1' to 'type2' of greater > size > + # C4310: cast truncates constant value > # C4389: 'operator' : signed/unsigned mismatch (xxxx) > + # C4700: uninitialized local variable 'name' used. (conf_sap.c(71)) > # C4702: unreachable code > # C4706: assignment within conditional expression > # C4819: The file contains a character that cannot be represented in the > current code page > # > - MSFT:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) > /wd4090 /wd4244 /wd4245 /wd4267 /wd4389 /wd4702 /wd4706 /wd4819 > - MSFT:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) > /wd4090 /wd4244 /wd4245 /wd4267 /wd4306 /wd4389 /wd4702 /wd4706 /wd4819 > + MSFT:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) > /wd4090 /wd4132 /wd4244 /wd4245 /wd4267 /wd4310 /wd4389 /wd4700 /wd4702 > /wd4706 /wd4819 > + MSFT:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) > /wd4090 /wd4132 /wd4244 /wd4245 /wd4267 /wd4306 /wd4310 /wd4700 /wd4389 > /wd4702 /wd4706 /wd4819 > > INTEL:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC > $(OPENSSL_FLAGS) /w > INTEL:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC > $(OPENSSL_FLAGS) /w > @@ -550,11 +553,12 @@ > # -Werror=maybe-uninitialized: there exist some other paths for which > the variable is not initialized. > # -Werror=format: Check calls to printf and scanf, etc., to make sure > that the arguments supplied have > # types appropriate to the format string specified. > + # -Werror=unused-but-set-variable: Warn whenever a local variable is > assigned to, but otherwise unused (aside from its declaration). > # > - GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) > -Wno-error=maybe-uninitialized > - GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) > -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format > -DNO_MSABI_VA_FUNCS > - GCC:*_*_ARM_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized > - GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized > -Wno-format > + GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) > -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable > + GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) > -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format > -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS > + GCC:*_*_ARM_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized > -Wno-error=unused-but-set-variable > + GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized > -Wno-format -Wno-error=unused-but-set-variable > > # suppress the following warnings in openssl so we don't break the build > with warnings-as-errors: > # 1295: Deprecated declaration <entity> - give arg types > diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > index 2310100..fd12d11 100644 > --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > @@ -491,17 +491,20 @@ > # Disables the following Visual Studio compiler warnings brought by > openssl source, > # so we do not break the build with /WX option: > # C4090: 'function' : different 'const' qualifiers > + # C4132: 'object' : const object should be initialized (tls13_enc.c) > # C4244: conversion from type1 to type2, possible loss of data > # C4245: conversion from type1 to type2, signed/unsigned mismatch > # C4267: conversion from size_t to type, possible loss of data > # C4306: 'identifier' : conversion from 'type1' to 'type2' of greater > size > + # C4310: cast truncates constant value > # C4389: 'operator' : signed/unsigned mismatch (xxxx) > + # C4700: uninitialized local variable 'name' used. (conf_sap.c(71)) > # C4702: unreachable code > # C4706: assignment within conditional expression > # C4819: The file contains a character that cannot be represented in the > current code page > # > - MSFT:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) > /wd4090 /wd4244 /wd4245 /wd4267 /wd4389 /wd4702 /wd4706 /wd4819 > - MSFT:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) > /wd4090 /wd4244 /wd4245 /wd4267 /wd4306 /wd4389 /wd4702 /wd4706 /wd4819 > + MSFT:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) > /wd4090 /wd4132 /wd4244 /wd4245 /wd4267 /wd4310 /wd4389 /wd4700 /wd4702 > /wd4706 /wd4819 > + MSFT:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) > /wd4090 /wd4132 /wd4244 /wd4245 /wd4267 /wd4306 /wd4310 /wd4700 /wd4389 > /wd4702 /wd4706 /wd4819 > > INTEL:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC > $(OPENSSL_FLAGS) /w > INTEL:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC > $(OPENSSL_FLAGS) /w > @@ -511,11 +514,12 @@ > # -Werror=maybe-uninitialized: there exist some other paths for which > the variable is not initialized. > # -Werror=format: Check calls to printf and scanf, etc., to make sure > that the arguments supplied have > # types appropriate to the format string specified. > + # -Werror=unused-but-set-variable: Warn whenever a local variable is > assigned to, but otherwise unused (aside from its declaration). > # > - GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) > -Wno-error=maybe-uninitialized > - GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) > -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format > -DNO_MSABI_VA_FUNCS > - GCC:*_*_ARM_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized > - GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized > -Wno-format > + GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) > -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable > + GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) > -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format > -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS > + GCC:*_*_ARM_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized > -Wno-error=unused-but-set-variable > + GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized > -Wno-format -Wno-error=unused-but-set-variable > > # suppress the following warnings in openssl so we don't break the build > with warnings-as-errors: > # 1295: Deprecated declaration <entity> - give arg types >
I've only checked the GCC changes. Reviewed-by: Laszlo Ersek <ler...@redhat.com> -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40359): https://edk2.groups.io/g/devel/message/40359 Mute This Topic: https://groups.io/mt/31552211/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
