[PATCH] D100913: [lld-macho] Skip platform checks for a few libSystem re-exports

[Jez Ng via Phabricator via llvm-commits]

This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG7208bd4b320f: [lld-macho] Skip platform checks for a few libSystem re-exports (authored by int3).

Changed prior to commit:
  https://reviews.llvm.org/D100913?vs=339051&id=339055#toc

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D100913/new/

https://reviews.llvm.org/D100913

Files:
  lld/MachO/InputFiles.cpp
  lld/test/MachO/Inputs/iPhoneSimulator.sdk/usr/lib/libSystem.tbd
  lld/test/MachO/skip-platform-checks.s


Index: lld/test/MachO/skip-platform-checks.s
===================================================================
--- /dev/null
+++ lld/test/MachO/skip-platform-checks.s
@@ -0,0 +1,12 @@
+# REQUIRES: x86, aarch64
+# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-iossimulator %s -o %t.o
+## This should succeed even though libsystem_kernel.dylib has a mismatched platform.
+# RUN: ld64.lld -lSystem -arch x86_64 -platform_version ios-simulator 14.0 15.0 \
+# RUN:   -syslibroot %S/Inputs/iPhoneSimulator.sdk %t.o -o %t
+# RUN: llvm-objdump --macho --bind %t | FileCheck %s
+# CHECK: __DATA_CONST __got  0x100001000 pointer  0 libSystem  dyld_stub_binder
+
+.globl _main
+_main:
+  callq ___fsync
+  ret
Index: lld/test/MachO/Inputs/iPhoneSimulator.sdk/usr/lib/libSystem.tbd
===================================================================
--- lld/test/MachO/Inputs/iPhoneSimulator.sdk/usr/lib/libSystem.tbd
+++ lld/test/MachO/Inputs/iPhoneSimulator.sdk/usr/lib/libSystem.tbd
@@ -8,8 +8,9 @@
 current-version:  1281
 exports:
   - archs:      [ i386, x86_64, arm64 ]
-    re-exports: [ '/usr/lib/system/libcache.dylib' ]
-    symbols:    [ __crashreporter_info__, _cache_create ]
+    re-exports: [ '/usr/lib/system/libcache.dylib',
+                  '/usr/lib/system/libsystem_kernel.dylib' ]
+    symbols:    [ __crashreporter_info__, _cache_create, dyld_stub_binder ]
 --- !tapi-tbd-v3
 archs:            [ i386, x86_64, arm64 ]
 uuids:            [ 'i386: 00000000-0000-0000-0000-000000000003',
@@ -24,6 +25,18 @@
     symbols:    [ __cache_handle_memory_pressure_event ]
   - archs:      [ i386, x86_64 ]
     symbols:    [ _cache_create, _cache_destroy, _cache_get ]
+--- !tapi-tbd-v3
+archs:            [ i386, x86_64, arm64 ]
+uuids:            [ 'i386: 00000000-0000-0000-0000-000000000003',
+                    'x86_64: 00000000-0000-0000-0000-000000000004',
+                    'arm64: 00000000-0000-0000-0000-000000000005' ]
+platform:         macosx
+install-name:     '/usr/lib/system/libsystem_kernel.dylib'
+current-version:  83
+parent-umbrella:  System
+exports:
+  - archs:      [ i386, x86_64, arm64 ]
+    symbols:    [ ___fsync ]
 
 # The following TAPI document is not re-exported by any other document in this
 # TBD file, and should therefore be inaccessible.
Index: lld/MachO/InputFiles.cpp
===================================================================
--- lld/MachO/InputFiles.cpp
+++ lld/MachO/InputFiles.cpp
@@ -783,7 +783,15 @@
   compatibilityVersion = interface.getCompatibilityVersion().rawValue();
   currentVersion = interface.getCurrentVersion().rawValue();
 
-  if (!is_contained(interface.targets(), config->target)) {
+  // Some versions of XCode ship with .tbd files that don't have the right
+  // platform settings.
+  static constexpr std::array<StringRef, 3> skipPlatformChecks{
+      "/usr/lib/system/libsystem_kernel.dylib",
+      "/usr/lib/system/libsystem_platform.dylib",
+      "/usr/lib/system/libsystem_pthread.dylib"};
+
+  if (!is_contained(skipPlatformChecks, dylibName) &&
+      !is_contained(interface.targets(), config->target)) {
     error(toString(this) + " is incompatible with " +
           std::string(config->target));
     return;
@@ -825,7 +833,8 @@
 
   for (InterfaceFileRef intfRef : interface.reexportedLibraries()) {
     InterfaceFile::const_target_range targets = intfRef.targets();
-    if (is_contained(targets, config->target))
+    if (is_contained(skipPlatformChecks, intfRef.getInstallName()) ||
+        is_contained(targets, config->target))
       loadReexport(intfRef.getInstallName(), exportingFile, topLevel);
   }
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D100913.339055.patch
Type: text/x-patch
Size: 3619 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210420/f87a03cb/attachment.bin>