Clang DataLayout string cleanup: don't print the aggregate defaults.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@197429 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index 8d761e3151d36c7ba3cd0aa0acdfddaead16cc1e..c8388f881d2c648ac66e3f25ed584e9c9ae54892 100644 (file)
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -2935,7 +2935,7 @@ public:
     SuitableAlign = 128;
     DescriptionString = "e-p:32:32:32"
                         "-f64:32:64-"
-                        "a:0:64-f80:32:32-n8:16:32-S128";
+                        "f80:32:32-n8:16:32-S128";
     SizeType = UnsignedInt;
     PtrDiffType = SignedInt;
     IntPtrType = SignedInt;
@@ -3031,7 +3031,7 @@ public:
     IntPtrType = SignedLong;
     DescriptionString = "e-p:32:32:32"
                         "-f64:32:64-"
-                        "a:0:64-f80:128:128-n8:16:32-S128";
+                        "f80:128:128-n8:16:32-S128";
     HasAlignMac68kSupport = true;
   }
 
@@ -3049,7 +3049,7 @@ public:
     DoubleAlign = LongLongAlign = 64;
     DescriptionString = "e-p:32:32:32-"
                         "i64:64:64-f80:128:128-"
-                        "a:0:64-f80:32:32-n8:16:32-S32";
+                        "f80:32:32-n8:16:32-S32";
   }
   virtual void getTargetDefines(const LangOptions &Opts,
                                 MacroBuilder &Builder) const {
@@ -3118,7 +3118,7 @@ public:
     DoubleAlign = LongLongAlign = 64;
     DescriptionString = "e-p:32:32:32-"
                         "i64:64:64-"
-                        "a:0:64-f80:32:32-n8:16:32-S32";
+                        "f80:32:32-n8:16:32-S32";
   }
   virtual void getTargetDefines(const LangOptions &Opts,
                                 MacroBuilder &Builder) const {
@@ -3226,7 +3226,7 @@ public:
 
     DescriptionString = "e-p:64:64:64-"
                         "i64:64:64-"
-                        "a:0:64-s:64:64-f80:128:128-n8:16:32:64-S128";
+                        "s:64:64-f80:128:128-n8:16:32:64-S128";
 
     // Use fpret only for long double.
     RealTypeUsesObjCFPRet = (1 << TargetInfo::LongDouble);
@@ -3719,7 +3719,7 @@ public:
     } else {
       DescriptionString = ("e-p:32:32:32-"
                            "i64:64:64-"
-                           "v128:64:128-a:0:64-n32-S64");
+                           "v128:64:128-n32-S64");
     }
 
     // ARM targets default to using the ARM C++ ABI.

diff --git a/test/CodeGen/target-data.c b/test/CodeGen/target-data.c
index 90a738c174e2e3f63f9474498427e8fbefe1a2cd..1e2a2c7f9d5acb71dff59a0e4af48737f5f8e0e0 100644 (file)
--- a/test/CodeGen/target-data.c
+++ b/test/CodeGen/target-data.c
@@ -1,22 +1,22 @@
 // RUN: %clang_cc1 -triple i686-unknown-unknown -emit-llvm -o - %s | \
 // RUN:     FileCheck --check-prefix=I686-UNKNOWN %s
-// I686-UNKNOWN: target datalayout = "e-p:32:32:32-f64:32:64-a:0:64-f80:32:32-n8:16:32-S128"
+// I686-UNKNOWN: target datalayout = "e-p:32:32:32-f64:32:64-f80:32:32-n8:16:32-S128"
 
 // RUN: %clang_cc1 -triple i686-apple-darwin9 -emit-llvm -o - %s | \
 // RUN:     FileCheck --check-prefix=I686-DARWIN %s
-// I686-DARWIN: target datalayout = "e-p:32:32:32-f64:32:64-a:0:64-f80:128:128-n8:16:32-S128"
+// I686-DARWIN: target datalayout = "e-p:32:32:32-f64:32:64-f80:128:128-n8:16:32-S128"
 
 // RUN: %clang_cc1 -triple i686-unknown-win32 -emit-llvm -o - %s | \
 // RUN:     FileCheck --check-prefix=I686-WIN32 %s
-// I686-WIN32: target datalayout = "e-p:32:32:32-i64:64:64-f80:128:128-a:0:64-f80:32:32-n8:16:32-S32"
+// I686-WIN32: target datalayout = "e-p:32:32:32-i64:64:64-f80:128:128-f80:32:32-n8:16:32-S32"
 
 // RUN: %clang_cc1 -triple i686-unknown-cygwin -emit-llvm -o - %s | \
 // RUN:     FileCheck --check-prefix=I686-CYGWIN %s
-// I686-CYGWIN: target datalayout = "e-p:32:32:32-i64:64:64-a:0:64-f80:32:32-n8:16:32-S32"
+// I686-CYGWIN: target datalayout = "e-p:32:32:32-i64:64:64-f80:32:32-n8:16:32-S32"
 
 // RUN: %clang_cc1 -triple x86_64-unknown-unknown -emit-llvm -o - %s | \
 // RUN:     FileCheck --check-prefix=X86_64 %s
-// X86_64: target datalayout = "e-p:64:64:64-i64:64:64-a:0:64-s:64:64-f80:128:128-n8:16:32:64-S128"
+// X86_64: target datalayout = "e-p:64:64:64-i64:64:64-s:64:64-f80:128:128-n8:16:32:64-S128"
 
 // RUN: %clang_cc1 -triple xcore-unknown-unknown -emit-llvm -o - %s | \
 // RUN:     FileCheck --check-prefix=XCORE %s
@@ -114,7 +114,7 @@
 
 // RUN: %clang_cc1 -triple arm-unknown -o - -emit-llvm %s | \
 // RUN: FileCheck %s -check-prefix=ARM
-// ARM: target datalayout = "e-p:32:32:32-i64:64:64-v128:64:128-a:0:64-n32-S64"
+// ARM: target datalayout = "e-p:32:32:32-i64:64:64-v128:64:128-n32-S64"
 
 // RUN: %clang_cc1 -triple thumb-unknown -o - -emit-llvm -target-abi apcs-gnu \
 // RUN: %s | FileCheck %s -check-prefix=THUMB-GNU