From 24200c0c3f7459fc3ea90033fabbbe52e1f233e0 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sun, 9 Aug 2020 15:40:38 +0300 Subject: [PATCH] - fixed ARM64 compilation issues reported by Xcode 12 beta 4 src/common/engine/stats.h:139:31: error: invalid output constraint '=A' in asm src/common/platform/posix/osx/iwadpicker_cocoa.mm:379:1: warning: non-void function does not return a value [-Wreturn-type] --- src/common/engine/stats.h | 3 +++ src/common/platform/posix/osx/iwadpicker_cocoa.mm | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/common/engine/stats.h b/src/common/engine/stats.h index 6734bfe72..563fc9529 100644 --- a/src/common/engine/stats.h +++ b/src/common/engine/stats.h @@ -132,6 +132,9 @@ inline uint64_t rdtsc() } while (upper != temp); return (static_cast(upper) << 32) | lower; +#elif defined __aarch64__ + // TODO: Implement and test on ARM64 + return 0; #else // i386 if (CPU.bRDTSC) { diff --git a/src/common/platform/posix/osx/iwadpicker_cocoa.mm b/src/common/platform/posix/osx/iwadpicker_cocoa.mm index 8670ec2bd..1a1c2ee80 100644 --- a/src/common/platform/posix/osx/iwadpicker_cocoa.mm +++ b/src/common/platform/posix/osx/iwadpicker_cocoa.mm @@ -375,6 +375,8 @@ static NSString* GetArchitectureString() return @"i386"; #elif defined __x86_64__ return @"x86_64"; +#elif defined __aarch64__ + return @"arm64"; #endif }