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

[jvoung]

Summary

ARMTargetInfo sets the description string from setABI and not the
ctor, so don't do that under the NaClTargetInfo<ARM...> ctor.

Otherwise, the NaClTargetInfo<ARM...> ctor will set the description
string, then CreateTargetInfo will call setABI() and replace the
description string with another one. Move the arm-nacl setting to
one place (setABI). Change the existing test to pass
"-target-abi aapcs-linux", like what the driver would normally do
for NaCl to test this.

[echristo]

So I'm in the middle of figuring out what to do about -target-abi (read, how best to shoot it in the head) so I'd prefer not to add additional users of it. Let me see if I can get this out of clang in the next couple of days, otherwise I guess it's OK for now?

-eric

[dschuff]

I guess there's not necessarily a need to land this upstream if it's just going to have to change right away. We can land it on our 3.5 branch and adjust it as needed later.

[jvoung]

Okay I'll wait and see what happens to -target-abi. Thanks!

lib/Basic/Targets.cpp

NaClTargetInfo(const llvm::Triple &Triple) : OSTargetInfo<Target>(Triple) {
     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-a:0:32-n32-S128";
+      // Handled on arm's setABI.
     } else if (Triple.getArch() == llvm::Triple::x86) {
       this->DescriptionString = "e-m:e-p:32:32-i64:64-n8:16:32-S128";
     } else if (Triple.getArch() == llvm::Triple::x86_64) {
       this->DescriptionString = "e-m:e-p:32:32-i64:64-n8:16:32:64-S128";
     } else if (Triple.getArch() == llvm::Triple::mipsel) {
       // Handled on mips' setDescriptionString.
     } else {
       assert(Triple.getArch() == llvm::Triple::le32);
if (T.isOSBinFormatMachO()) {
       DescriptionString = "e"
                           "-m:e"
                           "-p:32:32"
                           "-i64:64"
                           "-v128:64:128"
                           "-a:0:32"
                           "-n32"
                           "-S64";
+    } 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-a:0:32-n32-S128";
     } else {
       DescriptionString =
           BigEndian ? "E-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64"
                     : "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64";
     }
 
     // FIXME: Enumerated types are variable width in straight AAPCS.
   }

test/CodeGen/target-data.c

 // RUN: %clang_cc1 -triple i686-nacl -o - -emit-llvm %s | \
 // RUN: FileCheck %s -check-prefix=I686-NACL
 // I686-NACL: target datalayout = "e-m:e-p:32:32-i64:64-n8:16:32-S128"
 
 // RUN: %clang_cc1 -triple x86_64-nacl -o - -emit-llvm %s | \
 // RUN: FileCheck %s -check-prefix=X86_64-NACL
 // X86_64-NACL: target datalayout = "e-m:e-p:32:32-i64:64-n8:16:32:64-S128"
 
-// RUN: %clang_cc1 -triple arm-nacl-gnueabi -o - -emit-llvm %s | \
-// RUN: FileCheck %s -check-prefix=ARM-NACL
+// RUN: %clang_cc1 -triple arm-nacl-gnueabi -o - -emit-llvm %s \
+// RUN:   -target-abi aapcs-linux | FileCheck %s -check-prefix=ARM-NACL
 // ARM-NACL: target datalayout = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S128"
 
 // RUN: %clang_cc1 -triple mipsel-nacl -o - -emit-llvm %s | \
 // RUN: FileCheck %s -check-prefix=MIPS-NACL
 // MIPS-NACL: target datalayout = "e-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64"
 
 // RUN: %clang_cc1 -triple le32-nacl -o - -emit-llvm %s | \
 // RUN: FileCheck %s -check-prefix=LE32-NACL