Revert "[Driver] Add toolchain for X86_64 UEFI target" (#109340)

Reverts #76838

Appears to be causing failures in MAC builders. First reverting the
patch and will investigate after.

Author: Prabhuk

clang/lib/Basic/Targets.cpp

@@ -613,9 +613,6 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
     case llvm::Triple::Solaris:
       return std::make_unique<SolarisTargetInfo<X86_64TargetInfo>>(Triple,
                                                                    Opts);
-    case llvm::Triple::UEFI:
-      return std::make_unique<UEFIX86_64TargetInfo>(Triple, Opts);
-
     case llvm::Triple::Win32: {
       switch (Triple.getEnvironment()) {
       case llvm::Triple::Cygnus:

clang/lib/Basic/Targets/OSTargets.h

@@ -778,21 +778,6 @@ class LLVM_LIBRARY_VISIBILITY ZOSTargetInfo : public OSTargetInfo<Target> {
   }
 };
 
-// UEFI target
-template <typename Target>
-class LLVM_LIBRARY_VISIBILITY UEFITargetInfo : public OSTargetInfo<Target> {
-protected:
-  void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple,
-                    MacroBuilder &Builder) const override {}
-
-public:
-  UEFITargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
-      : OSTargetInfo<Target>(Triple, Opts) {
-    this->WCharType = TargetInfo::UnsignedShort;
-    this->WIntType = TargetInfo::UnsignedShort;
-  }
-};
-
 void addWindowsDefines(const llvm::Triple &Triple, const LangOptions &Opts,
                        MacroBuilder &Builder);
 

clang/lib/Basic/Targets/X86.h

@@ -814,43 +814,6 @@ class LLVM_LIBRARY_VISIBILITY X86_64TargetInfo : public X86TargetInfo {
   }
 };
 
-// x86-64 UEFI target
-class LLVM_LIBRARY_VISIBILITY UEFIX86_64TargetInfo
-    : public UEFITargetInfo<X86_64TargetInfo> {
-public:
-  UEFIX86_64TargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
-      : UEFITargetInfo<X86_64TargetInfo>(Triple, Opts) {
-    this->TheCXXABI.set(TargetCXXABI::Microsoft);
-    this->MaxTLSAlign = 8192u * this->getCharWidth();
-    this->resetDataLayout("e-m:w-p270:32:32-p271:32:32-p272:64:64-"
-                          "i64:64-i128:128-f80:128-n8:16:32:64-S128");
-  }
-
-  void getTargetDefines(const LangOptions &Opts,
-                        MacroBuilder &Builder) const override {
-    getOSDefines(Opts, X86TargetInfo::getTriple(), Builder);
-  }
-
-  BuiltinVaListKind getBuiltinVaListKind() const override {
-    return TargetInfo::CharPtrBuiltinVaList;
-  }
-
-  CallingConvCheckResult checkCallingConvention(CallingConv CC) const override {
-    switch (CC) {
-    case CC_C:
-    case CC_Win64:
-      return CCCR_OK;
-    default:
-      return CCCR_Warning;
-    }
-  }
-
-  TargetInfo::CallingConvKind
-  getCallingConvKind(bool ClangABICompat4) const override {
-    return CCK_MicrosoftWin64;
-  }
-};
-
 // x86-64 Windows target
 class LLVM_LIBRARY_VISIBILITY WindowsX86_64TargetInfo
     : public WindowsTargetInfo<X86_64TargetInfo> {

clang/lib/Driver/CMakeLists.txt

@@ -78,7 +78,6 @@ add_clang_library(clangDriver
   ToolChains/Solaris.cpp
   ToolChains/SPIRV.cpp
   ToolChains/TCE.cpp
-  ToolChains/UEFI.cpp
   ToolChains/VEToolchain.cpp
   ToolChains/WebAssembly.cpp
   ToolChains/XCore.cpp

clang/lib/Driver/Driver.cpp

@@ -45,7 +45,6 @@
 #include "ToolChains/SPIRV.h"
 #include "ToolChains/Solaris.h"
 #include "ToolChains/TCE.h"
-#include "ToolChains/UEFI.h"
 #include "ToolChains/VEToolchain.h"
 #include "ToolChains/WebAssembly.h"
 #include "ToolChains/XCore.h"
@@ -6417,9 +6416,6 @@ const ToolChain &Driver::getToolChain(const ArgList &Args,
     case llvm::Triple::Mesa3D:
       TC = std::make_unique<toolchains::AMDGPUToolChain>(*this, Target, Args);
       break;
-    case llvm::Triple::UEFI:
-      TC = std::make_unique<toolchains::UEFI>(*this, Target, Args);
-      break;
     case llvm::Triple::Win32:
       switch (Target.getEnvironment()) {
       default:

clang/lib/Driver/ToolChains/UEFI.cpp

@@ -14,7 +14,6 @@
 #include "clang/Basic/DiagnosticIDs.h"
 #include "clang/Basic/DiagnosticOptions.h"
 #include "clang/Basic/LLVM.h"
-#include "clang/Basic/TargetInfo.h"
 #include "clang/Basic/TargetOptions.h"
 #include "clang/Driver/Compilation.h"
 #include "clang/Driver/Driver.h"
@@ -575,26 +574,6 @@ TEST(CompilerInvocation, SplitSwarfSingleCrash) {
   EXPECT_TRUE(CI); // no-crash
 }
 
-TEST(ToolChainTest, UEFICallingConventionTest) {
-  clang::CompilerInstance compiler;
-  compiler.createDiagnostics();
-
-  std::string TrStr = "x86_64-unknown-uefi";
-  llvm::Triple Tr(TrStr);
-  Tr.setOS(llvm::Triple::OSType::UEFI);
-  Tr.setVendor(llvm::Triple::VendorType::UnknownVendor);
-  Tr.setEnvironment(llvm::Triple::EnvironmentType::UnknownEnvironment);
-  Tr.setArch(llvm::Triple::ArchType::x86_64);
-
-  compiler.getTargetOpts().Triple = Tr.getTriple();
-  compiler.setTarget(clang::TargetInfo::CreateTargetInfo(
-      compiler.getDiagnostics(),
-      std::make_shared<clang::TargetOptions>(compiler.getTargetOpts())));
-
-  EXPECT_EQ(compiler.getTarget().getCallingConvKind(true),
-            TargetInfo::CallingConvKind::CCK_MicrosoftWin64);
-}
-
 TEST(GetDriverMode, PrefersLastDriverMode) {
   static constexpr const char *Args[] = {"clang-cl", "--driver-mode=foo",
                                          "--driver-mode=bar", "foo.cpp"};