diff options
| -rw-r--r-- | lld/MachO/Driver.cpp | 12 | ||||
| -rw-r--r-- | lld/MachO/Writer.cpp | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/lld/MachO/Driver.cpp b/lld/MachO/Driver.cpp index d22c3ea..533273e 100644 --- a/lld/MachO/Driver.cpp +++ b/lld/MachO/Driver.cpp @@ -925,12 +925,12 @@ PlatformType macho::removeSimulator(PlatformType platform) { } static bool dataConstDefault(const InputArgList &args) { - static const std::vector<std::pair<PlatformType, VersionTuple>> minVersion = { - {PLATFORM_MACOS, VersionTuple(10, 15)}, - {PLATFORM_IOS, VersionTuple(13, 0)}, - {PLATFORM_TVOS, VersionTuple(13, 0)}, - {PLATFORM_WATCHOS, VersionTuple(6, 0)}, - {PLATFORM_BRIDGEOS, VersionTuple(4, 0)}}; + static const std::array<std::pair<PlatformType, VersionTuple>, 5> minVersion = + {{{PLATFORM_MACOS, VersionTuple(10, 15)}, + {PLATFORM_IOS, VersionTuple(13, 0)}, + {PLATFORM_TVOS, VersionTuple(13, 0)}, + {PLATFORM_WATCHOS, VersionTuple(6, 0)}, + {PLATFORM_BRIDGEOS, VersionTuple(4, 0)}}}; PlatformType platform = removeSimulator(config->platformInfo.target.Platform); auto it = llvm::find_if(minVersion, [&](const auto &p) { return p.first == platform; }); diff --git a/lld/MachO/Writer.cpp b/lld/MachO/Writer.cpp index 89b14e1..0df3849 100644 --- a/lld/MachO/Writer.cpp +++ b/lld/MachO/Writer.cpp @@ -680,14 +680,14 @@ void Writer::scanSymbols() { // TODO: ld64 enforces the old load commands in a few other cases. static bool useLCBuildVersion(const PlatformInfo &platformInfo) { - static const std::vector<std::pair<PlatformType, VersionTuple>> minVersion = { - {PLATFORM_MACOS, VersionTuple(10, 14)}, - {PLATFORM_IOS, VersionTuple(12, 0)}, - {PLATFORM_IOSSIMULATOR, VersionTuple(13, 0)}, - {PLATFORM_TVOS, VersionTuple(12, 0)}, - {PLATFORM_TVOSSIMULATOR, VersionTuple(13, 0)}, - {PLATFORM_WATCHOS, VersionTuple(5, 0)}, - {PLATFORM_WATCHOSSIMULATOR, VersionTuple(6, 0)}}; + static const std::array<std::pair<PlatformType, VersionTuple>, 7> minVersion = + {{{PLATFORM_MACOS, VersionTuple(10, 14)}, + {PLATFORM_IOS, VersionTuple(12, 0)}, + {PLATFORM_IOSSIMULATOR, VersionTuple(13, 0)}, + {PLATFORM_TVOS, VersionTuple(12, 0)}, + {PLATFORM_TVOSSIMULATOR, VersionTuple(13, 0)}, + {PLATFORM_WATCHOS, VersionTuple(5, 0)}, + {PLATFORM_WATCHOSSIMULATOR, VersionTuple(6, 0)}}}; auto it = llvm::find_if(minVersion, [&](const auto &p) { return p.first == platformInfo.target.Platform; }); |