diff options
| -rw-r--r-- | llvm/autoconf/configure.ac | 2 | ||||
| -rwxr-xr-x | llvm/configure | 2 | ||||
| -rw-r--r-- | llvm/include/llvm/ADT/Triple.h | 3 | ||||
| -rw-r--r-- | llvm/lib/Support/Triple.cpp | 1 |
4 files changed, 7 insertions, 1 deletions
diff --git a/llvm/autoconf/configure.ac b/llvm/autoconf/configure.ac index 8a0d73b7de6..f3e94e89dfb 100644 --- a/llvm/autoconf/configure.ac +++ b/llvm/autoconf/configure.ac @@ -299,6 +299,8 @@ AC_CACHE_CHECK([type of operating system we're going to target], llvm_cv_target_os_type="Haiku" ;; *-*-rtems*) llvm_cv_target_os_type="RTEMS" ;; + *-*-nacl*) + llvm_cv_target_os_type="NativeClient" ;; *-unknown-eabi*) llvm_cv_target_os_type="Freestanding" ;; *) diff --git a/llvm/configure b/llvm/configure index ebaec686b35..c8ada54cb9b 100755 --- a/llvm/configure +++ b/llvm/configure @@ -2341,6 +2341,8 @@ else llvm_cv_target_os_type="Haiku" ;; *-*-rtems*) llvm_cv_target_os_type="RTEMS" ;; + *-*-nacl*) + llvm_cv_target_os_type="NativeClient" ;; *-unknown-eabi*) llvm_cv_target_os_type="Freestanding" ;; *) diff --git a/llvm/include/llvm/ADT/Triple.h b/llvm/include/llvm/ADT/Triple.h index a48620ed642..86817e93c0c 100644 --- a/llvm/include/llvm/ADT/Triple.h +++ b/llvm/include/llvm/ADT/Triple.h @@ -94,7 +94,8 @@ public: Win32, Haiku, Minix, - RTEMS + RTEMS, + NativeClient }; enum EnvironmentType { UnknownEnvironment, diff --git a/llvm/lib/Support/Triple.cpp b/llvm/lib/Support/Triple.cpp index 05e1f922199..8bb7f382329 100644 --- a/llvm/lib/Support/Triple.cpp +++ b/llvm/lib/Support/Triple.cpp @@ -110,6 +110,7 @@ const char *Triple::getOSTypeName(OSType Kind) { case Haiku: return "haiku"; case Minix: return "minix"; case RTEMS: return "rtems"; + case NativeClient: return "nacl"; } return "<invalid>"; |
