suyu/breakpad
26
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Include iOS in availability checks for mach-o/util.h calls

Browse source 
Bug: chromium:1420654
Change-Id: Id0281089962147040b6332223bf4593bf4fc60cd
Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/4500259
Reviewed-by: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Leonard Grey 2023-05-02 16:05:18 -04:00
parent e9eb843f42
commit 3ea3af42d3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/mac/arch_utilities.cc
View file

@ -95,7 +95,7 @@ ArchInfo GetLocalArchInfo(void) {
#ifdef __APPLE__ #ifdef __APPLE__
std::optional<ArchInfo> GetArchInfoFromName(const char* arch_name) { std::optional<ArchInfo> GetArchInfoFromName(const char* arch_name) {
if (__builtin_available(macOS 13.0, *)) { if (__builtin_available(macOS 13.0, iOS 16.0, *)) {
cpu_type_t type; cpu_type_t type;
cpu_subtype_t subtype; cpu_subtype_t subtype;
if (macho_cpu_type_for_arch_name(arch_name, &type, &subtype)) { if (macho_cpu_type_for_arch_name(arch_name, &type, &subtype)) {
@ -114,7 +114,7 @@ std::optional<ArchInfo> GetArchInfoFromName(const char* arch_name) {
} }
const char* GetNameFromCPUType(cpu_type_t cpu_type, cpu_subtype_t cpu_subtype) { const char* GetNameFromCPUType(cpu_type_t cpu_type, cpu_subtype_t cpu_subtype) {
if (__builtin_available(macOS 13.0, *)) { if (__builtin_available(macOS 13.0, iOS 16.0, *)) {
const char* name = macho_arch_name_for_cpu_type(cpu_type, cpu_subtype); const char* name = macho_arch_name_for_cpu_type(cpu_type, cpu_subtype);
if (name) { if (name) {
return name; return name;