@@ -835,17 +835,12 @@ class LLVM_LIBRARY_VISIBILITY UEFIX86_64TargetInfo
835835public:
836836 UEFIX86_64TargetInfo (const llvm::Triple &Triple, const TargetOptions &Opts)
837837 : UEFITargetInfo<X86_64TargetInfo>(Triple, Opts) {
838- this ->setABIDefaults ();
839- this ->resetDataLayout (" e-m:w-p270:32:32-p271:32:32-p272:64:64-"
840- " i64:64-i128:128-f80:128-n8:16:32:64-S128" );
841- }
842-
843- // The UEFI spec does not mandate specific C++ ABI, integer widths, or
838+ // The UEFI spec does not mandate specific C++ ABI, integer widths, or
844839 // alignment. We are setting these defaults to match the Windows target as it
845840 // is the only way to build EFI applications with Clang/LLVM today. We intend
846841 // to offer flexibility by supporting choices that are not default in Windows
847842 // target in the future.
848- void setABIDefaults () {
843+
849844 // Set C++ ABI.
850845 this ->TheCXXABI .set (TargetCXXABI::Microsoft);
851846 // Set Integer types and alignment.
@@ -858,7 +853,8 @@ class LLVM_LIBRARY_VISIBILITY UEFIX86_64TargetInfo
858853 WIntType = UnsignedShort;
859854 LongWidth = LongAlign = 32 ;
860855 DoubleAlign = LongLongAlign = 64 ;
861- LongDoubleWidth = LongDoubleAlign = 64 ;
856+ this ->resetDataLayout (" e-m:w-p270:32:32-p271:32:32-p272:64:64-"
857+ " i64:64-i128:128-f80:128-n8:16:32:64-S128" );
862858 }
863859
864860 CallingConvCheckResult checkCallingConvention (CallingConv CC) const override {
0 commit comments