From 90d0bae361b0af326b07887252a70b7d9256a9f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Pl=C3=B6chtrager?= <t.poechtrager@gmail.com>
Date: Thu, 30 May 2019 11:35:48 +0200
Subject: [PATCH] An attempt to get TAPI platform "zippered" working

---
 include/tapi/Core/Platform.h    | 2 ++
 include/tapi/LinkerInterfaceFile.h   | 2 ++
 lib/Core/Platform.cpp           | 8 ++++++++
 lib/Core/YAML.cpp               | 3 +++
 4 files changed, 15 insertions(+)

diff --git tapi/include/tapi/Core/Platform.h tapi/include/tapi/Core/Platform.h
index afe19df8a..3293d48a7 100644
--- tapi/include/tapi/Core/Platform.h
+++ tapi/include/tapi/Core/Platform.h
@@ -34,6 +34,8 @@ enum class Platform : uint8_t {
   watchOS,
   watchOSSimulator,
   bridgeOS,
+  iOSMac,
+  zippered
 };
 
 Platform mapToSim(Platform platform, bool wantSim);
diff --git tapi/include/tapi/LinkerInterfaceFile.h tapi/include/tapi/LinkerInterfaceFile.h
index a18d9bee8..6f8282cfb 100644
--- tapi/include/tapi/LinkerInterfaceFile.h
+++ tapi/include/tapi/LinkerInterfaceFile.h
@@ -64,6 +64,8 @@ enum class Platform : unsigned {
   /// \since 1.2
   bridgeOS = 5,
 
+  iOSMac = 6,
+  zippered = 10
 };
 
 ///
diff --git tapi/lib/Core/Platform.cpp tapi/lib/Core/Platform.cpp
index 29e1ab476..3ff15bcef 100644
--- tapi/lib/Core/Platform.cpp
+++ tapi/lib/Core/Platform.cpp
@@ -93,6 +93,10 @@ StringRef getPlatformName(Platform platform) {
     return "tvOSSimulator";
   case Platform::bridgeOS:
     return "bridgeOS";
+  case Platform::iOSMac:
+    return "iOSMac";
+  case Platform::zippered:
+    return "zippered";
   }
 }
 
@@ -116,6 +120,10 @@ std::string getOSAndEnvironmentName(Platform platform, std::string version) {
     return "tvos" + version + "-simulator";
   case Platform::bridgeOS:
     return "bridgeos" + version;
+  case Platform::iOSMac:
+    return "iOSMac" + version;
+  case Platform::zippered:
+    return "zippered" + version;
   }
 }
 
diff --git tapi/lib/Core/YAML.cpp tapi/lib/Core/YAML.cpp
index 3aa286ecd..f34e7c235 100644
--- tapi/lib/Core/YAML.cpp
+++ tapi/lib/Core/YAML.cpp
@@ -55,6 +55,9 @@ void ScalarEnumerationTraits<Platform>::enumeration(IO &io,
   io.enumCase(platform, "tvos", Platform::tvOS);
   io.enumCase(platform, "tvos", Platform::tvOSSimulator);
   io.enumCase(platform, "bridgeos", Platform::bridgeOS);
+
+  io.enumCase(platform, "iosmac", Platform::zippered);
+  io.enumCase(platform, "zippered", Platform::zippered);
 }
 
 using TAPI_INTERNAL::Architecture;
 From e92ebe1484033f91c80d9cf1a90c44f95c8c81fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20P=C3=B6chtrager?= <t.poechtrager@gmail.com>
Date: Thu, 30 May 2019 18:34:46 +0200
Subject: [PATCH] An attempt to get TAPI platform "zippered" working #2

---
 LinkerInterfaceFile.cpp    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git tapi/tools/libtapi/LinkerInterfaceFile.cpp tapi/tools/libtapi/LinkerInterfaceFile.cpp
index b6789990e..e4952df50 100644
--- tapi/tools/libtapi/LinkerInterfaceFile.cpp
+++ tapi/tools/libtapi/LinkerInterfaceFile.cpp
@@ -298,6 +298,10 @@ static tapi::Platform mapPlatform(tapi::internal::Platform platform) {
     return Platform::tvOS;
   case tapi::internal::Platform::bridgeOS:
     return Platform::bridgeOS;
+  case tapi::internal::Platform::iOSMac:
+    return Platform::iOSMac;
+  case tapi::internal::Platform::zippered:
+    return Platform::zippered;
   }
 }