Further support changes for aarch64

Author: Prabhuk

clang/lib/Basic/Targets/AArch64.h

@@ -357,7 +357,6 @@ class LLVM_LIBRARY_VISIBILITY UEFIAArch64TargetInfo
 public:
   UEFIAArch64TargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
       : UEFITargetInfo<AArch64leTargetInfo>(Triple, Opts) {
-    llvm::outs() << "In targetinfo constructor\n";
     this->TheCXXABI.set(TargetCXXABI::Microsoft);
     // This is an LLP64 platform.
     // int:4, long:4, long long:8, long double:8.

clang/lib/Basic/Targets/OSTargets.h

@@ -848,7 +848,6 @@ class LLVM_LIBRARY_VISIBILITY UEFITargetInfo : public OSTargetInfo<Target> {
 protected:
   void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple,
                     MacroBuilder &Builder) const override {
-    llvm::outs() << "define macro \n";
     Builder.defineMacro("__UEFI__");
   }
 

clang/lib/CodeGen/CodeGenModule.cpp

@@ -141,7 +141,7 @@ createTargetCodeGenInfo(CodeGenModule &CGM) {
     AArch64ABIKind Kind = AArch64ABIKind::AAPCS;
     if (Target.getABI() == "darwinpcs")
       Kind = AArch64ABIKind::DarwinPCS;
-    else if (Triple.isOSWindows())
+    else if (Triple.isOSWindows() || Triple.isUEFI())
       return createWindowsAArch64TargetCodeGenInfo(CGM, AArch64ABIKind::Win64);
     else if (Target.getABI() == "aapcs-soft")
       Kind = AArch64ABIKind::AAPCSSoft;

clang/lib/Driver/ToolChains/Clang.cpp

@@ -7082,8 +7082,9 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   // -fms-compatibility=0 is default.
   bool IsMSVCCompat = Args.hasFlag(
       options::OPT_fms_compatibility, options::OPT_fno_ms_compatibility,
-      (IsWindowsMSVC && Args.hasFlag(options::OPT_fms_extensions,
-                                     options::OPT_fno_ms_extensions, true)));
+      ((IsWindowsMSVC || IsUEFI) &&
+       Args.hasFlag(options::OPT_fms_extensions, options::OPT_fno_ms_extensions,
+                    true)));
   if (IsMSVCCompat) {
     CmdArgs.push_back("-fms-compatibility");
     if (!types::isCXX(Input.getType()) &&

llvm/lib/Target/AArch64/AArch64MCInstLower.cpp

@@ -50,7 +50,7 @@ MCSymbol *AArch64MCInstLower::GetGlobalValueSymbol(const GlobalValue *GV,
     return Printer.getSymbolPreferLocal(*GV);
 
   assert((TheTriple.isOSWindows() || TheTriple.isUEFI()) &&
-         "Windows is the only supported COFF target");
+         "Windows and UEFI are the only supported COFF targets");
 
   bool IsIndirect =
       (TargetFlags & (AArch64II::MO_DLLIMPORT | AArch64II::MO_COFFSTUB));