diff --git a/lib/TBDGen/TBDGen.cpp b/lib/TBDGen/TBDGen.cpp
index dd9a8c4de0782..67e6fbf8c5cec 100644
--- a/lib/TBDGen/TBDGen.cpp
+++ b/lib/TBDGen/TBDGen.cpp
@@ -61,7 +61,7 @@ void TBDGenVisitor::addSymbol(StringRef name, SymbolKind kind) {
   SmallString<32> mangled;
   llvm::Mangler::getNameWithPrefix(mangled, name, DataLayout);
 
-  Symbols.addSymbol(kind, mangled, Archs);
+  Symbols.addSymbol(kind, mangled, Targets);
 
   if (StringSymbols && kind == SymbolKind::GlobalSymbol) {
     auto isNewValue = StringSymbols->insert(mangled).second;
@@ -618,8 +618,8 @@ static void enumeratePublicSymbolsAndWrite(ModuleDecl *M, FileUnit *singleFile,
                                            const TBDGenOptions &opts) {
   auto &ctx = M->getASTContext();
   auto isWholeModule = singleFile == nullptr;
-  const auto &target = ctx.LangOpts.Target;
-  UniversalLinkageInfo linkInfo(target, opts.HasMultipleIGMs, false,
+  const auto &triple = ctx.LangOpts.Target;
+  UniversalLinkageInfo linkInfo(triple, opts.HasMultipleIGMs, false,
                                 isWholeModule);
 
   llvm::MachO::InterfaceFile file;
@@ -637,27 +637,11 @@ static void enumeratePublicSymbolsAndWrite(ModuleDecl *M, FileUnit *singleFile,
   file.setSwiftABIVersion(irgen::getSwiftABIVersion());
   file.setInstallAPI(opts.IsInstallAPI);
 
-  auto getPlatformKind =
-      [](const llvm::Triple &Target) -> llvm::MachO::PlatformKind {
-    switch (Target.getOS()) {
-    default:
-      return llvm::MachO::PlatformKind::unknown;
-    case llvm::Triple::MacOSX:
-      return llvm::MachO::PlatformKind::macOS;
-    case llvm::Triple::IOS:
-      return llvm::MachO::PlatformKind::iOS;
-    case llvm::Triple::TvOS:
-      return llvm::MachO::PlatformKind::tvOS;
-    case llvm::Triple::WatchOS:
-      return llvm::MachO::PlatformKind::watchOS;
-    }
-  };
-  auto arch = llvm::MachO::getArchitectureFromName(target.getArchName());
-  file.addArch(arch);
-  file.setPlatform(getPlatformKind(target));
+  llvm::MachO::Target target(triple);
+  file.addTarget(target);
 
   auto *clang = static_cast<ClangImporter *>(ctx.getClangModuleLoader());
-  TBDGenVisitor visitor(file, arch, symbols,
+  TBDGenVisitor visitor(file, {target}, symbols,
                         clang->getTargetInfo().getDataLayout(),
                         linkInfo, M, opts);
 
diff --git a/lib/TBDGen/TBDGenVisitor.h b/lib/TBDGen/TBDGenVisitor.h
index e5d0bc53f6e32..a76da073ef8cf 100644
--- a/lib/TBDGen/TBDGenVisitor.h
+++ b/lib/TBDGen/TBDGenVisitor.h
@@ -47,7 +47,7 @@ namespace tbdgen {
 class TBDGenVisitor : public ASTVisitor<TBDGenVisitor> {
 public:
   llvm::MachO::InterfaceFile &Symbols;
-  llvm::MachO::ArchitectureSet Archs;
+  llvm::MachO::TargetList Targets;
   StringSet *StringSymbols;
   const llvm::DataLayout &DataLayout;
 
@@ -76,11 +76,11 @@ class TBDGenVisitor : public ASTVisitor<TBDGenVisitor> {
 
 public:
   TBDGenVisitor(llvm::MachO::InterfaceFile &symbols,
-                llvm::MachO::ArchitectureSet archs, StringSet *stringSymbols,
+                llvm::MachO::TargetList targets, StringSet *stringSymbols,
                 const llvm::DataLayout &dataLayout,
                 const UniversalLinkageInfo &universalLinkInfo,
                 ModuleDecl *swiftModule, const TBDGenOptions &opts)
-      : Symbols(symbols), Archs(archs), StringSymbols(stringSymbols),
+      : Symbols(symbols), Targets(targets), StringSymbols(stringSymbols),
         DataLayout(dataLayout), UniversalLinkInfo(universalLinkInfo),
         SwiftModule(swiftModule), Opts(opts) {}