Temporary work

Author: tgross35

clang/lib/Basic/TargetInfo.cpp

@@ -960,17 +960,17 @@ bool TargetInfo::validatePointerAuthKey(const llvm::APSInt &value) const {
 }
 
 void TargetInfo::validateCLayouts() const {
-  llvm::Triple::CLayouts TripleLayouts = Triple.getCLayouts();
+  llvm::Triple::CLayouts TripleLayouts = Triple.getCLayouts(getABI());
   if (__builtin_expect(LongDoubleWidth != TripleLayouts.LongDoubleWidth ||
                            LongDoubleAlign != TripleLayouts.LongDoubleAlign ||
                            LongDoubleFormat != TripleLayouts.LongDoubleFormat,
                        0)) {
-    fprintf(stderr, "'long double' width got %d, expected %d\n",
+    fprintf(stderr, "Clang's 'long double' width is %d, LLVM expected %d\n",
             LongDoubleWidth, TripleLayouts.LongDoubleWidth);
-    fprintf(stderr, "'long double' align got %d, expected %d\n",
+    fprintf(stderr, "Clang's long double' alignment is %d, LLVM expected %d\n",
             LongDoubleAlign, TripleLayouts.LongDoubleAlign);
     fprintf(
-        stderr, "'long double' format got %d, expected  %d\n",
+        stderr, "Clang's long double' format is %d, LLVM expected %d\n",
         llvm::APFloatBase::SemanticsToEnum(*LongDoubleFormat),
         llvm::APFloatBase::SemanticsToEnum(*TripleLayouts.LongDoubleFormat));
     llvm_unreachable("Clang & LLVM layout mismatch");

clang/lib/Basic/Targets/ARM.cpp

@@ -25,6 +25,7 @@ using namespace clang::targets;
 void ARMTargetInfo::setABIAAPCS() {
   IsAAPCS = true;
 
+  fprintf(stderr, "setabiaapcs");
   DoubleAlign = LongLongAlign = LongDoubleAlign = SuitableAlign = 64;
   BFloat16Width = BFloat16Align = 16;
   BFloat16Format = &llvm::APFloat::BFloat();
@@ -75,6 +76,7 @@ void ARMTargetInfo::setABIAPCS(bool IsAAPCS16) {
 
   IsAAPCS = false;
 
+  fprintf(stderr, "is aapcs16 %d\n", IsAAPCS);
   if (IsAAPCS16)
     DoubleAlign = LongLongAlign = LongDoubleAlign = SuitableAlign = 64;
   else

llvm/include/llvm/TargetParser/Triple.h

@@ -1279,12 +1279,12 @@ class Triple {
 
   /// Provide default layouts relevant to C. Frontends may override these
   /// values.
-  CLayouts getCLayouts() const;
+  CLayouts getCLayouts(const StringRef &ABIName) const;
 
   /// Return true if `long double` and `__float128` have the same layout.
-  bool isLongDoubleF128() const {
+  bool isLongDoubleF128(const StringRef &ABIName) const {
     // TODO: do we also need to check alignment?
-    return getCLayouts().LongDoubleWidth == 128;
+    return getCLayouts(ABIName).LongDoubleWidth == 128;
   }
 };
 

llvm/lib/TargetParser/Triple.cpp

@@ -2164,7 +2164,7 @@ VersionTuple Triple::getCanonicalVersionForOS(OSType OSKind,
   }
 }
 
-Triple::CLayouts Triple::getCLayouts() const {
+Triple::CLayouts Triple::getCLayouts(const StringRef &ABIName) const {
   Triple::CLayouts Layouts;
 
   // Default to a 32-bit RISC platform