diff --git a/clang/docs/tools/clang-formatted-files.txt b/clang/docs/tools/clang-formatted-files.txt
--- a/clang/docs/tools/clang-formatted-files.txt
+++ b/clang/docs/tools/clang-formatted-files.txt
@@ -400,7 +400,6 @@
 clang/lib/Driver/ToolChains/Ananas.h
 clang/lib/Driver/ToolChains/AVR.cpp
 clang/lib/Driver/ToolChains/AVR.h
-clang/lib/Driver/ToolChains/CloudABI.cpp
 clang/lib/Driver/ToolChains/CommonArgs.h
 clang/lib/Driver/ToolChains/CrossWindows.h
 clang/lib/Driver/ToolChains/DragonFly.h
diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp
--- a/clang/lib/Basic/Targets.cpp
+++ b/clang/lib/Basic/Targets.cpp
@@ -142,9 +142,6 @@
       return std::make_unique<DarwinAArch64TargetInfo>(Triple, Opts);
 
     switch (os) {
-    case llvm::Triple::CloudABI:
-      return std::make_unique<CloudABITargetInfo<AArch64leTargetInfo>>(Triple,
-                                                                       Opts);
     case llvm::Triple::FreeBSD:
       return std::make_unique<FreeBSDTargetInfo<AArch64leTargetInfo>>(Triple,
                                                                       Opts);
@@ -202,9 +199,6 @@
       return std::make_unique<DarwinARMTargetInfo>(Triple, Opts);
 
     switch (os) {
-    case llvm::Triple::CloudABI:
-      return std::make_unique<CloudABITargetInfo<ARMleTargetInfo>>(Triple,
-                                                                   Opts);
     case llvm::Triple::Linux:
       switch (Triple.getEnvironment()) {
       default:
@@ -543,9 +537,6 @@
     switch (os) {
     case llvm::Triple::Ananas:
       return std::make_unique<AnanasTargetInfo<X86_32TargetInfo>>(Triple, Opts);
-    case llvm::Triple::CloudABI:
-      return std::make_unique<CloudABITargetInfo<X86_32TargetInfo>>(Triple,
-                                                                    Opts);
     case llvm::Triple::Linux: {
       switch (Triple.getEnvironment()) {
       default:
@@ -607,9 +598,6 @@
     switch (os) {
     case llvm::Triple::Ananas:
       return std::make_unique<AnanasTargetInfo<X86_64TargetInfo>>(Triple, Opts);
-    case llvm::Triple::CloudABI:
-      return std::make_unique<CloudABITargetInfo<X86_64TargetInfo>>(Triple,
-                                                                    Opts);
     case llvm::Triple::Linux: {
       switch (Triple.getEnvironment()) {
       default:
diff --git a/clang/lib/Basic/Targets/OSTargets.h b/clang/lib/Basic/Targets/OSTargets.h
--- a/clang/lib/Basic/Targets/OSTargets.h
+++ b/clang/lib/Basic/Targets/OSTargets.h
@@ -34,22 +34,6 @@
   }
 };
 
-// CloudABI Target
-template <typename Target>
-class LLVM_LIBRARY_VISIBILITY CloudABITargetInfo : public OSTargetInfo<Target> {
-protected:
-  void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple,
-                    MacroBuilder &Builder) const override {
-    Builder.defineMacro("__CloudABI__");
-
-    // CloudABI uses ISO/IEC 10646:2012 for wchar_t, char16_t and char32_t.
-    Builder.defineMacro("__STDC_ISO_10646__", "201206L");
-  }
-
-public:
-  using OSTargetInfo<Target>::OSTargetInfo;
-};
-
 // Ananas target
 template <typename Target>
 class LLVM_LIBRARY_VISIBILITY AnanasTargetInfo : public OSTargetInfo<Target> {
diff --git a/clang/lib/Driver/CMakeLists.txt b/clang/lib/Driver/CMakeLists.txt
--- a/clang/lib/Driver/CMakeLists.txt
+++ b/clang/lib/Driver/CMakeLists.txt
@@ -48,7 +48,6 @@
   ToolChains/AVR.cpp
   ToolChains/BareMetal.cpp
   ToolChains/Clang.cpp
-  ToolChains/CloudABI.cpp
   ToolChains/CommonArgs.cpp
   ToolChains/CrossWindows.cpp
   ToolChains/CSKYToolChain.cpp
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -16,7 +16,6 @@
 #include "ToolChains/BareMetal.h"
 #include "ToolChains/CSKYToolChain.h"
 #include "ToolChains/Clang.h"
-#include "ToolChains/CloudABI.h"
 #include "ToolChains/CrossWindows.h"
 #include "ToolChains/Cuda.h"
 #include "ToolChains/Darwin.h"
@@ -6162,9 +6161,6 @@
     case llvm::Triple::Ananas:
       TC = std::make_unique<toolchains::Ananas>(*this, Target, Args);
       break;
-    case llvm::Triple::CloudABI:
-      TC = std::make_unique<toolchains::CloudABI>(*this, Target, Args);
-      break;
     case llvm::Triple::Darwin:
     case llvm::Triple::MacOSX:
     case llvm::Triple::IOS:
diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp
--- a/clang/lib/Driver/ToolChains/Clang.cpp
+++ b/clang/lib/Driver/ToolChains/Clang.cpp
@@ -466,8 +466,7 @@
     return !areOptimizationsEnabled(Args);
   }
 
-  if (Triple.isOSLinux() || Triple.getOS() == llvm::Triple::CloudABI ||
-      Triple.isOSHurd()) {
+  if (Triple.isOSLinux() || Triple.isOSHurd()) {
     switch (Triple.getArch()) {
     // Don't use a frame pointer on linux if optimizing for certain targets.
     case llvm::Triple::arm:
diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp
--- a/clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -584,9 +584,9 @@
   return LtoJobsArg->getValue();
 }
 
-// CloudABI and PS4/PS5 use -ffunction-sections and -fdata-sections by default.
+// PS4/PS5 uses -ffunction-sections and -fdata-sections by default.
 bool tools::isUseSeparateSections(const llvm::Triple &Triple) {
-  return Triple.getOS() == llvm::Triple::CloudABI || Triple.isPS();
+  return Triple.isPS();
 }
 
 void tools::addLTOOptions(const ToolChain &ToolChain, const ArgList &Args,
diff --git a/clang/lib/Lex/InitHeaderSearch.cpp b/clang/lib/Lex/InitHeaderSearch.cpp
--- a/clang/lib/Lex/InitHeaderSearch.cpp
+++ b/clang/lib/Lex/InitHeaderSearch.cpp
@@ -231,7 +231,6 @@
 
   if (HSOpts.UseStandardSystemIncludes) {
     switch (os) {
-    case llvm::Triple::CloudABI:
     case llvm::Triple::ELFIAMCU:
       break;
     case llvm::Triple::Win32:
@@ -271,13 +270,6 @@
   }
 
   switch (os) {
-  case llvm::Triple::CloudABI: {
-    // <sysroot>/<triple>/include
-    SmallString<128> P = StringRef(HSOpts.ResourceDir);
-    llvm::sys::path::append(P, "../../..", triple.str(), "include");
-    AddPath(P, System, false);
-    break;
-  }
   case llvm::Triple::RTEMS:
     break;
   case llvm::Triple::Win32:
@@ -295,7 +287,6 @@
   }
 
   switch (os) {
-  case llvm::Triple::CloudABI:
   case llvm::Triple::RTEMS:
   case llvm::Triple::ELFIAMCU:
     break;
diff --git a/clang/lib/StaticAnalyzer/Checkers/CheckSecuritySyntaxOnly.cpp b/clang/lib/StaticAnalyzer/Checkers/CheckSecuritySyntaxOnly.cpp
--- a/clang/lib/StaticAnalyzer/Checkers/CheckSecuritySyntaxOnly.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/CheckSecuritySyntaxOnly.cpp
@@ -27,7 +27,6 @@
 static bool isArc4RandomAvailable(const ASTContext &Ctx) {
   const llvm::Triple &T = Ctx.getTargetInfo().getTriple();
   return T.getVendor() == llvm::Triple::Apple ||
-         T.getOS() == llvm::Triple::CloudABI ||
          T.isOSFreeBSD() ||
          T.isOSNetBSD() ||
          T.isOSOpenBSD() ||
diff --git a/clang/test/Analysis/security-syntax-checks.m b/clang/test/Analysis/security-syntax-checks.m
--- a/clang/test/Analysis/security-syntax-checks.m
+++ b/clang/test/Analysis/security-syntax-checks.m
@@ -17,25 +17,6 @@
 // RUN:   -analyzer-checker=security.insecureAPI \
 // RUN:   -analyzer-checker=security.FloatLoopCounter
 
-// RUN: %clang_analyze_cc1 -triple x86_64-unknown-cloudabi %s -verify -Wno-fortify-source \
-// RUN:   -analyzer-checker=security.insecureAPI \
-// RUN:   -analyzer-checker=security.FloatLoopCounter
-
-// RUN: %clang_analyze_cc1 -triple x86_64-unknown-cloudabi %s -verify -Wno-fortify-source \
-// RUN:   -DUSE_BUILTINS \
-// RUN:   -analyzer-checker=security.insecureAPI \
-// RUN:   -analyzer-checker=security.FloatLoopCounter
-
-// RUN: %clang_analyze_cc1 -triple x86_64-unknown-cloudabi %s -verify -Wno-fortify-source \
-// RUN:   -DVARIANT \
-// RUN:   -analyzer-checker=security.insecureAPI \
-// RUN:   -analyzer-checker=security.FloatLoopCounter
-
-// RUN: %clang_analyze_cc1 -triple x86_64-unknown-cloudabi %s -verify -Wno-fortify-source \
-// RUN:   -DUSE_BUILTINS -DVARIANT \
-// RUN:   -analyzer-checker=security.insecureAPI \
-// RUN:   -analyzer-checker=security.FloatLoopCounter
-
 #ifdef USE_BUILTINS
 # define BUILTIN(f) __builtin_ ## f
 #else /* USE_BUILTINS */
diff --git a/clang/test/Driver/frame-pointer-elim.c b/clang/test/Driver/frame-pointer-elim.c
--- a/clang/test/Driver/frame-pointer-elim.c
+++ b/clang/test/Driver/frame-pointer-elim.c
@@ -47,13 +47,6 @@
 // CHECK-NO-MIX-OMIT-FP-PG: '-fomit-frame-pointer' not allowed with '-pg'
 // CHECK-MIX-NO-OMIT-FP-PG-NOT: '-fomit-frame-pointer' not allowed with '-pg'
 
-// CloudABI follows the same rules as Linux.
-// RUN: %clang -### -target x86_64-unknown-cloudabi -S -O1 %s 2>&1 | \
-// RUN:   FileCheck --check-prefix=KEEP-NONE %s
-
-// RUN: %clang -### -target x86_64-unknown-cloudabi -S %s 2>&1 | \
-// RUN:   FileCheck --check-prefix=KEEP-ALL %s
-
 // NetBSD follows the same rules as Linux.
 // RUN: %clang -### -target x86_64-unknown-netbsd -S -O1 %s 2>&1 | \
 // RUN:   FileCheck --check-prefix=KEEP-NONE %s
diff --git a/clang/test/Driver/fsanitize.c b/clang/test/Driver/fsanitize.c
--- a/clang/test/Driver/fsanitize.c
+++ b/clang/test/Driver/fsanitize.c
@@ -716,10 +716,6 @@
 // RUN: %clang --target=powerpc64le-unknown-linux-gnu -fsanitize=memory %s -### 2>&1 | FileCheck %s -check-prefix=CHECK-SANM
 // CHECK-SANM: "-fsanitize=memory"
 
-// RUN: %clang --target=aarch64-unknown-cloudabi -fsanitize=safe-stack %s -### 2>&1 | FileCheck %s -check-prefix=SAFESTACK-CLOUDABI
-// RUN: %clang --target=x86_64-unknown-cloudabi -fsanitize=safe-stack %s -### 2>&1 | FileCheck %s -check-prefix=SAFESTACK-CLOUDABI
-// SAFESTACK-CLOUDABI: "-fsanitize=safe-stack"
-
 // RUN: %clang --target=x86_64--freebsd -fsanitize=kernel-address %s -### 2>&1 | FileCheck %s -check-prefix=KERNEL-ADDRESS-FREEBSD
 // RUN: %clang --target=aarch64--freebsd -fsanitize=kernel-address %s -### 2>&1 | FileCheck %s -check-prefix=KERNEL-ADDRESS-FREEBSD
 // KERNEL-ADDRESS-FREEBSD: "-fsanitize=kernel-address"
diff --git a/clang/test/Frontend/gnu-mcount.c b/clang/test/Frontend/gnu-mcount.c
--- a/clang/test/Frontend/gnu-mcount.c
+++ b/clang/test/Frontend/gnu-mcount.c
@@ -32,10 +32,6 @@
 // RUN: %clang -target armv7-unknown-rtems-gnueabihf -meabi gnu -pg -S -emit-llvm -o - %s | FileCheck %s --check-prefixes=CHECK,MCOUNT
 // RUN: %clang -target aarch64-unknown-rtems-gnueabihf -pg -S -emit-llvm -o - %s | FileCheck %s -check-prefixes=CHECK,MCOUNT
 // RUN: %clang -target aarch64-unknown-rtems-gnueabihf -meabi gnu -pg -S -emit-llvm -o - %s | FileCheck %s -check-prefixes=CHECK,MCOUNT
-// RUN: %clang -target armv7-unknown-cloudabi-gnueabihf -pg -S -emit-llvm -o - %s | FileCheck %s --check-prefixes=CHECK,MCOUNT
-// RUN: %clang -target armv7-unknown-cloudabi-gnueabihf -meabi gnu -pg -S -emit-llvm -o - %s | FileCheck %s --check-prefixes=CHECK,MCOUNT
-// RUN: %clang -target aarch64-unknown-cloudabi-gnueabihf -pg -S -emit-llvm -o - %s | FileCheck %s --check-prefixes=CHECK,MCOUNT
-// RUN: %clang -target aarch64-unknown-cloudabi-gnueabihf -meabi gnu -pg -S -emit-llvm -o - %s | FileCheck %s --check-prefixes=CHECK,MCOUNT
 
 int f() {
   return 0;
diff --git a/clang/test/Preprocessor/init-arm.c b/clang/test/Preprocessor/init-arm.c
--- a/clang/test/Preprocessor/init-arm.c
+++ b/clang/test/Preprocessor/init-arm.c
@@ -1177,11 +1177,6 @@
 // ARMEABIHARDFP:#define __arm 1
 // ARMEABIHARDFP:#define __arm__ 1
 
-// RUN: %clang_cc1 -E -dM -ffreestanding -triple=armv6-unknown-cloudabi-eabihf < /dev/null | FileCheck -match-full-lines -check-prefix ARMV6-CLOUDABI %s
-//
-// ARMV6-CLOUDABI:#define __CloudABI__ 1
-// ARMV6-CLOUDABI:#define __arm__ 1
-
 // RUN: %clang -E -dM -ffreestanding -target arm-netbsd-eabi %s -o - | FileCheck -match-full-lines -check-prefix ARM-NETBSD %s
 
 // ARM-NETBSD-NOT:#define _LP64
diff --git a/clang/test/Preprocessor/init-x86.c b/clang/test/Preprocessor/init-x86.c
--- a/clang/test/Preprocessor/init-x86.c
+++ b/clang/test/Preprocessor/init-x86.c
@@ -1001,312 +1001,6 @@
 // X32:#define __x86_64 1
 // X32:#define __x86_64__ 1
 
-// RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=x86_64-unknown-cloudabi < /dev/null | FileCheck -match-full-lines -check-prefix X86_64-CLOUDABI %s
-//
-// X86_64-CLOUDABI:#define _LP64 1
-// X86_64-CLOUDABI:#define __ATOMIC_ACQUIRE 2
-// X86_64-CLOUDABI:#define __ATOMIC_ACQ_REL 4
-// X86_64-CLOUDABI:#define __ATOMIC_CONSUME 1
-// X86_64-CLOUDABI:#define __ATOMIC_RELAXED 0
-// X86_64-CLOUDABI:#define __ATOMIC_RELEASE 3
-// X86_64-CLOUDABI:#define __ATOMIC_SEQ_CST 5
-// X86_64-CLOUDABI:#define __BIGGEST_ALIGNMENT__ 16
-// X86_64-CLOUDABI:#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__
-// X86_64-CLOUDABI:#define __CHAR16_TYPE__ unsigned short
-// X86_64-CLOUDABI:#define __CHAR32_TYPE__ unsigned int
-// X86_64-CLOUDABI:#define __CHAR_BIT__ 8
-// X86_64-CLOUDABI:#define __CONSTANT_CFSTRINGS__ 1
-// X86_64-CLOUDABI:#define __CloudABI__ 1
-// X86_64-CLOUDABI:#define __DBL_DECIMAL_DIG__ 17
-// X86_64-CLOUDABI:#define __DBL_DENORM_MIN__ 4.9406564584124654e-324
-// X86_64-CLOUDABI:#define __DBL_DIG__ 15
-// X86_64-CLOUDABI:#define __DBL_EPSILON__ 2.2204460492503131e-16
-// X86_64-CLOUDABI:#define __DBL_HAS_DENORM__ 1
-// X86_64-CLOUDABI:#define __DBL_HAS_INFINITY__ 1
-// X86_64-CLOUDABI:#define __DBL_HAS_QUIET_NAN__ 1
-// X86_64-CLOUDABI:#define __DBL_MANT_DIG__ 53
-// X86_64-CLOUDABI:#define __DBL_MAX_10_EXP__ 308
-// X86_64-CLOUDABI:#define __DBL_MAX_EXP__ 1024
-// X86_64-CLOUDABI:#define __DBL_MAX__ 1.7976931348623157e+308
-// X86_64-CLOUDABI:#define __DBL_MIN_10_EXP__ (-307)
-// X86_64-CLOUDABI:#define __DBL_MIN_EXP__ (-1021)
-// X86_64-CLOUDABI:#define __DBL_MIN__ 2.2250738585072014e-308
-// X86_64-CLOUDABI:#define __DECIMAL_DIG__ __LDBL_DECIMAL_DIG__
-// X86_64-CLOUDABI:#define __ELF__ 1
-// X86_64-CLOUDABI:#define __FINITE_MATH_ONLY__ 0
-// X86_64-CLOUDABI:#define __FLT_DECIMAL_DIG__ 9
-// X86_64-CLOUDABI:#define __FLT_DENORM_MIN__ 1.40129846e-45F
-// X86_64-CLOUDABI:#define __FLT_DIG__ 6
-// X86_64-CLOUDABI:#define __FLT_EPSILON__ 1.19209290e-7F
-// X86_64-CLOUDABI:#define __FLT_HAS_DENORM__ 1
-// X86_64-CLOUDABI:#define __FLT_HAS_INFINITY__ 1
-// X86_64-CLOUDABI:#define __FLT_HAS_QUIET_NAN__ 1
-// X86_64-CLOUDABI:#define __FLT_MANT_DIG__ 24
-// X86_64-CLOUDABI:#define __FLT_MAX_10_EXP__ 38
-// X86_64-CLOUDABI:#define __FLT_MAX_EXP__ 128
-// X86_64-CLOUDABI:#define __FLT_MAX__ 3.40282347e+38F
-// X86_64-CLOUDABI:#define __FLT_MIN_10_EXP__ (-37)
-// X86_64-CLOUDABI:#define __FLT_MIN_EXP__ (-125)
-// X86_64-CLOUDABI:#define __FLT_MIN__ 1.17549435e-38F
-// X86_64-CLOUDABI:#define __FLT_RADIX__ 2
-// X86_64-CLOUDABI:#define __GCC_ATOMIC_BOOL_LOCK_FREE 2
-// X86_64-CLOUDABI:#define __GCC_ATOMIC_CHAR16_T_LOCK_FREE 2
-// X86_64-CLOUDABI:#define __GCC_ATOMIC_CHAR32_T_LOCK_FREE 2
-// X86_64-CLOUDABI:#define __GCC_ATOMIC_CHAR_LOCK_FREE 2
-// X86_64-CLOUDABI:#define __GCC_ATOMIC_INT_LOCK_FREE 2
-// X86_64-CLOUDABI:#define __GCC_ATOMIC_LLONG_LOCK_FREE 2
-// X86_64-CLOUDABI:#define __GCC_ATOMIC_LONG_LOCK_FREE 2
-// X86_64-CLOUDABI:#define __GCC_ATOMIC_POINTER_LOCK_FREE 2
-// X86_64-CLOUDABI:#define __GCC_ATOMIC_SHORT_LOCK_FREE 2
-// X86_64-CLOUDABI:#define __GCC_ATOMIC_TEST_AND_SET_TRUEVAL 1
-// X86_64-CLOUDABI:#define __GCC_ATOMIC_WCHAR_T_LOCK_FREE 2
-// X86_64-CLOUDABI:#define __GNUC_MINOR__ 2
-// X86_64-CLOUDABI:#define __GNUC_PATCHLEVEL__ 1
-// X86_64-CLOUDABI:#define __GNUC_STDC_INLINE__ 1
-// X86_64-CLOUDABI:#define __GNUC__ 4
-// X86_64-CLOUDABI:#define __GXX_ABI_VERSION 1002
-// X86_64-CLOUDABI:#define __INT16_C_SUFFIX__
-// X86_64-CLOUDABI:#define __INT16_FMTd__ "hd"
-// X86_64-CLOUDABI:#define __INT16_FMTi__ "hi"
-// X86_64-CLOUDABI:#define __INT16_MAX__ 32767
-// X86_64-CLOUDABI:#define __INT16_TYPE__ short
-// X86_64-CLOUDABI:#define __INT32_C_SUFFIX__
-// X86_64-CLOUDABI:#define __INT32_FMTd__ "d"
-// X86_64-CLOUDABI:#define __INT32_FMTi__ "i"
-// X86_64-CLOUDABI:#define __INT32_MAX__ 2147483647
-// X86_64-CLOUDABI:#define __INT32_TYPE__ int
-// X86_64-CLOUDABI:#define __INT64_C_SUFFIX__ L
-// X86_64-CLOUDABI:#define __INT64_FMTd__ "ld"
-// X86_64-CLOUDABI:#define __INT64_FMTi__ "li"
-// X86_64-CLOUDABI:#define __INT64_MAX__ 9223372036854775807L
-// X86_64-CLOUDABI:#define __INT64_TYPE__ long int
-// X86_64-CLOUDABI:#define __INT8_C_SUFFIX__
-// X86_64-CLOUDABI:#define __INT8_FMTd__ "hhd"
-// X86_64-CLOUDABI:#define __INT8_FMTi__ "hhi"
-// X86_64-CLOUDABI:#define __INT8_MAX__ 127
-// X86_64-CLOUDABI:#define __INT8_TYPE__ signed char
-// X86_64-CLOUDABI:#define __INTMAX_C_SUFFIX__ L
-// X86_64-CLOUDABI:#define __INTMAX_FMTd__ "ld"
-// X86_64-CLOUDABI:#define __INTMAX_FMTi__ "li"
-// X86_64-CLOUDABI:#define __INTMAX_MAX__ 9223372036854775807L
-// X86_64-CLOUDABI:#define __INTMAX_TYPE__ long int
-// X86_64-CLOUDABI:#define __INTMAX_WIDTH__ 64
-// X86_64-CLOUDABI:#define __INTPTR_FMTd__ "ld"
-// X86_64-CLOUDABI:#define __INTPTR_FMTi__ "li"
-// X86_64-CLOUDABI:#define __INTPTR_MAX__ 9223372036854775807L
-// X86_64-CLOUDABI:#define __INTPTR_TYPE__ long int
-// X86_64-CLOUDABI:#define __INTPTR_WIDTH__ 64
-// X86_64-CLOUDABI:#define __INT_FAST16_FMTd__ "hd"
-// X86_64-CLOUDABI:#define __INT_FAST16_FMTi__ "hi"
-// X86_64-CLOUDABI:#define __INT_FAST16_MAX__ 32767
-// X86_64-CLOUDABI:#define __INT_FAST16_TYPE__ short
-// X86_64-CLOUDABI:#define __INT_FAST32_FMTd__ "d"
-// X86_64-CLOUDABI:#define __INT_FAST32_FMTi__ "i"
-// X86_64-CLOUDABI:#define __INT_FAST32_MAX__ 2147483647
-// X86_64-CLOUDABI:#define __INT_FAST32_TYPE__ int
-// X86_64-CLOUDABI:#define __INT_FAST64_FMTd__ "ld"
-// X86_64-CLOUDABI:#define __INT_FAST64_FMTi__ "li"
-// X86_64-CLOUDABI:#define __INT_FAST64_MAX__ 9223372036854775807L
-// X86_64-CLOUDABI:#define __INT_FAST64_TYPE__ long int
-// X86_64-CLOUDABI:#define __INT_FAST8_FMTd__ "hhd"
-// X86_64-CLOUDABI:#define __INT_FAST8_FMTi__ "hhi"
-// X86_64-CLOUDABI:#define __INT_FAST8_MAX__ 127
-// X86_64-CLOUDABI:#define __INT_FAST8_TYPE__ signed char
-// X86_64-CLOUDABI:#define __INT_LEAST16_FMTd__ "hd"
-// X86_64-CLOUDABI:#define __INT_LEAST16_FMTi__ "hi"
-// X86_64-CLOUDABI:#define __INT_LEAST16_MAX__ 32767
-// X86_64-CLOUDABI:#define __INT_LEAST16_TYPE__ short
-// X86_64-CLOUDABI:#define __INT_LEAST32_FMTd__ "d"
-// X86_64-CLOUDABI:#define __INT_LEAST32_FMTi__ "i"
-// X86_64-CLOUDABI:#define __INT_LEAST32_MAX__ 2147483647
-// X86_64-CLOUDABI:#define __INT_LEAST32_TYPE__ int
-// X86_64-CLOUDABI:#define __INT_LEAST64_FMTd__ "ld"
-// X86_64-CLOUDABI:#define __INT_LEAST64_FMTi__ "li"
-// X86_64-CLOUDABI:#define __INT_LEAST64_MAX__ 9223372036854775807L
-// X86_64-CLOUDABI:#define __INT_LEAST64_TYPE__ long int
-// X86_64-CLOUDABI:#define __INT_LEAST8_FMTd__ "hhd"
-// X86_64-CLOUDABI:#define __INT_LEAST8_FMTi__ "hhi"
-// X86_64-CLOUDABI:#define __INT_LEAST8_MAX__ 127
-// X86_64-CLOUDABI:#define __INT_LEAST8_TYPE__ signed char
-// X86_64-CLOUDABI:#define __INT_MAX__ 2147483647
-// X86_64-CLOUDABI:#define __LDBL_DECIMAL_DIG__ 21
-// X86_64-CLOUDABI:#define __LDBL_DENORM_MIN__ 3.64519953188247460253e-4951L
-// X86_64-CLOUDABI:#define __LDBL_DIG__ 18
-// X86_64-CLOUDABI:#define __LDBL_EPSILON__ 1.08420217248550443401e-19L
-// X86_64-CLOUDABI:#define __LDBL_HAS_DENORM__ 1
-// X86_64-CLOUDABI:#define __LDBL_HAS_INFINITY__ 1
-// X86_64-CLOUDABI:#define __LDBL_HAS_QUIET_NAN__ 1
-// X86_64-CLOUDABI:#define __LDBL_MANT_DIG__ 64
-// X86_64-CLOUDABI:#define __LDBL_MAX_10_EXP__ 4932
-// X86_64-CLOUDABI:#define __LDBL_MAX_EXP__ 16384
-// X86_64-CLOUDABI:#define __LDBL_MAX__ 1.18973149535723176502e+4932L
-// X86_64-CLOUDABI:#define __LDBL_MIN_10_EXP__ (-4931)
-// X86_64-CLOUDABI:#define __LDBL_MIN_EXP__ (-16381)
-// X86_64-CLOUDABI:#define __LDBL_MIN__ 3.36210314311209350626e-4932L
-// X86_64-CLOUDABI:#define __LITTLE_ENDIAN__ 1
-// X86_64-CLOUDABI:#define __LONG_LONG_MAX__ 9223372036854775807LL
-// X86_64-CLOUDABI:#define __LONG_MAX__ 9223372036854775807L
-// X86_64-CLOUDABI:#define __LP64__ 1
-// X86_64-CLOUDABI:#define __MMX__ 1
-// X86_64-CLOUDABI:#define __NO_INLINE__ 1
-// X86_64-CLOUDABI:#define __NO_MATH_INLINES 1
-// X86_64-CLOUDABI:#define __ORDER_BIG_ENDIAN__ 4321
-// X86_64-CLOUDABI:#define __ORDER_LITTLE_ENDIAN__ 1234
-// X86_64-CLOUDABI:#define __ORDER_PDP_ENDIAN__ 3412
-// X86_64-CLOUDABI:#define __POINTER_WIDTH__ 64
-// X86_64-CLOUDABI:#define __PRAGMA_REDEFINE_EXTNAME 1
-// X86_64-CLOUDABI:#define __PTRDIFF_FMTd__ "ld"
-// X86_64-CLOUDABI:#define __PTRDIFF_FMTi__ "li"
-// X86_64-CLOUDABI:#define __PTRDIFF_MAX__ 9223372036854775807L
-// X86_64-CLOUDABI:#define __PTRDIFF_TYPE__ long int
-// X86_64-CLOUDABI:#define __PTRDIFF_WIDTH__ 64
-// X86_64-CLOUDABI:#define __REGISTER_PREFIX__
-// X86_64-CLOUDABI:#define __SCHAR_MAX__ 127
-// X86_64-CLOUDABI:#define __SHRT_MAX__ 32767
-// X86_64-CLOUDABI:#define __SIG_ATOMIC_MAX__ 2147483647
-// X86_64-CLOUDABI:#define __SIG_ATOMIC_WIDTH__ 32
-// X86_64-CLOUDABI:#define __SIZEOF_DOUBLE__ 8
-// X86_64-CLOUDABI:#define __SIZEOF_FLOAT__ 4
-// X86_64-CLOUDABI:#define __SIZEOF_INT128__ 16
-// X86_64-CLOUDABI:#define __SIZEOF_INT__ 4
-// X86_64-CLOUDABI:#define __SIZEOF_LONG_DOUBLE__ 16
-// X86_64-CLOUDABI:#define __SIZEOF_LONG_LONG__ 8
-// X86_64-CLOUDABI:#define __SIZEOF_LONG__ 8
-// X86_64-CLOUDABI:#define __SIZEOF_POINTER__ 8
-// X86_64-CLOUDABI:#define __SIZEOF_PTRDIFF_T__ 8
-// X86_64-CLOUDABI:#define __SIZEOF_SHORT__ 2
-// X86_64-CLOUDABI:#define __SIZEOF_SIZE_T__ 8
-// X86_64-CLOUDABI:#define __SIZEOF_WCHAR_T__ 4
-// X86_64-CLOUDABI:#define __SIZEOF_WINT_T__ 4
-// X86_64-CLOUDABI:#define __SIZE_FMTX__ "lX"
-// X86_64-CLOUDABI:#define __SIZE_FMTo__ "lo"
-// X86_64-CLOUDABI:#define __SIZE_FMTu__ "lu"
-// X86_64-CLOUDABI:#define __SIZE_FMTx__ "lx"
-// X86_64-CLOUDABI:#define __SIZE_MAX__ 18446744073709551615UL
-// X86_64-CLOUDABI:#define __SIZE_TYPE__ long unsigned int
-// X86_64-CLOUDABI:#define __SIZE_WIDTH__ 64
-// X86_64-CLOUDABI:#define __SSE2_MATH__ 1
-// X86_64-CLOUDABI:#define __SSE2__ 1
-// X86_64-CLOUDABI:#define __SSE_MATH__ 1
-// X86_64-CLOUDABI:#define __SSE__ 1
-// X86_64-CLOUDABI:#define __STDC_HOSTED__ 0
-// X86_64-CLOUDABI:#define __STDC_ISO_10646__ 201206L
-// X86_64-CLOUDABI:#define __STDC_UTF_16__ 1
-// X86_64-CLOUDABI:#define __STDC_UTF_32__ 1
-// X86_64-CLOUDABI:#define __STDC_VERSION__ 201710L
-// X86_64-CLOUDABI:#define __STDC__ 1
-// X86_64-CLOUDABI:#define __UINT16_C_SUFFIX__
-// X86_64-CLOUDABI:#define __UINT16_FMTX__ "hX"
-// X86_64-CLOUDABI:#define __UINT16_FMTo__ "ho"
-// X86_64-CLOUDABI:#define __UINT16_FMTu__ "hu"
-// X86_64-CLOUDABI:#define __UINT16_FMTx__ "hx"
-// X86_64-CLOUDABI:#define __UINT16_MAX__ 65535
-// X86_64-CLOUDABI:#define __UINT16_TYPE__ unsigned short
-// X86_64-CLOUDABI:#define __UINT32_C_SUFFIX__ U
-// X86_64-CLOUDABI:#define __UINT32_FMTX__ "X"
-// X86_64-CLOUDABI:#define __UINT32_FMTo__ "o"
-// X86_64-CLOUDABI:#define __UINT32_FMTu__ "u"
-// X86_64-CLOUDABI:#define __UINT32_FMTx__ "x"
-// X86_64-CLOUDABI:#define __UINT32_MAX__ 4294967295U
-// X86_64-CLOUDABI:#define __UINT32_TYPE__ unsigned int
-// X86_64-CLOUDABI:#define __UINT64_C_SUFFIX__ UL
-// X86_64-CLOUDABI:#define __UINT64_FMTX__ "lX"
-// X86_64-CLOUDABI:#define __UINT64_FMTo__ "lo"
-// X86_64-CLOUDABI:#define __UINT64_FMTu__ "lu"
-// X86_64-CLOUDABI:#define __UINT64_FMTx__ "lx"
-// X86_64-CLOUDABI:#define __UINT64_MAX__ 18446744073709551615UL
-// X86_64-CLOUDABI:#define __UINT64_TYPE__ long unsigned int
-// X86_64-CLOUDABI:#define __UINT8_C_SUFFIX__
-// X86_64-CLOUDABI:#define __UINT8_FMTX__ "hhX"
-// X86_64-CLOUDABI:#define __UINT8_FMTo__ "hho"
-// X86_64-CLOUDABI:#define __UINT8_FMTu__ "hhu"
-// X86_64-CLOUDABI:#define __UINT8_FMTx__ "hhx"
-// X86_64-CLOUDABI:#define __UINT8_MAX__ 255
-// X86_64-CLOUDABI:#define __UINT8_TYPE__ unsigned char
-// X86_64-CLOUDABI:#define __UINTMAX_C_SUFFIX__ UL
-// X86_64-CLOUDABI:#define __UINTMAX_FMTX__ "lX"
-// X86_64-CLOUDABI:#define __UINTMAX_FMTo__ "lo"
-// X86_64-CLOUDABI:#define __UINTMAX_FMTu__ "lu"
-// X86_64-CLOUDABI:#define __UINTMAX_FMTx__ "lx"
-// X86_64-CLOUDABI:#define __UINTMAX_MAX__ 18446744073709551615UL
-// X86_64-CLOUDABI:#define __UINTMAX_TYPE__ long unsigned int
-// X86_64-CLOUDABI:#define __UINTMAX_WIDTH__ 64
-// X86_64-CLOUDABI:#define __UINTPTR_FMTX__ "lX"
-// X86_64-CLOUDABI:#define __UINTPTR_FMTo__ "lo"
-// X86_64-CLOUDABI:#define __UINTPTR_FMTu__ "lu"
-// X86_64-CLOUDABI:#define __UINTPTR_FMTx__ "lx"
-// X86_64-CLOUDABI:#define __UINTPTR_MAX__ 18446744073709551615UL
-// X86_64-CLOUDABI:#define __UINTPTR_TYPE__ long unsigned int
-// X86_64-CLOUDABI:#define __UINTPTR_WIDTH__ 64
-// X86_64-CLOUDABI:#define __UINT_FAST16_FMTX__ "hX"
-// X86_64-CLOUDABI:#define __UINT_FAST16_FMTo__ "ho"
-// X86_64-CLOUDABI:#define __UINT_FAST16_FMTu__ "hu"
-// X86_64-CLOUDABI:#define __UINT_FAST16_FMTx__ "hx"
-// X86_64-CLOUDABI:#define __UINT_FAST16_MAX__ 65535
-// X86_64-CLOUDABI:#define __UINT_FAST16_TYPE__ unsigned short
-// X86_64-CLOUDABI:#define __UINT_FAST32_FMTX__ "X"
-// X86_64-CLOUDABI:#define __UINT_FAST32_FMTo__ "o"
-// X86_64-CLOUDABI:#define __UINT_FAST32_FMTu__ "u"
-// X86_64-CLOUDABI:#define __UINT_FAST32_FMTx__ "x"
-// X86_64-CLOUDABI:#define __UINT_FAST32_MAX__ 4294967295U
-// X86_64-CLOUDABI:#define __UINT_FAST32_TYPE__ unsigned int
-// X86_64-CLOUDABI:#define __UINT_FAST64_FMTX__ "lX"
-// X86_64-CLOUDABI:#define __UINT_FAST64_FMTo__ "lo"
-// X86_64-CLOUDABI:#define __UINT_FAST64_FMTu__ "lu"
-// X86_64-CLOUDABI:#define __UINT_FAST64_FMTx__ "lx"
-// X86_64-CLOUDABI:#define __UINT_FAST64_MAX__ 18446744073709551615UL
-// X86_64-CLOUDABI:#define __UINT_FAST64_TYPE__ long unsigned int
-// X86_64-CLOUDABI:#define __UINT_FAST8_FMTX__ "hhX"
-// X86_64-CLOUDABI:#define __UINT_FAST8_FMTo__ "hho"
-// X86_64-CLOUDABI:#define __UINT_FAST8_FMTu__ "hhu"
-// X86_64-CLOUDABI:#define __UINT_FAST8_FMTx__ "hhx"
-// X86_64-CLOUDABI:#define __UINT_FAST8_MAX__ 255
-// X86_64-CLOUDABI:#define __UINT_FAST8_TYPE__ unsigned char
-// X86_64-CLOUDABI:#define __UINT_LEAST16_FMTX__ "hX"
-// X86_64-CLOUDABI:#define __UINT_LEAST16_FMTo__ "ho"
-// X86_64-CLOUDABI:#define __UINT_LEAST16_FMTu__ "hu"
-// X86_64-CLOUDABI:#define __UINT_LEAST16_FMTx__ "hx"
-// X86_64-CLOUDABI:#define __UINT_LEAST16_MAX__ 65535
-// X86_64-CLOUDABI:#define __UINT_LEAST16_TYPE__ unsigned short
-// X86_64-CLOUDABI:#define __UINT_LEAST32_FMTX__ "X"
-// X86_64-CLOUDABI:#define __UINT_LEAST32_FMTo__ "o"
-// X86_64-CLOUDABI:#define __UINT_LEAST32_FMTu__ "u"
-// X86_64-CLOUDABI:#define __UINT_LEAST32_FMTx__ "x"
-// X86_64-CLOUDABI:#define __UINT_LEAST32_MAX__ 4294967295U
-// X86_64-CLOUDABI:#define __UINT_LEAST32_TYPE__ unsigned int
-// X86_64-CLOUDABI:#define __UINT_LEAST64_FMTX__ "lX"
-// X86_64-CLOUDABI:#define __UINT_LEAST64_FMTo__ "lo"
-// X86_64-CLOUDABI:#define __UINT_LEAST64_FMTu__ "lu"
-// X86_64-CLOUDABI:#define __UINT_LEAST64_FMTx__ "lx"
-// X86_64-CLOUDABI:#define __UINT_LEAST64_MAX__ 18446744073709551615UL
-// X86_64-CLOUDABI:#define __UINT_LEAST64_TYPE__ long unsigned int
-// X86_64-CLOUDABI:#define __UINT_LEAST8_FMTX__ "hhX"
-// X86_64-CLOUDABI:#define __UINT_LEAST8_FMTo__ "hho"
-// X86_64-CLOUDABI:#define __UINT_LEAST8_FMTu__ "hhu"
-// X86_64-CLOUDABI:#define __UINT_LEAST8_FMTx__ "hhx"
-// X86_64-CLOUDABI:#define __UINT_LEAST8_MAX__ 255
-// X86_64-CLOUDABI:#define __UINT_LEAST8_TYPE__ unsigned char
-// X86_64-CLOUDABI:#define __USER_LABEL_PREFIX__
-// X86_64-CLOUDABI:#define __VERSION__ "{{.*}}Clang{{.*}}
-// X86_64-CLOUDABI:#define __WCHAR_MAX__ 2147483647
-// X86_64-CLOUDABI:#define __WCHAR_TYPE__ int
-// X86_64-CLOUDABI:#define __WCHAR_WIDTH__ 32
-// X86_64-CLOUDABI:#define __WINT_MAX__ 2147483647
-// X86_64-CLOUDABI:#define __WINT_TYPE__ int
-// X86_64-CLOUDABI:#define __WINT_WIDTH__ 32
-// X86_64-CLOUDABI:#define __amd64 1
-// X86_64-CLOUDABI:#define __amd64__ 1
-// X86_64-CLOUDABI:#define __clang__ 1
-// X86_64-CLOUDABI:#define __clang_literal_encoding__ {{.*}}
-// X86_64-CLOUDABI:#define __clang_major__ {{.*}}
-// X86_64-CLOUDABI:#define __clang_minor__ {{.*}}
-// X86_64-CLOUDABI:#define __clang_patchlevel__ {{.*}}
-// X86_64-CLOUDABI:#define __clang_version__ {{.*}}
-// X86_64-CLOUDABI:#define __clang_wide_literal_encoding__ {{.*}}
-// X86_64-CLOUDABI:#define __llvm__ 1
-// X86_64-CLOUDABI:#define __x86_64 1
-// X86_64-CLOUDABI:#define __x86_64__ 1
-
 // RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=x86_64-pc-linux-gnu < /dev/null | FileCheck -match-full-lines -check-prefix X86_64-LINUX %s
 //
 // X86_64-LINUX:#define _LP64 1
diff --git a/clang/test/Preprocessor/predefined-macros-no-warnings.c b/clang/test/Preprocessor/predefined-macros-no-warnings.c
--- a/clang/test/Preprocessor/predefined-macros-no-warnings.c
+++ b/clang/test/Preprocessor/predefined-macros-no-warnings.c
@@ -10,7 +10,6 @@
 // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple aarch64_32-darwin
 // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple aarch64
 // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple aarch64-darwin
-// RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple aarch64-cloudabi
 // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple aarch64-freebsd
 // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple aarch64-fuchsia
 // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple aarch64-linux
@@ -26,7 +25,6 @@
 // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple aarch64_be-netbsd
 // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple arm
 // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple arm-darwin
-// RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple arm-cloudabi
 // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple arm-freebsd
 // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple arm-fuchsia
 // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple arm-linux
@@ -136,7 +134,6 @@
 // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple i686
 // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple i686-darwin
 // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple i686-ananas
-// RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple i686-cloudabi
 // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple i686-linux
 // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple i686-linux-android
 // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple i686-dragonfly
@@ -158,7 +155,6 @@
 // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple x86_64
 // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple x86_64-darwin
 // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple x86_64-ananas
-// RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple x86_64-cloudabi
 // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple x86_64-linux
 // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple x86_64-linux-android
 // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple x86_64-linux-openhos
diff --git a/llvm/include/llvm/MC/MCELFObjectWriter.h b/llvm/include/llvm/MC/MCELFObjectWriter.h
--- a/llvm/include/llvm/MC/MCELFObjectWriter.h
+++ b/llvm/include/llvm/MC/MCELFObjectWriter.h
@@ -71,8 +71,6 @@
 
   static uint8_t getOSABI(Triple::OSType OSType) {
     switch (OSType) {
-      case Triple::CloudABI:
-        return ELF::ELFOSABI_CLOUDABI;
       case Triple::HermitCore:
         return ELF::ELFOSABI_STANDALONE;
       case Triple::PS4:
diff --git a/llvm/include/llvm/TargetParser/Triple.h b/llvm/include/llvm/TargetParser/Triple.h
--- a/llvm/include/llvm/TargetParser/Triple.h
+++ b/llvm/include/llvm/TargetParser/Triple.h
@@ -185,7 +185,6 @@
     UnknownOS,
 
     Ananas,
-    CloudABI,
     Darwin,
     DragonFly,
     FreeBSD,
diff --git a/llvm/lib/TargetParser/Triple.cpp b/llvm/lib/TargetParser/Triple.cpp
--- a/llvm/lib/TargetParser/Triple.cpp
+++ b/llvm/lib/TargetParser/Triple.cpp
@@ -209,7 +209,6 @@
   case AMDPAL: return "amdpal";
   case Ananas: return "ananas";
   case CUDA: return "cuda";
-  case CloudABI: return "cloudabi";
   case Darwin: return "darwin";
   case DragonFly: return "dragonfly";
   case DriverKit: return "driverkit";
@@ -572,7 +571,6 @@
 static Triple::OSType parseOS(StringRef OSName) {
   return StringSwitch<Triple::OSType>(OSName)
     .StartsWith("ananas", Triple::Ananas)
-    .StartsWith("cloudabi", Triple::CloudABI)
     .StartsWith("darwin", Triple::Darwin)
     .StartsWith("dragonfly", Triple::DragonFly)
     .StartsWith("freebsd", Triple::FreeBSD)