* [PATCH 1/1] CryptoPkg: Delete CLANG35 and CLANG38 build flags; add CLANGDWARF flags
@ 2023-05-05 13:43 Rebecca Cran
2023-05-05 14:38 ` Yao, Jiewen
2023-05-09 4:46 ` Rebecca Cran
0 siblings, 2 replies; 5+ messages in thread
From: Rebecca Cran @ 2023-05-05 13:43 UTC (permalink / raw)
To: devel, Jiewen Yao, Jian J Wang, Xiaoyu Lu, Guomin Jiang; +Cc: Rebecca Cran
Since CLANG35 and CLANG38 toolchains have been deleted from
tools_def.template, delete the build flags for them from CryptoPkg.
Since CLANGDWARF has replaced CLANG38, add build flags for it to the
CryptoPkg .inf files.
Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
---
CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf | 3 +--
CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf | 3 +--
CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf | 3 +--
CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf | 3 +--
CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf | 3 +--
CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf | 3 +--
CryptoPkg/Library/OpensslLib/OpensslLib.inf | 3 +--
CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf | 3 +--
CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 3 +--
CryptoPkg/Library/OpensslLib/OpensslLibFull.inf | 3 +--
CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf | 3 +--
11 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
index 5be1724f0852..07b984869629 100644
--- a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
@@ -110,8 +110,7 @@ [BuildOptions]
#
# suppress the following warnings so we do not break the build with warnings-as-errors:
#
- GCC:*_CLANG35_*_CC_FLAGS = -std=c99
- GCC:*_CLANG38_*_CC_FLAGS = -std=c99
+ GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types
GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types
XCODE:*_*_*_CC_FLAGS = -std=c99
diff --git a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
index 66261138a00b..d10c83b53c09 100644
--- a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
@@ -97,8 +97,7 @@ [BuildOptions]
#
# suppress the following warnings so we do not break the build with warnings-as-errors:
#
- GCC:*_CLANG35_*_CC_FLAGS = -std=c99
- GCC:*_CLANG38_*_CC_FLAGS = -std=c99
+ GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types
GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types
XCODE:*_*_*_CC_FLAGS = -std=c99
diff --git a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
index 07dbc0e7a8bd..56b4f7306d30 100644
--- a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
@@ -106,8 +106,7 @@ [BuildOptions]
#
# suppress the following warnings so we do not break the build with warnings-as-errors:
#
- GCC:*_CLANG35_*_CC_FLAGS = -std=c99
- GCC:*_CLANG38_*_CC_FLAGS = -std=c99
+ GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types
GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types
XCODE:*_*_*_CC_FLAGS = -std=c99
diff --git a/CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf
index 4ad59b7bbc59..e7801b24c9a0 100644
--- a/CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf
@@ -81,8 +81,7 @@ [BuildOptions]
#
# suppress the following warnings so we do not break the build with warnings-as-errors:
#
- GCC:*_CLANG35_*_CC_FLAGS = -std=c99
- GCC:*_CLANG38_*_CC_FLAGS = -std=c99
+ GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types
GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types
XCODE:*_*_*_CC_FLAGS = -std=c99
diff --git a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
index ab1993087167..109e08377a2d 100644
--- a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
@@ -105,6 +105,5 @@ [BuildOptions]
XCODE:*_*_*_CC_FLAGS = -mmmx -msse -std=c99
- GCC:*_CLANG35_*_CC_FLAGS = -std=c99
- GCC:*_CLANG38_*_CC_FLAGS = -std=c99
+ GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types
GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types
diff --git a/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
index 80261794470f..c3d1d61e59c5 100644
--- a/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
@@ -78,8 +78,7 @@ [BuildOptions]
#
# suppress the following warnings so we do not break the build with warnings-as-errors:
#
- GCC:*_CLANG35_*_CC_FLAGS = -std=c99
- GCC:*_CLANG38_*_CC_FLAGS = -std=c99
+ GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types
GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types
XCODE:*_*_*_CC_FLAGS = -std=c99
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index 86a00b1c4b2a..0f64c9fa7eca 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -639,8 +639,7 @@ [BuildOptions]
GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable -Wno-error=format
GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
GCC:*_*_LOONGARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
- GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
- GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
+ GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
# Revisit after switching to 3.0 branch
GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf b/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
index 2e4f95909b51..ebada80d9dd3 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
@@ -687,8 +687,7 @@ [BuildOptions]
#
GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_CONFIG) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable
GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_CONFIG) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS
- GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
- GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
+ GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
# Revisit after switching to 3.0 branch
GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
index 637d4769e8ca..311cd1e6051a 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
@@ -589,8 +589,7 @@ [BuildOptions]
GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable -Wno-error=format
GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
GCC:*_*_LOONGARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
- GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
- GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
+ GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
# Revisit after switching to 3.0 branch
GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
index c5f90221fc66..52bb4aeaa5f1 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
@@ -694,8 +694,7 @@ [BuildOptions]
GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable -Wno-error=format
GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
GCC:*_*_LOONGARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
- GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
- GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
+ GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
# Revisit after switching to 3.0 branch
GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf b/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
index 076295244a2a..2ea117e506f2 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
@@ -742,8 +742,7 @@ [BuildOptions]
#
GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_CONFIG) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable
GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_CONFIG) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS
- GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
- GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
+ GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
# Revisit after switching to 3.0 branch
GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable
--
2.39.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] CryptoPkg: Delete CLANG35 and CLANG38 build flags; add CLANGDWARF flags
2023-05-05 13:43 [PATCH 1/1] CryptoPkg: Delete CLANG35 and CLANG38 build flags; add CLANGDWARF flags Rebecca Cran
@ 2023-05-05 14:38 ` Yao, Jiewen
2023-05-09 4:46 ` Rebecca Cran
1 sibling, 0 replies; 5+ messages in thread
From: Yao, Jiewen @ 2023-05-05 14:38 UTC (permalink / raw)
To: Rebecca Cran, devel@edk2.groups.io, Wang, Jian J, Lu, Xiaoyu1,
Jiang, Guomin
Acked-by: Jiewen Yao <Jiewen.yao@intel.com>
> -----Original Message-----
> From: Rebecca Cran <rebecca@bsdio.com>
> Sent: Friday, May 5, 2023 9:43 PM
> To: devel@edk2.groups.io; Yao, Jiewen <jiewen.yao@intel.com>; Wang,
> Jian J <jian.j.wang@intel.com>; Lu, Xiaoyu1 <xiaoyu1.lu@intel.com>; Jiang,
> Guomin <guomin.jiang@intel.com>
> Cc: Rebecca Cran <rebecca@bsdio.com>
> Subject: [PATCH 1/1] CryptoPkg: Delete CLANG35 and CLANG38 build flags;
> add CLANGDWARF flags
>
> Since CLANG35 and CLANG38 toolchains have been deleted from
> tools_def.template, delete the build flags for them from CryptoPkg.
>
> Since CLANGDWARF has replaced CLANG38, add build flags for it to the
> CryptoPkg .inf files.
>
> Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
> ---
> CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf | 3 +--
> CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf | 3 +--
> CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf | 3 +--
> CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf | 3 +--
> CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf | 3 +--
> CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf | 3 +--
> CryptoPkg/Library/OpensslLib/OpensslLib.inf | 3 +--
> CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf | 3 +--
> CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 3 +--
> CryptoPkg/Library/OpensslLib/OpensslLibFull.inf | 3 +--
> CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf | 3 +--
> 11 files changed, 11 insertions(+), 22 deletions(-)
>
> diff --git a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> index 5be1724f0852..07b984869629 100644
> --- a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> +++ b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> @@ -110,8 +110,7 @@ [BuildOptions]
> #
> # suppress the following warnings so we do not break the build with
> warnings-as-errors:
> #
> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99
> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99
> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-
> pointer-types
> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-
> pointer-types
>
> XCODE:*_*_*_CC_FLAGS = -std=c99
> diff --git a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
> b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
> index 66261138a00b..d10c83b53c09 100644
> --- a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
> +++ b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
> @@ -97,8 +97,7 @@ [BuildOptions]
> #
> # suppress the following warnings so we do not break the build with
> warnings-as-errors:
> #
> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99
> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99
> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-
> pointer-types
> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-
> pointer-types
>
> XCODE:*_*_*_CC_FLAGS = -std=c99
> diff --git a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
> b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
> index 07dbc0e7a8bd..56b4f7306d30 100644
> --- a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
> +++ b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
> @@ -106,8 +106,7 @@ [BuildOptions]
> #
> # suppress the following warnings so we do not break the build with
> warnings-as-errors:
> #
> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99
> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99
> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-
> pointer-types
> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-
> pointer-types
>
> XCODE:*_*_*_CC_FLAGS = -std=c99
> diff --git a/CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf
> b/CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf
> index 4ad59b7bbc59..e7801b24c9a0 100644
> --- a/CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf
> +++ b/CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf
> @@ -81,8 +81,7 @@ [BuildOptions]
> #
> # suppress the following warnings so we do not break the build with
> warnings-as-errors:
> #
> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99
> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99
> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-
> pointer-types
> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-
> pointer-types
>
> XCODE:*_*_*_CC_FLAGS = -std=c99
> diff --git a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
> b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
> index ab1993087167..109e08377a2d 100644
> --- a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
> +++ b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
> @@ -105,6 +105,5 @@ [BuildOptions]
>
> XCODE:*_*_*_CC_FLAGS = -mmmx -msse -std=c99
>
> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99
> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99
> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-
> pointer-types
> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-
> pointer-types
> diff --git a/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
> b/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
> index 80261794470f..c3d1d61e59c5 100644
> --- a/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
> +++ b/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
> @@ -78,8 +78,7 @@ [BuildOptions]
> #
> # suppress the following warnings so we do not break the build with
> warnings-as-errors:
> #
> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99
> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99
> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-
> pointer-types
> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-
> pointer-types
>
> XCODE:*_*_*_CC_FLAGS = -std=c99
> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> index 86a00b1c4b2a..0f64c9fa7eca 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> @@ -639,8 +639,7 @@ [BuildOptions]
> GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-
> uninitialized -Wno-format -Wno-error=unused-but-set-variable -Wno-
> error=format
> GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-
> uninitialized -Wno-format -Wno-error=unused-but-set-variable
> GCC:*_*_LOONGARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-
> error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -
> Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-
> error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> # Revisit after switching to 3.0 branch
> GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable
> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
> b/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
> index 2e4f95909b51..ebada80d9dd3 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
> @@ -687,8 +687,7 @@ [BuildOptions]
> #
> GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS)
> $(OPENSSL_FLAGS_CONFIG) -Wno-error=maybe-uninitialized -Wno-
> error=unused-but-set-variable
> GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS)
> $(OPENSSL_FLAGS_CONFIG) -Wno-error=maybe-uninitialized -Wno-
> error=format -Wno-format -Wno-error=unused-but-set-variable -
> DNO_MSABI_VA_FUNCS
> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -
> Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-
> error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> # Revisit after switching to 3.0 branch
> GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable
> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
> b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
> index 637d4769e8ca..311cd1e6051a 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
> @@ -589,8 +589,7 @@ [BuildOptions]
> GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-
> uninitialized -Wno-format -Wno-error=unused-but-set-variable -Wno-
> error=format
> GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-
> uninitialized -Wno-format -Wno-error=unused-but-set-variable
> GCC:*_*_LOONGARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-
> error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -
> Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-
> error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> # Revisit after switching to 3.0 branch
> GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable
> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
> b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
> index c5f90221fc66..52bb4aeaa5f1 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
> @@ -694,8 +694,7 @@ [BuildOptions]
> GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-
> uninitialized -Wno-format -Wno-error=unused-but-set-variable -Wno-
> error=format
> GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-
> uninitialized -Wno-format -Wno-error=unused-but-set-variable
> GCC:*_*_LOONGARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-
> error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -
> Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-
> error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> # Revisit after switching to 3.0 branch
> GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable
> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
> b/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
> index 076295244a2a..2ea117e506f2 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
> @@ -742,8 +742,7 @@ [BuildOptions]
> #
> GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS)
> $(OPENSSL_FLAGS_CONFIG) -Wno-error=maybe-uninitialized -Wno-
> error=unused-but-set-variable
> GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS)
> $(OPENSSL_FLAGS_CONFIG) -Wno-error=maybe-uninitialized -Wno-
> error=format -Wno-format -Wno-error=unused-but-set-variable -
> DNO_MSABI_VA_FUNCS
> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -
> Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-
> error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> # Revisit after switching to 3.0 branch
> GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable
> --
> 2.39.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] CryptoPkg: Delete CLANG35 and CLANG38 build flags; add CLANGDWARF flags
2023-05-05 13:43 [PATCH 1/1] CryptoPkg: Delete CLANG35 and CLANG38 build flags; add CLANGDWARF flags Rebecca Cran
2023-05-05 14:38 ` Yao, Jiewen
@ 2023-05-09 4:46 ` Rebecca Cran
2023-05-10 0:48 ` Yao, Jiewen
1 sibling, 1 reply; 5+ messages in thread
From: Rebecca Cran @ 2023-05-09 4:46 UTC (permalink / raw)
To: devel, Jiewen Yao, Jian J Wang, Xiaoyu Lu, Guomin Jiang,
Liming Gao
Could someone from CryptoPkg add a "Reviewed-by" tag please?
I'd like this to go into the upcoming edk2-stable202305 release.
--
Rebecca Cran
On 5/5/23 07:43, Rebecca Cran wrote:
> Since CLANG35 and CLANG38 toolchains have been deleted from
> tools_def.template, delete the build flags for them from CryptoPkg.
>
> Since CLANGDWARF has replaced CLANG38, add build flags for it to the
> CryptoPkg .inf files.
>
> Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
> ---
> CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf | 3 +--
> CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf | 3 +--
> CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf | 3 +--
> CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf | 3 +--
> CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf | 3 +--
> CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf | 3 +--
> CryptoPkg/Library/OpensslLib/OpensslLib.inf | 3 +--
> CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf | 3 +--
> CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 3 +--
> CryptoPkg/Library/OpensslLib/OpensslLibFull.inf | 3 +--
> CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf | 3 +--
> 11 files changed, 11 insertions(+), 22 deletions(-)
>
> diff --git a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> index 5be1724f0852..07b984869629 100644
> --- a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> +++ b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> @@ -110,8 +110,7 @@ [BuildOptions]
> #
> # suppress the following warnings so we do not break the build with warnings-as-errors:
> #
> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99
> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99
> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types
> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types
>
> XCODE:*_*_*_CC_FLAGS = -std=c99
> diff --git a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
> index 66261138a00b..d10c83b53c09 100644
> --- a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
> +++ b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
> @@ -97,8 +97,7 @@ [BuildOptions]
> #
> # suppress the following warnings so we do not break the build with warnings-as-errors:
> #
> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99
> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99
> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types
> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types
>
> XCODE:*_*_*_CC_FLAGS = -std=c99
> diff --git a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
> index 07dbc0e7a8bd..56b4f7306d30 100644
> --- a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
> +++ b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
> @@ -106,8 +106,7 @@ [BuildOptions]
> #
> # suppress the following warnings so we do not break the build with warnings-as-errors:
> #
> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99
> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99
> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types
> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types
>
> XCODE:*_*_*_CC_FLAGS = -std=c99
> diff --git a/CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf
> index 4ad59b7bbc59..e7801b24c9a0 100644
> --- a/CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf
> +++ b/CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf
> @@ -81,8 +81,7 @@ [BuildOptions]
> #
> # suppress the following warnings so we do not break the build with warnings-as-errors:
> #
> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99
> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99
> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types
> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types
>
> XCODE:*_*_*_CC_FLAGS = -std=c99
> diff --git a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
> index ab1993087167..109e08377a2d 100644
> --- a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
> +++ b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
> @@ -105,6 +105,5 @@ [BuildOptions]
>
> XCODE:*_*_*_CC_FLAGS = -mmmx -msse -std=c99
>
> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99
> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99
> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types
> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types
> diff --git a/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
> index 80261794470f..c3d1d61e59c5 100644
> --- a/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
> +++ b/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
> @@ -78,8 +78,7 @@ [BuildOptions]
> #
> # suppress the following warnings so we do not break the build with warnings-as-errors:
> #
> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99
> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99
> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types
> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types
>
> XCODE:*_*_*_CC_FLAGS = -std=c99
> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> index 86a00b1c4b2a..0f64c9fa7eca 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> @@ -639,8 +639,7 @@ [BuildOptions]
> GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable -Wno-error=format
> GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
> GCC:*_*_LOONGARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> # Revisit after switching to 3.0 branch
> GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable
> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf b/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
> index 2e4f95909b51..ebada80d9dd3 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
> @@ -687,8 +687,7 @@ [BuildOptions]
> #
> GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_CONFIG) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable
> GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_CONFIG) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS
> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> # Revisit after switching to 3.0 branch
> GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable
> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
> index 637d4769e8ca..311cd1e6051a 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
> @@ -589,8 +589,7 @@ [BuildOptions]
> GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable -Wno-error=format
> GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
> GCC:*_*_LOONGARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> # Revisit after switching to 3.0 branch
> GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable
> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
> index c5f90221fc66..52bb4aeaa5f1 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
> @@ -694,8 +694,7 @@ [BuildOptions]
> GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable -Wno-error=format
> GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
> GCC:*_*_LOONGARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> # Revisit after switching to 3.0 branch
> GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable
> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf b/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
> index 076295244a2a..2ea117e506f2 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
> @@ -742,8 +742,7 @@ [BuildOptions]
> #
> GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_CONFIG) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable
> GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_CONFIG) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS
> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> # Revisit after switching to 3.0 branch
> GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] CryptoPkg: Delete CLANG35 and CLANG38 build flags; add CLANGDWARF flags
2023-05-09 4:46 ` Rebecca Cran
@ 2023-05-10 0:48 ` Yao, Jiewen
2023-05-10 1:05 ` Rebecca Cran
0 siblings, 1 reply; 5+ messages in thread
From: Yao, Jiewen @ 2023-05-10 0:48 UTC (permalink / raw)
To: Rebecca Cran, devel@edk2.groups.io, Wang, Jian J, Lu, Xiaoyu1,
Jiang, Guomin, Gao, Liming
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
> -----Original Message-----
> From: Rebecca Cran <rebecca@bsdio.com>
> Sent: Tuesday, May 9, 2023 12:46 PM
> To: devel@edk2.groups.io; Yao, Jiewen <jiewen.yao@intel.com>; Wang,
> Jian J <jian.j.wang@intel.com>; Lu, Xiaoyu1 <xiaoyu1.lu@intel.com>; Jiang,
> Guomin <guomin.jiang@intel.com>; Gao, Liming
> <gaoliming@byosoft.com.cn>
> Subject: Re: [PATCH 1/1] CryptoPkg: Delete CLANG35 and CLANG38 build
> flags; add CLANGDWARF flags
>
> Could someone from CryptoPkg add a "Reviewed-by" tag please?
>
> I'd like this to go into the upcoming edk2-stable202305 release.
>
>
> --
> Rebecca Cran
>
>
> On 5/5/23 07:43, Rebecca Cran wrote:
> > Since CLANG35 and CLANG38 toolchains have been deleted from
> > tools_def.template, delete the build flags for them from CryptoPkg.
> >
> > Since CLANGDWARF has replaced CLANG38, add build flags for it to the
> > CryptoPkg .inf files.
> >
> > Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
> > ---
> > CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf | 3 +--
> > CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf | 3 +--
> > CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf | 3 +--
> > CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf | 3 +--
> > CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf | 3 +--
> > CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf | 3 +--
> > CryptoPkg/Library/OpensslLib/OpensslLib.inf | 3 +--
> > CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf | 3 +--
> > CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 3 +--
> > CryptoPkg/Library/OpensslLib/OpensslLibFull.inf | 3 +--
> > CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf | 3 +--
> > 11 files changed, 11 insertions(+), 22 deletions(-)
> >
> > diff --git a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> > index 5be1724f0852..07b984869629 100644
> > --- a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> > +++ b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> > @@ -110,8 +110,7 @@ [BuildOptions]
> > #
> > # suppress the following warnings so we do not break the build with
> warnings-as-errors:
> > #
> > - GCC:*_CLANG35_*_CC_FLAGS = -std=c99
> > - GCC:*_CLANG38_*_CC_FLAGS = -std=c99
> > + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-
> error=incompatible-pointer-types
> > GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-
> pointer-types
> >
> > XCODE:*_*_*_CC_FLAGS = -std=c99
> > diff --git a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
> b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
> > index 66261138a00b..d10c83b53c09 100644
> > --- a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
> > +++ b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
> > @@ -97,8 +97,7 @@ [BuildOptions]
> > #
> > # suppress the following warnings so we do not break the build with
> warnings-as-errors:
> > #
> > - GCC:*_CLANG35_*_CC_FLAGS = -std=c99
> > - GCC:*_CLANG38_*_CC_FLAGS = -std=c99
> > + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-
> error=incompatible-pointer-types
> > GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-
> pointer-types
> >
> > XCODE:*_*_*_CC_FLAGS = -std=c99
> > diff --git a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
> b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
> > index 07dbc0e7a8bd..56b4f7306d30 100644
> > --- a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
> > +++ b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
> > @@ -106,8 +106,7 @@ [BuildOptions]
> > #
> > # suppress the following warnings so we do not break the build with
> warnings-as-errors:
> > #
> > - GCC:*_CLANG35_*_CC_FLAGS = -std=c99
> > - GCC:*_CLANG38_*_CC_FLAGS = -std=c99
> > + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-
> error=incompatible-pointer-types
> > GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-
> pointer-types
> >
> > XCODE:*_*_*_CC_FLAGS = -std=c99
> > diff --git a/CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf
> b/CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf
> > index 4ad59b7bbc59..e7801b24c9a0 100644
> > --- a/CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf
> > +++ b/CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf
> > @@ -81,8 +81,7 @@ [BuildOptions]
> > #
> > # suppress the following warnings so we do not break the build with
> warnings-as-errors:
> > #
> > - GCC:*_CLANG35_*_CC_FLAGS = -std=c99
> > - GCC:*_CLANG38_*_CC_FLAGS = -std=c99
> > + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-
> error=incompatible-pointer-types
> > GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-
> pointer-types
> >
> > XCODE:*_*_*_CC_FLAGS = -std=c99
> > diff --git a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
> b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
> > index ab1993087167..109e08377a2d 100644
> > --- a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
> > +++ b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
> > @@ -105,6 +105,5 @@ [BuildOptions]
> >
> > XCODE:*_*_*_CC_FLAGS = -mmmx -msse -std=c99
> >
> > - GCC:*_CLANG35_*_CC_FLAGS = -std=c99
> > - GCC:*_CLANG38_*_CC_FLAGS = -std=c99
> > + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-
> error=incompatible-pointer-types
> > GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-
> pointer-types
> > diff --git a/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
> b/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
> > index 80261794470f..c3d1d61e59c5 100644
> > --- a/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
> > +++ b/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
> > @@ -78,8 +78,7 @@ [BuildOptions]
> > #
> > # suppress the following warnings so we do not break the build with
> warnings-as-errors:
> > #
> > - GCC:*_CLANG35_*_CC_FLAGS = -std=c99
> > - GCC:*_CLANG38_*_CC_FLAGS = -std=c99
> > + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-
> error=incompatible-pointer-types
> > GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-
> pointer-types
> >
> > XCODE:*_*_*_CC_FLAGS = -std=c99
> > diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> > index 86a00b1c4b2a..0f64c9fa7eca 100644
> > --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> > +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> > @@ -639,8 +639,7 @@ [BuildOptions]
> > GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-
> uninitialized -Wno-format -Wno-error=unused-but-set-variable -Wno-
> error=format
> > GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-
> uninitialized -Wno-format -Wno-error=unused-but-set-variable
> > GCC:*_*_LOONGARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-
> error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
> > - GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> > - GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> > + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> > GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -
> Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> > # Revisit after switching to 3.0 branch
> > GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable
> > diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
> b/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
> > index 2e4f95909b51..ebada80d9dd3 100644
> > --- a/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
> > +++ b/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
> > @@ -687,8 +687,7 @@ [BuildOptions]
> > #
> > GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS)
> $(OPENSSL_FLAGS_CONFIG) -Wno-error=maybe-uninitialized -Wno-
> error=unused-but-set-variable
> > GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS)
> $(OPENSSL_FLAGS_CONFIG) -Wno-error=maybe-uninitialized -Wno-
> error=format -Wno-format -Wno-error=unused-but-set-variable -
> DNO_MSABI_VA_FUNCS
> > - GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> > - GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> > + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> > GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -
> Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> > # Revisit after switching to 3.0 branch
> > GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable
> > diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
> b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
> > index 637d4769e8ca..311cd1e6051a 100644
> > --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
> > +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
> > @@ -589,8 +589,7 @@ [BuildOptions]
> > GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-
> uninitialized -Wno-format -Wno-error=unused-but-set-variable -Wno-
> error=format
> > GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-
> uninitialized -Wno-format -Wno-error=unused-but-set-variable
> > GCC:*_*_LOONGARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-
> error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
> > - GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> > - GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> > + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> > GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -
> Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> > # Revisit after switching to 3.0 branch
> > GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable
> > diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
> b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
> > index c5f90221fc66..52bb4aeaa5f1 100644
> > --- a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
> > +++ b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
> > @@ -694,8 +694,7 @@ [BuildOptions]
> > GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-
> uninitialized -Wno-format -Wno-error=unused-but-set-variable -Wno-
> error=format
> > GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-
> uninitialized -Wno-format -Wno-error=unused-but-set-variable
> > GCC:*_*_LOONGARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-
> error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
> > - GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> > - GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> > + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> > GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -
> Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> > # Revisit after switching to 3.0 branch
> > GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable
> > diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
> b/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
> > index 076295244a2a..2ea117e506f2 100644
> > --- a/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
> > +++ b/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
> > @@ -742,8 +742,7 @@ [BuildOptions]
> > #
> > GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS)
> $(OPENSSL_FLAGS_CONFIG) -Wno-error=maybe-uninitialized -Wno-
> error=unused-but-set-variable
> > GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS)
> $(OPENSSL_FLAGS_CONFIG) -Wno-error=maybe-uninitialized -Wno-
> error=format -Wno-format -Wno-error=unused-but-set-variable -
> DNO_MSABI_VA_FUNCS
> > - GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> > - GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> > + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> > GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -
> Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> > # Revisit after switching to 3.0 branch
> > GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] CryptoPkg: Delete CLANG35 and CLANG38 build flags; add CLANGDWARF flags
2023-05-10 0:48 ` Yao, Jiewen
@ 2023-05-10 1:05 ` Rebecca Cran
0 siblings, 0 replies; 5+ messages in thread
From: Rebecca Cran @ 2023-05-10 1:05 UTC (permalink / raw)
To: Yao, Jiewen, devel@edk2.groups.io, Wang, Jian J, Lu, Xiaoyu1,
Jiang, Guomin, Gao, Liming, Michael D Kinney
Mike/Liming:
The PR for this change is https://github.com/tianocore/edk2/pull/4343 .
Please merge for edk2-stable202305.
--
Rebecca Cran
On 5/9/23 18:48, Yao, Jiewen wrote:
> Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
>
>> -----Original Message-----
>> From: Rebecca Cran <rebecca@bsdio.com>
>> Sent: Tuesday, May 9, 2023 12:46 PM
>> To: devel@edk2.groups.io; Yao, Jiewen <jiewen.yao@intel.com>; Wang,
>> Jian J <jian.j.wang@intel.com>; Lu, Xiaoyu1 <xiaoyu1.lu@intel.com>; Jiang,
>> Guomin <guomin.jiang@intel.com>; Gao, Liming
>> <gaoliming@byosoft.com.cn>
>> Subject: Re: [PATCH 1/1] CryptoPkg: Delete CLANG35 and CLANG38 build
>> flags; add CLANGDWARF flags
>>
>> Could someone from CryptoPkg add a "Reviewed-by" tag please?
>>
>> I'd like this to go into the upcoming edk2-stable202305 release.
>>
>>
>> --
>> Rebecca Cran
>>
>>
>> On 5/5/23 07:43, Rebecca Cran wrote:
>>> Since CLANG35 and CLANG38 toolchains have been deleted from
>>> tools_def.template, delete the build flags for them from CryptoPkg.
>>>
>>> Since CLANGDWARF has replaced CLANG38, add build flags for it to the
>>> CryptoPkg .inf files.
>>>
>>> Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
>>> ---
>>> CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf | 3 +--
>>> CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf | 3 +--
>>> CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf | 3 +--
>>> CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf | 3 +--
>>> CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf | 3 +--
>>> CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf | 3 +--
>>> CryptoPkg/Library/OpensslLib/OpensslLib.inf | 3 +--
>>> CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf | 3 +--
>>> CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 3 +--
>>> CryptoPkg/Library/OpensslLib/OpensslLibFull.inf | 3 +--
>>> CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf | 3 +--
>>> 11 files changed, 11 insertions(+), 22 deletions(-)
>>>
>>> diff --git a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
>> b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
>>> index 5be1724f0852..07b984869629 100644
>>> --- a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
>>> +++ b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
>>> @@ -110,8 +110,7 @@ [BuildOptions]
>>> #
>>> # suppress the following warnings so we do not break the build with
>> warnings-as-errors:
>>> #
>>> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99
>>> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99
>>> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-
>> error=incompatible-pointer-types
>>> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-
>> pointer-types
>>> XCODE:*_*_*_CC_FLAGS = -std=c99
>>> diff --git a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
>> b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
>>> index 66261138a00b..d10c83b53c09 100644
>>> --- a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
>>> +++ b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
>>> @@ -97,8 +97,7 @@ [BuildOptions]
>>> #
>>> # suppress the following warnings so we do not break the build with
>> warnings-as-errors:
>>> #
>>> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99
>>> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99
>>> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-
>> error=incompatible-pointer-types
>>> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-
>> pointer-types
>>> XCODE:*_*_*_CC_FLAGS = -std=c99
>>> diff --git a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
>> b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
>>> index 07dbc0e7a8bd..56b4f7306d30 100644
>>> --- a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
>>> +++ b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
>>> @@ -106,8 +106,7 @@ [BuildOptions]
>>> #
>>> # suppress the following warnings so we do not break the build with
>> warnings-as-errors:
>>> #
>>> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99
>>> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99
>>> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-
>> error=incompatible-pointer-types
>>> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-
>> pointer-types
>>> XCODE:*_*_*_CC_FLAGS = -std=c99
>>> diff --git a/CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf
>> b/CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf
>>> index 4ad59b7bbc59..e7801b24c9a0 100644
>>> --- a/CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf
>>> +++ b/CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf
>>> @@ -81,8 +81,7 @@ [BuildOptions]
>>> #
>>> # suppress the following warnings so we do not break the build with
>> warnings-as-errors:
>>> #
>>> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99
>>> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99
>>> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-
>> error=incompatible-pointer-types
>>> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-
>> pointer-types
>>> XCODE:*_*_*_CC_FLAGS = -std=c99
>>> diff --git a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
>> b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
>>> index ab1993087167..109e08377a2d 100644
>>> --- a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
>>> +++ b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
>>> @@ -105,6 +105,5 @@ [BuildOptions]
>>>
>>> XCODE:*_*_*_CC_FLAGS = -mmmx -msse -std=c99
>>>
>>> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99
>>> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99
>>> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-
>> error=incompatible-pointer-types
>>> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-
>> pointer-types
>>> diff --git a/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
>> b/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
>>> index 80261794470f..c3d1d61e59c5 100644
>>> --- a/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
>>> +++ b/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
>>> @@ -78,8 +78,7 @@ [BuildOptions]
>>> #
>>> # suppress the following warnings so we do not break the build with
>> warnings-as-errors:
>>> #
>>> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99
>>> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99
>>> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-
>> error=incompatible-pointer-types
>>> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-
>> pointer-types
>>> XCODE:*_*_*_CC_FLAGS = -std=c99
>>> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
>> b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
>>> index 86a00b1c4b2a..0f64c9fa7eca 100644
>>> --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
>>> +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
>>> @@ -639,8 +639,7 @@ [BuildOptions]
>>> GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-
>> uninitialized -Wno-format -Wno-error=unused-but-set-variable -Wno-
>> error=format
>>> GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-
>> uninitialized -Wno-format -Wno-error=unused-but-set-variable
>>> GCC:*_*_LOONGARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-
>> error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
>>> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
>>> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
>>> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
>> -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
>> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
>>> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -
>> Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
>> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
>>> # Revisit after switching to 3.0 branch
>>> GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable
>>> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
>> b/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
>>> index 2e4f95909b51..ebada80d9dd3 100644
>>> --- a/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
>>> +++ b/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
>>> @@ -687,8 +687,7 @@ [BuildOptions]
>>> #
>>> GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS)
>> $(OPENSSL_FLAGS_CONFIG) -Wno-error=maybe-uninitialized -Wno-
>> error=unused-but-set-variable
>>> GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS)
>> $(OPENSSL_FLAGS_CONFIG) -Wno-error=maybe-uninitialized -Wno-
>> error=format -Wno-format -Wno-error=unused-but-set-variable -
>> DNO_MSABI_VA_FUNCS
>>> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
>>> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
>>> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
>> -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
>> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
>>> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -
>> Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
>> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
>>> # Revisit after switching to 3.0 branch
>>> GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable
>>> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
>> b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
>>> index 637d4769e8ca..311cd1e6051a 100644
>>> --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
>>> +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
>>> @@ -589,8 +589,7 @@ [BuildOptions]
>>> GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-
>> uninitialized -Wno-format -Wno-error=unused-but-set-variable -Wno-
>> error=format
>>> GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-
>> uninitialized -Wno-format -Wno-error=unused-but-set-variable
>>> GCC:*_*_LOONGARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-
>> error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
>>> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
>>> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
>>> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
>> -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
>> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
>>> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -
>> Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
>> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
>>> # Revisit after switching to 3.0 branch
>>> GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable
>>> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
>> b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
>>> index c5f90221fc66..52bb4aeaa5f1 100644
>>> --- a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
>>> +++ b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
>>> @@ -694,8 +694,7 @@ [BuildOptions]
>>> GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-
>> uninitialized -Wno-format -Wno-error=unused-but-set-variable -Wno-
>> error=format
>>> GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-
>> uninitialized -Wno-format -Wno-error=unused-but-set-variable
>>> GCC:*_*_LOONGARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-
>> error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
>>> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
>>> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
>>> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
>> -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
>> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
>>> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -
>> Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
>> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
>>> # Revisit after switching to 3.0 branch
>>> GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable
>>> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
>> b/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
>>> index 076295244a2a..2ea117e506f2 100644
>>> --- a/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
>>> +++ b/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
>>> @@ -742,8 +742,7 @@ [BuildOptions]
>>> #
>>> GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS)
>> $(OPENSSL_FLAGS_CONFIG) -Wno-error=maybe-uninitialized -Wno-
>> error=unused-but-set-variable
>>> GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS)
>> $(OPENSSL_FLAGS_CONFIG) -Wno-error=maybe-uninitialized -Wno-
>> error=format -Wno-format -Wno-error=unused-but-set-variable -
>> DNO_MSABI_VA_FUNCS
>>> - GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
>>> - GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
>>> + GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
>> -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
>> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
>>> GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -
>> Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
>> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
>>> # Revisit after switching to 3.0 branch
>>> GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-05-10 1:05 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-05 13:43 [PATCH 1/1] CryptoPkg: Delete CLANG35 and CLANG38 build flags; add CLANGDWARF flags Rebecca Cran
2023-05-05 14:38 ` Yao, Jiewen
2023-05-09 4:46 ` Rebecca Cran
2023-05-10 0:48 ` Yao, Jiewen
2023-05-10 1:05 ` Rebecca Cran
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox