caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ORC][MachO] Allow multiple LC_BUILD_VERSION commands.

Browse Source 
No testcase: I'm still thinking about the best way to test this.
This commit is contained in:
Lang Hames
2024-03-14 09:42:36 -07:00
parent 0adccd1a7f
commit 0f252e7bd8
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
llvm/include/llvm/ExecutionEngine/Orc/MachOPlatform.h
View File

@@ -73,13 +73,12 @@ public:
/// will be used.
std::optional<Dylib> IDDylib;
/// Override for LC_BUILD_VERSION. If this is nullopt then
std::optional<BuildVersionOpts> BuildVersion;
/// List of LC_LOAD_DYLIBs.
std::vector<Dylib> LoadDylibs;
/// List of LC_RPATHs.
std::vector<std::string> RPaths;
/// List of LC_BUILD_VERSIONs.
std::vector<BuildVersionOpts> BuildVersion;
HeaderOptions() = default;
HeaderOptions(Dylib D) : IDDylib(std::move(D)) {}

6
llvm/lib/ExecutionEngine/Orc/MachOPlatform.cpp
View File

@@ -1725,11 +1725,9 @@ jitlink::Block &createHeaderBlock(MachOPlatform &MOP,
else
B.template addLoadCommand<MachO::LC_ID_DYLIB>(JD.getName(), 0, 0, 0);
if (Opts.BuildVersion)
for (auto &BV : Opts.BuildVersion)
B.template addLoadCommand<MachO::LC_BUILD_VERSION>(
Opts.BuildVersion->Platform, Opts.BuildVersion->MinOS,
Opts.BuildVersion->SDK, static_cast<uint32_t>(0));
BV.Platform, BV.MinOS, BV.SDK, static_cast<uint32_t>(0));
for (auto &D : Opts.LoadDylibs)
B.template addLoadCommand<MachO::LC_LOAD_DYLIB>(
D.Name, D.Timestamp, D.CurrentVersion, D.CompatibilityVersion);