[PATCH] D117925: [lld][macho] Add more skip platform check for libSystem re-exports

[Byoungchan Lee via Phabricator via llvm-commits]

bc-lee created this revision.
bc-lee added reviewers: smeenai, MaskRay.
Herald added a project: lld-macho.
Herald added a reviewer: lld-macho.
bc-lee requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Xcode 13 comes with a mismatched platform in libcompiler_rt.dylib,
so this creates a linker error on mac catalyst.
Fix it by adding it to the skip list.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D117925

Files:
  lld/MachO/InputFiles.cpp


Index: lld/MachO/InputFiles.cpp
===================================================================
--- lld/MachO/InputFiles.cpp
+++ lld/MachO/InputFiles.cpp
@@ -1271,10 +1271,11 @@
 
 // Some versions of XCode ship with .tbd files that don't have the right
 // platform settings.
-static constexpr std::array<StringRef, 3> skipPlatformChecks{
+static constexpr std::array<StringRef, 4> skipPlatformChecks{
     "/usr/lib/system/libsystem_kernel.dylib",
     "/usr/lib/system/libsystem_platform.dylib",
-    "/usr/lib/system/libsystem_pthread.dylib"};
+    "/usr/lib/system/libsystem_pthread.dylib",
+    "/usr/lib/system/libcompiler_rt.dylib"};
 
 DylibFile::DylibFile(const InterfaceFile &interface, DylibFile *umbrella,
                      bool isBundleLoader)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D117925.402096.patch
Type: text/x-patch
Size: 766 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220121/809caa30/attachment.bin>