Move arm-nacl DL description string setting from ctor to setABI.

lib/Basic/Targets.cpp

Index: lib/Basic/Targets.cpp
diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index 9759c8741dcfcca714baed373b18efe5f687f793..beb69b215171b0b475ae8552a2a9eb6d6aa32054 100644
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -658,7 +658,7 @@ public:
     // RegParmMax is inherited from the underlying architecture
     this->LongDoubleFormat = &llvm::APFloat::IEEEdouble;
     if (Triple.getArch() == llvm::Triple::arm) {
-      this->DescriptionString = "e-m:e-p:32:32-i64:64-v128:64:128-n32-S128";
+      // Handled in ARM's setABI().

[Derek Schuff, 2014/11/11 17:59:30]

I guess if this is going to change upstream we should put a localmod marker here
with a comment that setABI is going away?

[jvoung (off chromium), 2014/11/11 18:23:49]

Done

     } else if (Triple.getArch() == llvm::Triple::x86) {
       this->DescriptionString = "e-m:e-p:32:32-i64:64-f80:32-n8:16:32-S128";
     } else if (Triple.getArch() == llvm::Triple::x86_64) {
@@ -3587,7 +3587,10 @@ class ARMTargetInfo : public TargetInfo {
         DescriptionString = BigEndian ?
                               "E-m:o-p:32:32-i64:64-v128:64:128-n32-S64" :
                               "e-m:o-p:32:32-i64:64-v128:64:128-n32-S64";
-      else
+      else if (T.isOSNaCl()) {
+        assert(!BigEndian && "NaCl on ARM does not support big endian");
+        DescriptionString = "e-m:e-p:32:32-i64:64-v128:64:128-n32-S128";
+      } else
         DescriptionString = BigEndian ?
                               "E-m:e-p:32:32-i64:64-v128:64:128-n32-S64" :
                               "e-m:e-p:32:32-i64:64-v128:64:128-n32-S64";