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

lib/Basic/Targets.cpp

 //===--- Targets.cpp - Implement -arch option and targets -----------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file implements construction of a TargetInfo object from a
@@ skipping 640 matching lines @@
     this->LongDoubleWidth = 64;
     this->LongDoubleAlign = 64;
     this->LongLongWidth = 64;
     this->LongLongAlign = 64;
     this->SizeType = TargetInfo::UnsignedInt;
     this->PtrDiffType = TargetInfo::SignedInt;
     this->IntPtrType = TargetInfo::SignedInt;
     // 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";
+      // @LOCALMOD
+      // Handled in ARM's setABI().
     } 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) {
       this->DescriptionString = "e-m:e-p:32:32-i64:64-f80:128-n8:16:32:64-S128";
     } else if (Triple.getArch() == llvm::Triple::mipsel) {
       // Handled on mips' setDescriptionString.
     } else {
       assert(Triple.getArch() == llvm::Triple::le32);
       this->DescriptionString = "e-p:32:32-i64:64";
     }
@@ skipping 2908 matching lines @@
                               "E-m:e-p:32:32-i1:8:32-i8:8:32-i16:16:32-i64:64-"
                               "v128:64:128-a:0:32-n32-S64" :
                               "e-m:e-p:32:32-i1:8:32-i8:8:32-i16:16:32-i64:64-"
                               "v128:64:128-a:0:32-n32-S64";
       }
     } else {
       if (T.isOSBinFormatMachO())
         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
+      // @LOCALMOD-BEGIN
+      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
+      // @LOCALMOD-END
         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";
     }
 
     // FIXME: Enumerated types are variable width in straight AAPCS.
   }
 
   void setABIAPCS() {
     const llvm::Triple &T = getTriple();
@@ skipping 2836 matching lines @@
   // need to pass the minuses.
   Opts->Features.clear();
   for (llvm::StringMap<bool>::const_iterator it = Features.begin(),
          ie = Features.end(); it != ie; ++it)
     Opts->Features.push_back((it->second ? "+" : "-") + it->first().str());
   if (!Target->handleTargetFeatures(Opts->Features, Diags))
     return nullptr;
 
   return Target.release();
 }