BaseTools: Remove RVCT supportedk2-stable202205-rc1

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>

5 files changed, 7 insertions, 25 deletions

diff --git a/BaseTools/Source/C/Include/Common/BaseTypes.h b/BaseTools/Source/C/Include/Common/BaseTypes.h
index 150980b4c0..e669da894c 100644
--- a/BaseTools/Source/C/Include/Common/BaseTypes.h
+++ b/BaseTools/Source/C/Include/Common/BaseTypes.h
@@ -57,15 +57,7 @@
 #define NULL  ((VOID *) 0)

 #endif

 

-#ifdef __CC_ARM

-  //

-  // Older RVCT ARM compilers don't fully support #pragma pack and require __packed

-  // as a prefix for the structure.

-  //

-  #define PACKED  __packed

-#else

-  #define PACKED

-#endif

+#define PACKED

 

 //

 //  Support for variable length argument lists using the ANSI standard.

diff --git a/BaseTools/Source/Python/AutoGen/BuildEngine.py b/BaseTools/Source/Python/AutoGen/BuildEngine.py
index 722fead75a..752a1a1f6a 100644
--- a/BaseTools/Source/Python/AutoGen/BuildEngine.py
+++ b/BaseTools/Source/Python/AutoGen/BuildEngine.py
@@ -317,7 +317,7 @@ class BuildRule:
     #   @param  LineIndex           The line number from which the parsing will begin

     #   @param  SupportedFamily     The list of supported tool chain families

     #

-    def __init__(self, File=None, Content=None, LineIndex=0, SupportedFamily=[TAB_COMPILER_MSFT, "INTEL", "GCC", "RVCT"]):

+    def __init__(self, File=None, Content=None, LineIndex=0, SupportedFamily=[TAB_COMPILER_MSFT, "INTEL", "GCC"]):

         self.RuleFile = File

         # Read build rules from file if it's not none

         if File is not None:

diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
index e55efff059..da406e6ff4 100755
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -166,7 +166,7 @@ class BuildFile(object):
         GMAKE_FILETYPE :   "include"

     }

 

-    _INC_FLAG_ = {TAB_COMPILER_MSFT : "/I", "GCC" : "-I", "INTEL" : "-I", "RVCT" : "-I", "NASM" : "-I"}

+    _INC_FLAG_ = {TAB_COMPILER_MSFT : "/I", "GCC" : "-I", "INTEL" : "-I", "NASM" : "-I"}

 

     ## Constructor of BuildFile

     #

diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
index 368a31047e..d05410b329 100755
--- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
@@ -32,7 +32,7 @@ import tempfile
 ## Mapping Makefile type

 gMakeTypeMap = {TAB_COMPILER_MSFT:"nmake", "GCC":"gmake"}

 #

-# Regular expression for finding Include Directories, the difference between MSFT and INTEL/GCC/RVCT

+# Regular expression for finding Include Directories, the difference between MSFT and INTEL/GCC

 # is the former use /I , the Latter used -I to specify include directories

 #

 gBuildOptIncludePatternMsft = re.compile(r"(?:.*?)/I[ \t]*([^ ]*)", re.MULTILINE | re.DOTALL)

@@ -684,12 +684,12 @@ class ModuleAutoGen(AutoGen):
     @cached_property

     def BuildOptionIncPathList(self):

         #

-        # Regular expression for finding Include Directories, the difference between MSFT and INTEL/GCC/RVCT

+        # Regular expression for finding Include Directories, the difference between MSFT and INTEL/GCC

         # is the former use /I , the Latter used -I to specify include directories

         #

         if self.PlatformInfo.ToolChainFamily in (TAB_COMPILER_MSFT):

             BuildOptIncludeRegEx = gBuildOptIncludePatternMsft

-        elif self.PlatformInfo.ToolChainFamily in ('INTEL', 'GCC', 'RVCT'):

+        elif self.PlatformInfo.ToolChainFamily in ('INTEL', 'GCC'):

             BuildOptIncludeRegEx = gBuildOptIncludePatternOther

         else:

             #

@@ -704,16 +704,7 @@ class ModuleAutoGen(AutoGen):
             except KeyError:

                 FlagOption = ''

 

-            if self.ToolChainFamily != 'RVCT':

-                IncPathList = [NormPath(Path, self.Macros) for Path in BuildOptIncludeRegEx.findall(FlagOption)]

-            else:

-                #

-                # RVCT may specify a list of directory seperated by commas

-                #

-                IncPathList = []

-                for Path in BuildOptIncludeRegEx.findall(FlagOption):

-                    PathList = GetSplitList(Path, TAB_COMMA_SPLIT)

-                    IncPathList.extend(NormPath(PathEntry, self.Macros) for PathEntry in PathList)

+            IncPathList = [NormPath(Path, self.Macros) for Path in BuildOptIncludeRegEx.findall(FlagOption)]

 

             #

             # EDK II modules must not reference header files outside of the packages they depend on or

diff --git a/BaseTools/Source/Python/UPT/Library/DataType.py b/BaseTools/Source/Python/UPT/Library/DataType.py
index bd216786a5..2033149aa6 100644
--- a/BaseTools/Source/Python/UPT/Library/DataType.py
+++ b/BaseTools/Source/Python/UPT/Library/DataType.py
@@ -939,7 +939,6 @@ MODEL_META_DATA_CONDITIONAL_STATEMENT_ENDIF = 5014
 TOOL_FAMILY_LIST = ["MSFT",

                     "INTEL",

                     "GCC",

-                    "RVCT"

                     ]

 

 TYPE_HOB_SECTION = 'HOB'