diff options
| author | Eli Bendersky <eliben@google.com> | 2012-12-04 18:37:26 +0000 |
|---|---|---|
| committer | Eli Bendersky <eliben@google.com> | 2012-12-04 18:37:26 +0000 |
| commit | f659c0de6c7a4684a2a30c344ce6827ea87032d8 (patch) | |
| tree | bc3df32103d9145ab4f5b7d24e6a76021439e127 | |
| parent | f6088d126e9110180f7db231bb58da9230a09537 (diff) | |
Make NaCl naming consistent. The triple OSType is called NaCl and is represented
textually as NativeClient. Also added a link to the native client project for
readers unfamiliar with it.
A Clang patch will follow shortly.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@169291 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/llvm/ADT/Triple.h | 4 | ||||
| -rw-r--r-- | lib/Support/Triple.cpp | 4 | ||||
| -rw-r--r-- | lib/Target/ARM/ARMSubtarget.h | 2 | ||||
| -rw-r--r-- | lib/Target/X86/X86Subtarget.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/llvm/ADT/Triple.h b/include/llvm/ADT/Triple.h index a9e67cafba..53e6c24392 100644 --- a/include/llvm/ADT/Triple.h +++ b/include/llvm/ADT/Triple.h @@ -100,8 +100,8 @@ public: Haiku, Minix, RTEMS, - NativeClient, - CNK, // BG/P Compute-Node Kernel + NaCl, // Native Client - http://code.google.com/p/nativeclient/ + CNK, // BG/P Compute-Node Kernel Bitrig, AIX }; diff --git a/lib/Support/Triple.cpp b/lib/Support/Triple.cpp index 0b49ae9733..eefb96bfee 100644 --- a/lib/Support/Triple.cpp +++ b/lib/Support/Triple.cpp @@ -125,7 +125,7 @@ const char *Triple::getOSTypeName(OSType Kind) { case Haiku: return "haiku"; case Minix: return "minix"; case RTEMS: return "rtems"; - case NativeClient: return "nacl"; + case NaCl: return "nacl"; case CNK: return "cnk"; case Bitrig: return "bitrig"; case AIX: return "aix"; @@ -272,7 +272,7 @@ static Triple::OSType parseOS(StringRef OSName) { .StartsWith("haiku", Triple::Haiku) .StartsWith("minix", Triple::Minix) .StartsWith("rtems", Triple::RTEMS) - .StartsWith("nacl", Triple::NativeClient) + .StartsWith("nacl", Triple::NaCl) .StartsWith("cnk", Triple::CNK) .StartsWith("bitrig", Triple::Bitrig) .StartsWith("aix", Triple::AIX) diff --git a/lib/Target/ARM/ARMSubtarget.h b/lib/Target/ARM/ARMSubtarget.h index 46898cfd8f..c7e3adcb51 100644 --- a/lib/Target/ARM/ARMSubtarget.h +++ b/lib/Target/ARM/ARMSubtarget.h @@ -244,7 +244,7 @@ protected: bool isTargetIOS() const { return TargetTriple.getOS() == Triple::IOS; } bool isTargetDarwin() const { return TargetTriple.isOSDarwin(); } bool isTargetNaCl() const { - return TargetTriple.getOS() == Triple::NativeClient; + return TargetTriple.getOS() == Triple::NaCl; } bool isTargetELF() const { return !isTargetDarwin(); } diff --git a/lib/Target/X86/X86Subtarget.h b/lib/Target/X86/X86Subtarget.h index 7e9af2614c..387edc5698 100644 --- a/lib/Target/X86/X86Subtarget.h +++ b/lib/Target/X86/X86Subtarget.h @@ -249,7 +249,7 @@ public: } bool isTargetLinux() const { return TargetTriple.getOS() == Triple::Linux; } bool isTargetNaCl() const { - return TargetTriple.getOS() == Triple::NativeClient; + return TargetTriple.getOS() == Triple::NaCl; } bool isTargetNaCl32() const { return isTargetNaCl() && !is64Bit(); } bool isTargetNaCl64() const { return isTargetNaCl() && is64Bit(); } |