CryptoPkg: Remove RVCT support

RVCT is obsolete and no longer used.
Remove support for it.

Signed-off-by: Rebecca Cran <quic_rcran@quicinc.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>

8 files changed, 0 insertions, 20 deletions

diff --git a/CryptoPkg/CryptoPkg.dsc b/CryptoPkg/CryptoPkg.dsc
index 0aa72ed878..06990cb6fc 100644
--- a/CryptoPkg/CryptoPkg.dsc
+++ b/CryptoPkg/CryptoPkg.dsc
@@ -298,5 +298,4 @@
   MSFT:*_*_*_CC_FLAGS = /D ENABLE_MD5_DEPRECATED_INTERFACES

   INTEL:*_*_*_CC_FLAGS = /D ENABLE_MD5_DEPRECATED_INTERFACES

   GCC:*_*_*_CC_FLAGS = -D ENABLE_MD5_DEPRECATED_INTERFACES

-  RVCT:*_*_*_CC_FLAGS = -DENABLE_MD5_DEPRECATED_INTERFACES

 !endif

diff --git a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
index 59e21a5b48..3d7b917103 100644
--- a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
@@ -101,10 +101,6 @@
   #

   MSFT:*_*_*_CC_FLAGS = /wd4090

 

-  # -JCryptoPkg/Include : To disable the use of the system includes provided by RVCT

-  # --diag_remark=1     : Reduce severity of "#1-D: last line of file ends without a newline"

-  RVCT:*_*_ARM_CC_FLAGS = -JCryptoPkg/Include --diag_remark=1

-

   GCC:*_CLANG35_*_CC_FLAGS = -std=c99

   GCC:*_CLANG38_*_CC_FLAGS = -std=c99

   GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types

diff --git a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
index 2ea1fbfcd7..01de27e037 100644
--- a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
@@ -91,10 +91,6 @@
   #

   MSFT:*_*_*_CC_FLAGS = /wd4090 /wd4718

 

-  # -JCryptoPkg/Include : To disable the use of the system includes provided by RVCT

-  # --diag_remark=1     : Reduce severity of "#1-D: last line of file ends without a newline"

-  RVCT:*_*_ARM_CC_FLAGS = -JCryptoPkg/Include --diag_remark=1

-

   GCC:*_CLANG35_*_CC_FLAGS = -std=c99

   GCC:*_CLANG38_*_CC_FLAGS = -std=c99

   GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=incompatible-pointer-types

diff --git a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
index 69656fd28b..d28fb98b66 100644
--- a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
@@ -106,10 +106,6 @@
   #

   MSFT:*_*_*_CC_FLAGS = /wd4090

 

-  # -JCryptoPkg/Include : To disable the use of the system includes provided by RVCT

-  # --diag_remark=1     : Reduce severity of "#1-D: last line of file ends without a newline"

-  RVCT:*_*_ARM_CC_FLAGS = -JCryptoPkg/Include --diag_remark=1

-

   GCC:*_CLANG35_*_CC_FLAGS = -std=c99

   GCC:*_CLANG38_*_CC_FLAGS = -std=c99

   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 17062ce84e..11ff1c6931 100644
--- a/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
@@ -85,10 +85,6 @@
   # C4018: '>': signed/unsigned mismatch

   MSFT:*_*_*_CC_FLAGS = /wd4090 /wd4018

 

-  # -JCryptoPkg/Include : To disable the use of the system includes provided by RVCT

-  # --diag_remark=1     : Reduce severity of "#1-D: last line of file ends without a newline"

-  RVCT:*_*_ARM_CC_FLAGS = -JCryptoPkg/Include --diag_remark=1

-

   GCC:*_CLANG35_*_CC_FLAGS = -std=c99

   GCC:*_CLANG38_*_CC_FLAGS = -std=c99

 

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index c7ceb5b9df..c899b811b1 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -698,7 +698,6 @@
   #    1: ignore "#1-D: last line of file ends without a newline"

   # 3017: <entity> may be used before being set (NOTE: This was fixed in OpenSSL 1.1 HEAD with

   #       commit d9b8b89bec4480de3a10bdaf9425db371c19145b, and can be dropped then.)

-  RVCT:*_*_ARM_CC_FLAGS     = $(OPENSSL_FLAGS) --library_interface=aeabi_clib99 --diag_suppress=1296,1295,550,1293,111,68,177,223,144,513,188,128,546,1,3017 -JCryptoPkg/Include

   XCODE:*_*_IA32_CC_FLAGS   = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w -std=c99 -Wno-error=uninitialized

   XCODE:*_*_X64_CC_FLAGS    = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w -std=c99 -Wno-error=uninitialized

 

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
index 63b4a8f3d8..0ec3724541 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
@@ -647,7 +647,6 @@
   #    1: ignore "#1-D: last line of file ends without a newline"

   # 3017: <entity> may be used before being set (NOTE: This was fixed in OpenSSL 1.1 HEAD with

   #       commit d9b8b89bec4480de3a10bdaf9425db371c19145b, and can be dropped then.)

-  RVCT:*_*_ARM_CC_FLAGS     = $(OPENSSL_FLAGS) --library_interface=aeabi_clib99 --diag_suppress=1296,1295,550,1293,111,68,177,223,144,513,188,128,546,1,3017 -JCryptoPkg/Include

   XCODE:*_*_IA32_CC_FLAGS   = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w -std=c99 -Wno-error=uninitialized

   XCODE:*_*_X64_CC_FLAGS    = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w -std=c99 -Wno-error=uninitialized

 

diff --git a/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc b/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
index c50a9cc4dc..16478f4a57 100644
--- a/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
+++ b/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
@@ -43,4 +43,3 @@
   MSFT:*_*_*_CC_FLAGS  = /D ENABLE_MD5_DEPRECATED_INTERFACES

   INTEL:*_*_*_CC_FLAGS = /D ENABLE_MD5_DEPRECATED_INTERFACES

   GCC:*_*_*_CC_FLAGS   = -D ENABLE_MD5_DEPRECATED_INTERFACES

-  RVCT:*_*_*_CC_FLAGS  = -DENABLE_MD5_DEPRECATED_INTERFACES