Reorder these DataLayout entries to match the order LLVM uses.

This completes the cleanup/refactoring of DataLayout on the clang side. Next
is figuring out the differences between the llvm and clang produced strings

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

diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index cce3ae63a4c6f62f3d4f7b1d46874745b0ac20ba..c5c4b1fd63b8a691bbb448970e1cf97380ad75b8 100644 (file)
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -3224,9 +3224,7 @@ public:
     Int64Type = SignedLong;
     RegParmMax = 6;
 
-    DescriptionString = "e-"
-                        "i64:64-"
-                        "s:64-f80:128-n8:16:32:64-S128";
+    DescriptionString = "e-i64:64-f80:128-s:64-n8:16:32:64-S128";
 
     // Use fpret only for long double.
     RealTypeUsesObjCFPRet = (1 << TargetInfo::LongDouble);
@@ -4228,9 +4226,7 @@ class HexagonTargetInfo : public TargetInfo {
 public:
   HexagonTargetInfo(const llvm::Triple &Triple) : TargetInfo(Triple) {
     BigEndian = false;
-    DescriptionString = ("e-p:32:32-"
-                         "i64:64-i1:32"
-                         "-a:0-n32");
+    DescriptionString = ("e-p:32:32-i1:32-i64:64-a:0-n32");
 
     // {} in inline assembly are packet specifiers, not assembly variant
     // specifiers.
@@ -5464,9 +5460,8 @@ public:
     WCharType = UnsignedChar;
     WIntType = UnsignedInt;
     UseZeroLengthBitfieldAlignment = true;
-    DescriptionString = "e-p:32:32-a:0:32-n32"
-                        "-i1:8:32-i8:8:32-i16:16:32-i64:32"
-                        "-f16:16:32-f64:32";
+    DescriptionString = "e-p:32:32-i1:8:32-i8:8:32-i16:16:32-i64:32"
+                        "-f16:16:32-f64:32-a:0:32-n32";
   }
   virtual void getTargetDefines(const LangOptions &Opts,
                                 MacroBuilder &Builder) const {

diff --git a/test/CodeGen/target-data.c b/test/CodeGen/target-data.c
index 91e799ce5e37a0af25f74ad2d75359758b4b5a92..7301078eb04b3c4ab3dfdc36fa451e260f5f50e0 100644 (file)
--- a/test/CodeGen/target-data.c
+++ b/test/CodeGen/target-data.c
@@ -16,11 +16,11 @@
 
 // RUN: %clang_cc1 -triple x86_64-unknown-unknown -emit-llvm -o - %s | \
 // RUN:     FileCheck --check-prefix=X86_64 %s
-// X86_64: target datalayout = "e-i64:64-s:64-f80:128-n8:16:32:64-S128"
+// X86_64: target datalayout = "e-i64:64-f80:128-s:64-n8:16:32:64-S128"
 
 // RUN: %clang_cc1 -triple xcore-unknown-unknown -emit-llvm -o - %s | \
 // RUN:     FileCheck --check-prefix=XCORE %s
-// XCORE: target datalayout = "e-p:32:32-a:0:32-n32-i1:8:32-i8:8:32-i16:16:32-i64:32-f16:16:32-f64:32"
+// XCORE: target datalayout = "e-p:32:32-i1:8:32-i8:8:32-i16:16:32-i64:32-f16:16:32-f64:32-a:0:32-n32"
 
 // RUN: %clang_cc1 -triple sparc-sun-solaris -emit-llvm -o - %s | \
 // RUN:     FileCheck %s --check-prefix=SPARC-V8
@@ -126,7 +126,7 @@
 
 // RUN: %clang_cc1 -triple hexagon-unknown -o - -emit-llvm %s | \
 // RUN: FileCheck %s -check-prefix=HEXAGON
-// HEXAGON: target datalayout = "e-p:32:32-i64:64-i1:32-a:0-n32"
+// HEXAGON: target datalayout = "e-p:32:32-i1:32-i64:64-a:0-n32"
 
 // RUN: %clang_cc1 -triple s390x-unknown -o - -emit-llvm %s | \
 // RUN: FileCheck %s -check-prefix=SYSTEMZ