MdePkg CryptoPkg EdkCompatibilityPkg: retire NO_BUILTIN_VA_FUNCS define

This is never set anymore, so unsetting it or testing whether it is unset
no longer makes any sense.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Tested-By: Liming Gao <liming.gao@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index a9e793a940d8f578c013fbd472bee1bdbd353c3f..4c9f8aa1dea0e5b3ad5324c4e0886c39f16f2f1f 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -509,7 +509,7 @@
   INTEL:*_*_IPF_CC_FLAGS    = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) /w\r
 \r
   GCC:*_*_IA32_CC_FLAGS     = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w\r
-  GCC:*_*_X64_CC_FLAGS      = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w -UNO_BUILTIN_VA_FUNCS -DNO_MSABI_VA_FUNCS\r
+  GCC:*_*_X64_CC_FLAGS      = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w -DNO_MSABI_VA_FUNCS\r
   GCC:*_*_IPF_CC_FLAGS      = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w\r
   GCC:*_*_ARM_CC_FLAGS      = $(OPENSSL_FLAGS) -w\r
   GCC:*_*_AARCH64_CC_FLAGS  = $(OPENSSL_FLAGS) -w\r

diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiStdArg.h b/EdkCompatibilityPkg/Foundation/Include/EfiStdArg.h
index cd325531055608092b80a1e3bf114d0616b05f21..3596233eac8c0e61a1256d743e0b542758f2638d 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Include/EfiStdArg.h
+++ b/EdkCompatibilityPkg/Foundation/Include/EfiStdArg.h
@@ -92,7 +92,7 @@ Abstract:
 \r
 #define VA_COPY(Dest, Start)          __va_copy (Dest, Start)\r
 \r
-#elif defined(__GNUC__) && !defined(NO_BUILTIN_VA_FUNCS)\r
+#elif defined(__GNUC__)\r
 \r
 #if defined(MDE_CPU_X64) && !defined(NO_MSABI_VA_FUNCS)\r
 //\r

diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h
index e03fa823928492115854d12b85cf116dba38ccfc..93f6686b995ef0653fcdccd899d51f861bd78c34 100644 (file)
--- a/MdePkg/Include/Base.h
+++ b/MdePkg/Include/Base.h
@@ -589,7 +589,7 @@ struct _LIST_ENTRY {
 \r
 #define VA_COPY(Dest, Start)          __va_copy (Dest, Start)\r
 \r
-#elif defined(__GNUC__) && !defined(NO_BUILTIN_VA_FUNCS)\r
+#elif defined(__GNUC__)\r
 \r
 #if defined(MDE_CPU_X64) && !defined(NO_MSABI_VA_FUNCS)\r
 //\r