BaseTools: Remove ARM32 Support

edk2 is dropping support for the ARM32 architecture. This
commit removes ARM32 code from BaseTools.

Signed-off-by: Oliver Smith-Denny <osde@microsoft.com>

Author: os-d

BaseTools/Bin/GccLto/liblto-arm.a

@@ -152,7 +152,7 @@
     <Command.XCODE>
         "$(CC)" $(DEPS_FLAGS) $(CC_FLAGS) $(CXX_FLAGS) -o ${dst} $(INC) ${src}
 
-[C-Code-File.BASE.AARCH64,C-Code-File.SEC.AARCH64,C-Code-File.PEI_CORE.AARCH64,C-Code-File.PEIM.AARCH64,C-Code-File.BASE.ARM,C-Code-File.SEC.ARM,C-Code-File.PEI_CORE.ARM,C-Code-File.PEIM.ARM]
+[C-Code-File.BASE.AARCH64,C-Code-File.SEC.AARCH64,C-Code-File.PEI_CORE.AARCH64,C-Code-File.PEIM.AARCH64]
     <InputFile>
         ?.c
 
@@ -198,7 +198,7 @@
         Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iiii ${d_path}(+)${s_base}.ii
         "$(ASM)" $(ASM_FLAGS) -o ${dst} $(INC) ${d_path}(+)${s_base}.iiii
 
-[Assembly-Code-File.COMMON.ARM,Assembly-Code-File.COMMON.AARCH64]
+[Assembly-Code-File.COMMON.AARCH64]
     # Remove --convert-hex for ARM as it breaks MSFT assemblers
     <InputFile.MSFT, InputFile.INTEL>
         ?.asm, ?.Asm, ?.ASM

BaseTools/Bin/GccLto/liblto-arm.s

@@ -28,7 +28,7 @@ ACTIVE_PLATFORM       = EmulatorPkg/EmulatorPkg.dsc
 TARGET                = DEBUG
 
 #  TARGET_ARCH           List       Optional    What kind of architecture is the binary being target for.
-#                                               One, or more, of the following, IA32, X64, EBC, ARM, AARCH64,
+#                                               One, or more, of the following, IA32, X64, EBC, AARCH64,
 #                                               RISCV64 or LOONGARCH64.
 #                                               Multiple values can be specified on a single line, using
 #                                               space characters to separate the values.  These are used

BaseTools/Conf/build_rule.template

@@ -27,7 +27,7 @@ def ParseCommandLineOptions(self):
         ParserObj = argparse.ArgumentParser()
         ParserObj.add_argument("-t", "--tool_chain_tag", dest="tct", default="VS2022",
                                help="Set the toolchain used to compile the build tools")
-        ParserObj.add_argument("-a", "--target_arch", dest="arch", default=None, choices=[None, 'IA32', 'X64', 'ARM', 'AARCH64'],
+        ParserObj.add_argument("-a", "--target_arch", dest="arch", default=None, choices=[None, 'IA32', 'X64', 'AARCH64'],
                                help="Specify the architecture of the built base tools. Not specifying this will fall back to the default "
                                "behavior, for Windows builds, IA32 target will be built, for Linux builds, target arch will be the same as host arch.")
         args = ParserObj.parse_args()
@@ -43,15 +43,13 @@ def GetWorkspaceRoot(self):
     def GetActiveScopes(self):
         ''' return tuple containing scopes that should be active for this process '''
 
-        # Adding scope for cross compilers when building for ARM/AARCH64
+        # Adding scope for cross compilers when building for AARCH64
         scopes = ('global',)
         if GetHostInfo().os == "Linux" and self.tool_chain_tag.lower().startswith("gcc"):
             if self.target_arch is None:
                 return scopes
             if "AARCH64" in self.target_arch:
                 scopes += ("gcc_aarch64_linux",)
-            if "ARM" in self.target_arch:
-                scopes += ("gcc_arm_linux",)
         return scopes
 
     def GetLoggingLevel(self, loggerType):
@@ -131,10 +129,6 @@ def Go(self):
                 VcToolChainArch = "x86"
                 TargetInfoArch = "x86"
                 OutputDir = "Win32"
-            elif self.target_arch == "ARM":
-                VcToolChainArch = "x86_arm"
-                TargetInfoArch = "ARM"
-                OutputDir = "Win32"
             elif self.target_arch == "X64":
                 VcToolChainArch = "amd64"
                 TargetInfoArch = "x86"
@@ -172,10 +166,6 @@ def Go(self):
                     host_arch = "AARCH64"
                     host_toolchain_arch = "amd64_arm64"
                     TempOutputDir = os.path.join(shell_env.get_shell_var("EDK_TOOLS_PATH"), "Bin", "Win64")
-                elif HostInfo.arch == "ARM" and HostInfo.bit == "32":
-                    host_arch = "ARM"
-                    host_toolchain_arch = "x86_arm"
-                    TempOutputDir = os.path.join(shell_env.get_shell_var("EDK_TOOLS_PATH"), "Bin", "Win32")
                 else:
                     raise Exception("Unsupported host system. %s %s" % (HostInfo.arch, HostInfo.bit))
 
@@ -275,18 +265,6 @@ def Go(self):
                     shell_environment.GetEnvironment().set_shell_var("GCC_PREFIX", prefix)
                     TargetInfoArch = "ARM"
 
-                elif "ARM" in self.target_arch:
-                    prefix = shell_env.get_shell_var("GCC5_ARM_PREFIX")
-                    if prefix == None:
-                        # now check for install dir.  If set then set the Prefix
-                        install_path = shell_environment.GetEnvironment().get_shell_var("GCC5_ARM_INSTALL")
-
-                        # make GCC5_ARM_PREFIX to align with tools_def.txt
-                        prefix = os.path.join(install_path, "bin", "arm-none-linux-gnueabihf-")
-
-                    shell_environment.GetEnvironment().set_shell_var("GCC_PREFIX", prefix)
-                    TargetInfoArch = "ARM"
-
                 else:
                     TargetInfoArch = "x86"
             else:
@@ -320,8 +298,6 @@ def Go(self):
                 pack_name = f"util-linux-{ver}"
                 if "AARCH64" in self.target_arch:
                     ret = RunCmd("sh", f"./configure --host=aarch64-linux  -disable-all-programs --enable-libuuid CC={prefix}gcc", workingdir=unzip_dir)
-                elif "ARM" in self.target_arch:
-                    ret = RunCmd("sh", f"./configure --host=arm-linux  -disable-all-programs --enable-libuuid CC={prefix}gcc", workingdir=unzip_dir)
                 if ret != 0:
                     raise Exception(f"Failed to configure the util-linux to build with our gcc {ret}")
 

BaseTools/Conf/target.template

@@ -1,5 +1,5 @@
 # @file LinuxGccToolChain.py
-# Plugin to configures paths for GCC/GCC5 ARM/AARCH64/RISCV/LOONGARCH64 Toolchain
+# Plugin to configures paths for GCC/GCC5 AARCH64/RISCV/LOONGARCH64 Toolchain
 ##
 # This plugin sets environment variables used in tools_def.template to specify the GCC compiler
 # for the requested build architecture.
@@ -43,12 +43,6 @@ def do_pre_build(self, thebuilder):
                 self.Logger.critical("Failed in check aarch64")
                 return ret
 
-            # Check arm compiler
-            ret = self._check_arm(toolchain)
-            if ret != 0:
-                self.Logger.critical("Failed in check arm")
-                return ret
-
             # Check RISCV64 compiler
             ret = self._check_riscv64(toolchain)
             if ret != 0:
@@ -63,28 +57,6 @@ def do_pre_build(self, thebuilder):
 
         return 0
 
-    def _check_arm(self, toolchain):
-        # check to see if full path already configured
-        if shell_environment.GetEnvironment().get_shell_var(toolchain + "_ARM_PREFIX") is not None:
-            self.Logger.info(toolchain + "_ARM_PREFIX is already set.")
-
-        else:
-            # now check for install dir.  If set then set the Prefix
-            install_path = shell_environment.GetEnvironment().get_shell_var(toolchain + "_ARM_INSTALL")
-            if install_path is None:
-                return 0
-
-            # make the PREFIX to align with tools_def.txt
-            prefix = os.path.join(install_path, "bin", "arm-none-linux-gnueabihf-")
-            shell_environment.GetEnvironment().set_shell_var(toolchain + "_ARM_PREFIX", prefix)
-
-        # now confirm it exists
-        if not os.path.exists(shell_environment.GetEnvironment().get_shell_var(toolchain + "_ARM_PREFIX") + "gcc"):
-            self.Logger.error("Path for " + toolchain + "_ARM_PREFIX toolchain is invalid")
-            return -2
-
-        return 0
-
     def _check_aarch64(self, toolchain):
         # check to see if full path already configured
         if shell_environment.GetEnvironment().get_shell_var(toolchain + "_AARCH64_PREFIX") is not None:

BaseTools/Conf/tools_def.template

@@ -43,7 +43,6 @@ def do_pre_build(self, thebuilder):
             # HostType for VS2017 should be (defined in tools_def):
             # x86   == 32bit Intel
             # x64   == 64bit Intel
-            # arm   == 32bit Arm
             # arm64 == 64bit Arm
             #
             HostType = shell_environment.GetEnvironment().get_shell_var("VS2017_HOST")
@@ -63,7 +62,7 @@ def do_pre_build(self, thebuilder):
 
             # VS2017_HOST options are not exactly the same as QueryVcVariables. This translates.
             VC_HOST_ARCH_TRANSLATOR = {
-                "x86": "x86", "x64": "AMD64", "arm": "not supported", "arm64": "not supported"}
+                "x86": "x86", "x64": "AMD64", "arm64": "not supported"}
 
             # check to see if full path already configured
             if shell_environment.GetEnvironment().get_shell_var("VS2017_PREFIX") != None:
@@ -116,7 +115,6 @@ def do_pre_build(self, thebuilder):
             # HostType for VS2019 should be (defined in tools_def):
             # x86   == 32bit Intel
             # x64   == 64bit Intel
-            # arm   == 32bit Arm
             # arm64 == 64bit Arm
             #
             HostType = shell_environment.GetEnvironment().get_shell_var("VS2019_HOST")
@@ -136,7 +134,7 @@ def do_pre_build(self, thebuilder):
 
             # VS2019_HOST options are not exactly the same as QueryVcVariables. This translates.
             VC_HOST_ARCH_TRANSLATOR = {
-                "x86": "x86", "x64": "AMD64", "arm": "not supported", "arm64": "not supported"}
+                "x86": "x86", "x64": "AMD64", "arm64": "not supported"}
 
             # check to see if full path already configured
             if shell_environment.GetEnvironment().get_shell_var("VS2019_PREFIX") != None:
@@ -189,7 +187,6 @@ def do_pre_build(self, thebuilder):
             # HostType for VS2022 should be (defined in tools_def):
             # x86   == 32bit Intel
             # x64   == 64bit Intel
-            # arm   == 32bit Arm
             # arm64 == 64bit Arm
             #
             HostType = shell_environment.GetEnvironment().get_shell_var("VS2022_HOST")
@@ -209,7 +206,7 @@ def do_pre_build(self, thebuilder):
 
             # VS2022_HOST options are not exactly the same as QueryVcVariables. This translates.
             VC_HOST_ARCH_TRANSLATOR = {
-                "x86": "x86", "x64": "AMD64", "arm": "not supported", "arm64": "not supported"}
+                "x86": "x86", "x64": "AMD64", "arm64": "not supported"}
 
             # check to see if full path already configured
             if shell_environment.GetEnvironment().get_shell_var("VS2022_PREFIX") is not None:
@@ -265,7 +262,6 @@ def do_pre_build(self, thebuilder):
             # HostType for VS tools should be (defined in tools_def):
             # x86   == 32bit Intel
             # x64   == 64bit Intel
-            # arm   == 32bit Arm
             # arm64 == 64bit Arm
             #
             HostType = shell_environment.GetEnvironment().get_shell_var("CLANG_VS_HOST")
@@ -286,7 +282,7 @@ def do_pre_build(self, thebuilder):
 
             # CLANG_VS_HOST options are not exactly the same as QueryVcVariables. This translates.
             VC_HOST_ARCH_TRANSLATOR = {
-                "x86": "x86", "x64": "AMD64", "arm": "not supported", "arm64": "not supported"}
+                "x86": "x86", "x64": "AMD64", "arm64": "not supported"}
 
             # now get the environment variables for the platform
             shell_env = shell_environment.GetEnvironment()

BaseTools/Edk2ToolsBuild.py

@@ -28,7 +28,7 @@ class NoSourceFile(Exception):
 
 
 class UnsupportedArch(Exception):
-    unsupported = ('aarch64', 'arm', 'ebc', 'ipf')
+    unsupported = ('aarch64', 'ebc', 'ipf')
 
 
 class CommonUtils:

BaseTools/Plugin/LinuxGccToolChain/LinuxGccToolChain.py

@@ -157,7 +157,6 @@ def InitializeConfigFile(self):
             self._configFile.AddPreDefined('MDE_CPU_X64')
             self._configFile.AddPreDefined('MDE_CPU_IPF')
             self._configFile.AddPreDefined('MDE_CPU_EBC')
-            self._configFile.AddPreDefined('MDE_CPU_ARM')
 
         namestr = self._pObj.GetName()
         if self._arch is not None:
@@ -271,7 +270,7 @@ def GenerateIncludesSubPage(self, pObj, configFile):
                     self.ProcessSourceFileForInclude(fullpath, pObj, configFile)
                     topPage.AddDescription('<li> \link %s\endlink </li>\n' % self._ConvertPathToDoxygen(fullpath, pObj))
                 else:
-                    if file.lower() in ['library', 'protocol', 'guid', 'ppi', 'ia32', 'x64', 'ipf', 'ebc', 'arm', 'pi', 'uefi', 'aarch64']:
+                    if file.lower() in ['library', 'protocol', 'guid', 'ppi', 'ia32', 'x64', 'ipf', 'ebc', 'pi', 'uefi', 'aarch64']:
                         continue
                     bNeedAddSubPage = False
                     subpage = doxygen.Page(self._ConvertPathToDoxygen(fullpath, pObj), 'public_include_%s' % file)