diff --git a/llvm/include/llvm/TextAPI/MachO/Architecture.def b/llvm/include/llvm/TextAPI/MachO/Architecture.def
--- a/llvm/include/llvm/TextAPI/MachO/Architecture.def
+++ b/llvm/include/llvm/TextAPI/MachO/Architecture.def
@@ -37,3 +37,9 @@
 ///
 ARCHINFO(arm64, MachO::CPU_TYPE_ARM64, MachO::CPU_SUBTYPE_ARM64_ALL, 64)
 ARCHINFO(arm64e, MachO::CPU_TYPE_ARM64, MachO::CPU_SUBTYPE_ARM64E, 64)
+
+
+///
+/// ARM64_32 architectures sorted by cpu sub type id
+///
+ARCHINFO(arm64_32, MachO::CPU_TYPE_ARM64_32, MachO::CPU_SUBTYPE_ARM64_32_V8, 32)
diff --git a/llvm/test/Object/Inputs/tapi-v4-watchos.tbd b/llvm/test/Object/Inputs/tapi-v4-watchos.tbd
new file mode 100644
--- /dev/null
+++ b/llvm/test/Object/Inputs/tapi-v4-watchos.tbd
@@ -0,0 +1,13 @@
+--- !tapi-tbd
+tbd-version:     4
+targets:         [ armv7k-watchos-simulator, arm64_32-watchos-simulator ]
+uuids:
+  - target:          armv7k-watchos-simulator
+    value:           00000000-0000-0000-0000-000000000000
+  - target:          arm64_32-watchos-simulator
+    value:           11111111-1111-1111-1111-111111111111
+install-name:    '/u/l/libFoo.dylib'
+current-version: 1
+exports:
+  - targets:              [ armv7k-watchos-simulator, arm64_32-watchos-simulator ]
+    symbols:              [ '_sym1' ]
diff --git a/llvm/test/Object/nm-tapi.test b/llvm/test/Object/nm-tapi.test
--- a/llvm/test/Object/nm-tapi.test
+++ b/llvm/test/Object/nm-tapi.test
@@ -10,6 +10,9 @@
 RUN: llvm-nm %p/Inputs/tapi-v4.tbd \
 RUN:          | FileCheck %s -check-prefix V4
 
+RUN: llvm-nm %p/Inputs/tapi-v4-watchos.tbd \
+RUN:          | FileCheck %s -check-prefix V4-WATCH
+
 V1: /u/l/libfoo.dylib (for architecture armv7):
 V1-NEXT: 00000000 S _sym
 V1: /u/l/libfoo.dylib (for architecture armv7s):
@@ -56,3 +59,8 @@
 V4: /u/l/libFoo.dylib (for architecture x86_64):
 V4-NEXT: 0000000000000000 S _sym3
 V4-NEXT: 0000000000000000 S _sym4
+
+V4-WATCH: /u/l/libFoo.dylib (for architecture armv7k)
+V4-WATCH-NEXT: 00000000 S _sym1
+V4-WATCH: /u/l/libFoo.dylib (for architecture arm64_32)
+V4-WATCH-NEXT: 00000000 S _sym1