CryptoPkg/MbedTls CLANGDWARF: Replace outdated CLANG3x references

The CLANG35 and CLANG38 toolchain specifiers have been phased out, and
replaced with CLANGDWARF. Update the MbedTls library definitions
accordingly.

While at it, switch to the gnu99 C dialect, which is a better match with
GCC in C99 mode, which includes GCC specific GNU extensions.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>

diff --git a/CryptoPkg/Library/BaseCryptLibMbedTls/PeiCryptLib.inf b/CryptoPkg/Library/BaseCryptLibMbedTls/PeiCryptLib.inf
index 3c057660d884ffcda792b1fa6848422815b54d50..5ff7bf4c7b7018e9b34619d5bc04e00a58c153db 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLibMbedTls/PeiCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLibMbedTls/PeiCryptLib.inf
@@ -99,8 +99,7 @@
   #\r
   MSFT:*_*_*_CC_FLAGS = /wd4090 /wd4718\r
 \r
-  GCC:*_CLANG35_*_CC_FLAGS = -std=c99\r
-  GCC:*_CLANG38_*_CC_FLAGS = -std=c99\r
+  GCC:*_CLANGDWARF_*_CC_FLAGS = -std=gnu99\r
   GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types\r
 \r
   XCODE:*_*_*_CC_FLAGS = -std=c99\r

diff --git a/CryptoPkg/Library/BaseCryptLibMbedTls/RuntimeCryptLib.inf b/CryptoPkg/Library/BaseCryptLibMbedTls/RuntimeCryptLib.inf
index 824aa4fa5d27113e1ab0c3719ce4255f889a94e3..7cf478ad39e4ed314ccf8977b4f006f628573cbb 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLibMbedTls/RuntimeCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLibMbedTls/RuntimeCryptLib.inf
@@ -87,11 +87,7 @@
 # Remove these [BuildOptions] after this library is cleaned up\r
 #\r
 [BuildOptions]\r
-  #\r
-  # suppress the following warnings so we do not break the build with warnings-as-errors:\r
-  #\r
-  GCC:*_CLANG35_*_CC_FLAGS = -std=c99\r
-  GCC:*_CLANG38_*_CC_FLAGS = -std=c99\r
+  GCC:*_CLANGDWARF_*_CC_FLAGS = -std=gnu99\r
   GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types\r
 \r
   XCODE:*_*_*_CC_FLAGS = -std=c99\r

diff --git a/CryptoPkg/Library/BaseCryptLibMbedTls/SecCryptLib.inf b/CryptoPkg/Library/BaseCryptLibMbedTls/SecCryptLib.inf
index e61e07dfa48506c50fc2b8229c1562397f6fbe41..e21deb290c83c8fd804e04ca7369e74f18c26450 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLibMbedTls/SecCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLibMbedTls/SecCryptLib.inf
@@ -73,11 +73,7 @@
 # Remove these [BuildOptions] after this library is cleaned up\r
 #\r
 [BuildOptions]\r
-  #\r
-  # suppress the following warnings so we do not break the build with warnings-as-errors:\r
-  #\r
-  GCC:*_CLANG35_*_CC_FLAGS = -std=c99\r
-  GCC:*_CLANG38_*_CC_FLAGS = -std=c99\r
+  GCC:*_CLANGDWARF_*_CC_FLAGS = -std=gnu99\r
   GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types\r
 \r
   XCODE:*_*_*_CC_FLAGS = -std=c99\r

diff --git a/CryptoPkg/Library/BaseCryptLibMbedTls/SmmCryptLib.inf b/CryptoPkg/Library/BaseCryptLibMbedTls/SmmCryptLib.inf
index 649c2a3c0c4f685a921ef6777af0ff9b603ac703..33e86b453d7219584f9cca48446cec560eee1bb7 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLibMbedTls/SmmCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLibMbedTls/SmmCryptLib.inf
@@ -87,12 +87,7 @@
 # Remove these [BuildOptions] after this library is cleaned up\r
 #\r
 [BuildOptions]\r
-  #\r
-  # suppress the following warnings so we do not break the build with warnings-as-errors:\r
-  #\r
-\r
   XCODE:*_*_*_CC_FLAGS = -mmmx -msse -std=c99\r
 \r
-  GCC:*_CLANG35_*_CC_FLAGS = -std=c99\r
-  GCC:*_CLANG38_*_CC_FLAGS = -std=c99\r
+  GCC:*_CLANGDWARF_*_CC_FLAGS = -std=gnu99\r
   GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types\r

diff --git a/CryptoPkg/Library/MbedTlsLib/MbedTlsLib.inf b/CryptoPkg/Library/MbedTlsLib/MbedTlsLib.inf
index adcf7709022f4004c1b40a0da52c064957ddbf6f..4ccd173eb0db9e52c42459d83e24420fb90964b4 100644 (file)
--- a/CryptoPkg/Library/MbedTlsLib/MbedTlsLib.inf
+++ b/CryptoPkg/Library/MbedTlsLib/MbedTlsLib.inf
@@ -135,8 +135,7 @@
   GCC:*_*_AARCH64_CC_FLAGS =  -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable -Wno-error=format\r
   GCC:*_*_RISCV64_CC_FLAGS =  -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable\r
   GCC:*_*_LOONGARCH64_CC_FLAGS =  -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable\r
-  GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized\r
-  GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized\r
+  GCC:*_CLANGDWARF_*_CC_FLAGS = -std=gnu99 -Wno-error=uninitialized\r
   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\r
 \r
   # suppress the following warnings in mbedtls so we don't break the build with warnings-as-errors:\r

diff --git a/CryptoPkg/Library/MbedTlsLib/MbedTlsLibFull.inf b/CryptoPkg/Library/MbedTlsLib/MbedTlsLibFull.inf
index 7715392a9d1edc3dd931011e7bc849e6419476cc..a26e9ac060ba1a2a19156d424b8fc2e08bc4b0bf 100644 (file)
--- a/CryptoPkg/Library/MbedTlsLib/MbedTlsLibFull.inf
+++ b/CryptoPkg/Library/MbedTlsLib/MbedTlsLibFull.inf
@@ -139,8 +139,7 @@
   GCC:*_*_AARCH64_CC_FLAGS =  -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable -Wno-error=format\r
   GCC:*_*_RISCV64_CC_FLAGS =  -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable\r
   GCC:*_*_LOONGARCH64_CC_FLAGS =  -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable\r
-  GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized\r
-  GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized\r
+  GCC:*_CLANGDWARF_*_CC_FLAGS = -std=gnu99 -Wno-error=uninitialized\r
   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\r
 \r
   # suppress the following warnings in mbedtls so we don't break the build with warnings-as-errors:\r