Add backend and predefine changes.

Author: Prabhuk

clang/lib/Basic/Targets/AArch64.cpp

@@ -1781,6 +1781,7 @@ void UEFIAArch64TargetInfo::getTargetDefines(const LangOptions &Opts,
                                              MacroBuilder &Builder) const {
   AArch64leTargetInfo::getTargetDefines(Opts, Builder);
   Builder.defineMacro("_M_ARM64", "1");
+  UEFIAArch64TargetInfo::getOSDefines(Opts, getTriple(), Builder);
 }
 
 TargetInfo::CallingConvCheckResult
@@ -1801,6 +1802,11 @@ UEFIAArch64TargetInfo::getCallingConvKind(bool ClangABICompat4) const {
   return CCK_MicrosoftWin64;
 }
 
+void UEFIAArch64TargetInfo::setDataLayout() {
+  resetDataLayout("e-m:w-p270:32:32-p271:32:32-p272:64:64-p:64:64-i32:32-"
+                  "i64:64-i128:128-n32:64-S128-Fn32");
+}
+
 AppleMachOAArch64TargetInfo::AppleMachOAArch64TargetInfo(
     const llvm::Triple &Triple, const TargetOptions &Opts)
     : AppleMachOTargetInfo<AArch64leTargetInfo>(Triple, Opts) {}
@@ -1861,6 +1867,14 @@ void DarwinAArch64TargetInfo::getOSDefines(const LangOptions &Opts,
   DarwinTargetInfo<AArch64leTargetInfo>::getOSDefines(Opts, Triple, Builder);
 }
 
+// void UEFIAArch64TargetInfo::getOSDefines(const LangOptions &Opts,
+//                                            const llvm::Triple &Triple,
+//                                            MacroBuilder &Builder) const{
+
+//   UEFITargetInfo<AArch64leTargetInfo>::getOSDefines(Opts, Triple, Builder);
+//   // Builder.defineMacro("__UEFI__");
+// }
+
 TargetInfo::BuiltinVaListKind
 DarwinAArch64TargetInfo::getBuiltinVaListKind() const {
   return TargetInfo::CharPtrBuiltinVaList;

clang/lib/Basic/Targets/AArch64.h

@@ -357,6 +357,7 @@ 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.
@@ -370,16 +371,16 @@ class LLVM_LIBRARY_VISIBILITY UEFIAArch64TargetInfo
     SizeType = UnsignedLongLong;
     PtrDiffType = SignedLongLong;
     IntPtrType = SignedLongLong;
-    this->resetDataLayout(
-        "e-m:w-p270:32:32-p271:32:32-p272:64:64-p:64:64-i32:32-"
-        "i64:64-i128:128-n32:64-S128-Fn32");
   }
   BuiltinVaListKind getBuiltinVaListKind() const override;
   void getTargetDefines(const LangOptions &Opts,
                         MacroBuilder &Builder) const override;
   CallingConvCheckResult checkCallingConvention(CallingConv CC) const override;
   TargetInfo::CallingConvKind
   getCallingConvKind(bool ClangABICompat4) const override;
+
+private:
+  void setDataLayout() override;
 };
 
 } // namespace targets

clang/lib/Basic/Targets/OSTargets.h

@@ -848,6 +848,7 @@ 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/Driver/ToolChains/Clang.cpp

@@ -7079,26 +7079,6 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     CmdArgs.push_back("-fkeep-system-includes");
   }
 
-  if (IsUEFI) {
-    llvm::outs() << "IsUEFI true;\n";
-  } else {
-    llvm::outs() << "IsUEFI false;\n";
-  }
-  if (IsWindowsMSVC) {
-    llvm::outs() << "IsWindowsMSVC true;\n";
-  } else {
-    llvm::outs() << "IsWindowsMSVC false;\n";
-  }
-
-  // -fms-extensions=0 is default.
-  if (Args.hasFlag(options::OPT_fms_extensions, options::OPT_fno_ms_extensions,
-                   IsWindowsMSVC || IsUEFI)) {
-    llvm::outs() << "set  OPT_fms_extensions\n";
-    CmdArgs.push_back("-fms-extensions");
-  } else {
-    llvm::outs() << "DONT SET  OPT_fms_extensions\n";
-  }
-
   // -fms-compatibility=0 is default.
   bool IsMSVCCompat = Args.hasFlag(
       options::OPT_fms_compatibility, options::OPT_fno_ms_compatibility,

clang/test/Driver/uefi-defines.c

@@ -1,4 +1,5 @@
 // RUN: %clang -target x86_64-unknown-uefi %s -emit-llvm -S -c -o - | FileCheck %s
+// RUN: %clang -target aarch64-unknown-uefi %s -emit-llvm -S -c -o - | FileCheck %s
 
 // CHECK: __UEFI__defined
 #ifdef __UEFI__

clang/test/Preprocessor/init.c

@@ -2843,6 +2843,8 @@
 
 // RUN: %clang_cc1 -dM -triple=x86_64-uefi -E /dev/null | FileCheck -match-full-lines -check-prefix UEFI %s
 // RUN: %clang_cc1 -dM -triple=x86_64-unknown-uefi -E /dev/null | FileCheck -match-full-lines -check-prefix UEFI %s
+// RUN: %clang_cc1 -dM -triple=aarch64-uefi -E /dev/null | FileCheck -match-full-lines -check-prefix UEFI %s
+// RUN: %clang_cc1 -dM -triple=aarch64-unknown-uefi -E /dev/null | FileCheck -match-full-lines -check-prefix UEFI %s
 
 // UEFI: #define __UEFI__ 1
 

llvm/lib/Target/AArch64/AArch64MCInstLower.cpp

@@ -49,7 +49,7 @@ MCSymbol *AArch64MCInstLower::GetGlobalValueSymbol(const GlobalValue *GV,
   if (!TheTriple.isOSBinFormatCOFF())
     return Printer.getSymbolPreferLocal(*GV);
 
-  assert(TheTriple.isOSWindows() &&
+  assert((TheTriple.isOSWindows() || TheTriple.isUEFI()) &&
          "Windows is the only supported COFF target");
 
   bool IsIndirect =

llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.cpp

@@ -351,7 +351,7 @@ static MCAsmInfo *createAArch64MCAsmInfo(const MCRegisterInfo &MRI,
     MAI = new AArch64MCAsmInfoDarwin(TheTriple.getArch() == Triple::aarch64_32);
   else if (TheTriple.isOSBinFormatELF())
     MAI = new AArch64MCAsmInfoELF(TheTriple);
-  else if (TheTriple.isWindowsMSVCEnvironment())
+  else if (TheTriple.isWindowsMSVCEnvironment() || TheTriple.isUEFI())
     MAI = new AArch64MCAsmInfoMicrosoftCOFF();
   else if (TheTriple.isOSBinFormatCOFF())
     MAI = new AArch64MCAsmInfoGNUCOFF();