This is an archive of the discontinued LLVM Phabricator instance.

Differential D124354

[lld/mac] Revert libcompiler_rt.dylib version check change
ClosedPublic

Authored by thakis on Apr 24 2022, 6:11 PM.

Details

Reviewers
bc-lee
MaskRay
Group Reviewers
Restricted Project
Commits
rG010acc52a83a: [lld/mac] Revert libcompiler_rt.dylib version check change
Summary

This reverts D117925 since it's no longer needed after D124336.

Diff Detail

Event Timeline

thakis created this revision.Apr 24 2022, 6:11 PM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptApr 24 2022, 6:11 PM
Herald added a reviewer: Restricted Project. · View Herald Transcript
thakis requested review of this revision.Apr 24 2022, 6:11 PM
thakis mentioned this in D117925: [lld][macho] Add more skip platform check for libSystem re-exports.Apr 24 2022, 6:17 PM
bc-lee accepted this revision.Apr 24 2022, 6:17 PM

Nice!

This revision is now accepted and ready to land.Apr 24 2022, 6:17 PM
bc-lee added inline comments.Apr 24 2022, 6:18 PM
lld/MachO/InputFiles.cpp
1292

Should be 3, not 4.

Harbormaster completed remote builds in B161089: Diff 424804.Apr 24 2022, 6:25 PM
MaskRay accepted this revision.Apr 25 2022, 12:16 AM
Herald added a subscriber: StephenFan. · View Herald TranscriptApr 25 2022, 12:16 AM
thakis marked an inline comment as done.Apr 25 2022, 3:55 AM
Closed by commit rG010acc52a83a: [lld/mac] Revert libcompiler_rt.dylib version check change (authored by thakis). · Explain WhyApr 25 2022, 3:56 AM
This revision was automatically updated to reflect the committed changes.
thakis added a commit: rG010acc52a83a: [lld/mac] Revert libcompiler_rt.dylib version check change.
Herald added a project: Restricted Project. · View Herald TranscriptApr 25 2022, 3:56 AM

Revision Contents

PathSize
lld/
MachO/
5 lines

Diff 424864

lld/MachO/InputFiles.cpp

Show First 20 Lines • Show All 1,283 Lines • ▼ Show 20 Lines if (config->namespaceKind == NamespaceKind::flat &&
error(Twine("unable to locate library '") + dylibPath + error(Twine("unable to locate library '") + dylibPath +
"' loaded from '" + toString(this) + "' for -flat_namespace"); "' loaded from '" + toString(this) + "' for -flat_namespace");
} }
} }
} }
// Some versions of Xcode ship with .tbd files that don't have the right // Some versions of Xcode ship with .tbd files that don't have the right
// platform settings. // platform settings.
constexpr std::array<StringRef, 4> skipPlatformChecks{ constexpr std::array<StringRef, 3> skipPlatformChecks{
bc-leeUnsubmitted
Done
ReplyInline Actions

Should be 3, not 4.

bc-lee: Should be 3, not 4.
"/usr/lib/system/libsystem_kernel.dylib", "/usr/lib/system/libsystem_kernel.dylib",
"/usr/lib/system/libsystem_platform.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"};
static bool skipPlatformCheckForCatalyst(const InterfaceFile &interface, static bool skipPlatformCheckForCatalyst(const InterfaceFile &interface,
bool explicitlyLinked) { bool explicitlyLinked) {
// Catalyst outputs can link against implicitly linked macOS-only libraries. // Catalyst outputs can link against implicitly linked macOS-only libraries.
if (config->platform() != PLATFORM_MACCATALYST || explicitlyLinked) if (config->platform() != PLATFORM_MACCATALYST || explicitlyLinked)
return false; return false;
return is_contained(interface.targets(), return is_contained(interface.targets(),
MachO::Target(config->arch(), PLATFORM_MACOS)); MachO::Target(config->arch(), PLATFORM_MACOS));
▲ Show 20 Lines • Show All 373 Lines • Show Last 20 Lines