zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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]
This commit is contained in:
alexey.lysiuk 2020-08-09 15:40:38 +03:00
parent b7e8a87b81
commit 24200c0c3f
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/engine/stats.h
View File

@ -132,6 +132,9 @@ inline uint64_t rdtsc()
} }
while (upper != temp); while (upper != temp);
return (static_cast<unsigned long long>(upper) << 32) | lower; return (static_cast<unsigned long long>(upper) << 32) | lower;
#elif defined __aarch64__
// TODO: Implement and test on ARM64
return 0;
#else // i386 #else // i386
if (CPU.bRDTSC) if (CPU.bRDTSC)
{ {

2
src/common/platform/posix/osx/iwadpicker_cocoa.mm
View File

@ -375,6 +375,8 @@ static NSString* GetArchitectureString()
return @"i386"; return @"i386";
#elif defined __x86_64__ #elif defined __x86_64__
return @"x86_64"; return @"x86_64";
#elif defined __aarch64__
return @"arm64";
#endif #endif
} }