[PATCH] D101953: [lld-macho][nfc] Convert the mock libSystem.tbd to TBDv4

[Jez Ng via Phabricator via llvm-commits]

int3 created this revision.
int3 added a reviewer: lld-macho.
Herald added a project: lld-macho.
int3 requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

It doesn't seem like TBDv3 allows for specifying multiple platforms, so I'm
upgrading us to TBDv4. (We need to support multiple platforms in order to test
that we can handle zippered dylibs; that functionality will be added in an
upcoming diff.)


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D101953

Files:
  lld/test/MachO/Inputs/MacOSX.sdk/usr/lib/libSystem.tbd


Index: lld/test/MachO/Inputs/MacOSX.sdk/usr/lib/libSystem.tbd
===================================================================
--- lld/test/MachO/Inputs/MacOSX.sdk/usr/lib/libSystem.tbd
+++ lld/test/MachO/Inputs/MacOSX.sdk/usr/lib/libSystem.tbd
@@ -1,42 +1,64 @@
---- !tapi-tbd-v3
-archs:            [ x86_64, arm64 ]
-uuids:            [ 'x86_64: 00000000-0000-0000-0000-000000000000', 'arm64: 00000000-0000-0000-0000-000000000010' ]
-platform:         macosx
+--- !tapi-tbd
+tbd-version:      4
+targets:          [ x86_64-macos, arm64-macos ]
+uuids:
+  - target:       x86_64-macos
+    value:        00000000-0000-0000-0000-000000000000
+  - target:       arm64-macos
+    value:        00000000-0000-0000-0000-000000000001
 install-name:     '/usr/lib/libSystem.dylib'
 current-version:  0001.001.1
-exports:
-  - archs:        [ 'x86_64', 'arm64' ]
-    re-exports:   [ '/usr/lib/system/libdyld.dylib',
+reexported-libraries:
+  - targets:      [ x86_64-macos, arm64-macos ]
+    libraries:    [ '/usr/lib/system/libdyld.dylib',
                     '/usr/lib/system/libsystem_c.dylib',
                     '/usr/lib/system/libsystem_m.dylib' ]
---- !tapi-tbd-v3
-archs:            [ x86_64, arm64 ]
-uuids:            [ 'x86_64: 00000000-0000-0000-0000-000000000001', 'arm64: 00000000-0000-0000-0000-000000000011' ]
-platform:         macosx
+--- !tapi-tbd
+tbd-version:      4
+targets:          [ x86_64-macos, arm64-macos ]
+uuids:
+  - target:       x86_64-macos
+    value:        00000000-0000-0000-0000-000000000002
+  - target:       arm64-macos
+    value:        00000000-0000-0000-0000-000000000003
 install-name:     '/usr/lib/system/libdyld.dylib'
 current-version:  0001.001.1
-parent-umbrella:  System
+parent-umbrella:
+  - targets:      [ x86_64-macos, arm64-macos ]
+    umbrella:     System
 exports:
-  - archs:        [ 'x86_64', 'arm64' ]
+  - targets:      [ x86_64-macos, arm64-macos ]
     symbols:      [ dyld_stub_binder, __tlv_bootstrap ]
---- !tapi-tbd-v3
-archs:            [ x86_64, arm64 ]
-uuids:            [ 'x86_64: 00000000-0000-0000-0000-000000000002', 'arm64: 00000000-0000-0000-0000-000000000012' ]
-platform:         macosx
+--- !tapi-tbd
+tbd-version:      4
+targets:          [ x86_64-macos, arm64-macos ]
+uuids:
+  - target:       x86_64-macos
+    value:        00000000-0000-0000-0000-000000000003
+  - target:       arm64-macos
+    value:        00000000-0000-0000-0000-000000000004
 install-name:     '/usr/lib/system/libsystem_c.dylib'
 current-version:  0001.001.1
-parent-umbrella:  System
+parent-umbrella:
+  - targets:      [ x86_64-macos, arm64-macos ]
+    umbrella:     System
 exports:
-  - archs:        [ 'x86_64', 'arm64' ]
+  - targets:      [ x86_64-macos, arm64-macos ]
     symbols:      [ ]
---- !tapi-tbd-v3
-archs:            [ x86_64, arm64 ]
-uuids:            [ 'x86_64: 00000000-0000-0000-0000-000000000003', 'arm64: 00000000-0000-0000-0000-000000000013' ]
-platform:         macosx
+--- !tapi-tbd
+tbd-version:      4
+targets:          [ x86_64-macos, arm64-macos ]
+uuids:
+  - target:       x86_64-macos
+    value:        00000000-0000-0000-0000-000000000004
+  - target:       arm64-macos
+    value:        00000000-0000-0000-0000-000000000005
 install-name:     '/usr/lib/system/libsystem_m.dylib'
 current-version:  0001.001.1
-parent-umbrella:  System
+parent-umbrella:
+  - targets:      [ x86_64-macos, arm64-macos ]
+    umbrella:     System
 exports:
-  - archs:        [ 'x86_64', 'arm64' ]
+  - targets:      [ x86_64-macos, arm64-macos ]
     symbols:      [ ___nan ]
 ...


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D101953.343221.patch
Type: text/x-patch
Size: 3577 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210505/6e47a95e/attachment.bin>