@@ -369,27 +369,27 @@ swift::getSwiftRuntimeCompatibilityVersionForTarget(
369
369
if (Triple.isMacOSX ()) {
370
370
Triple.getMacOSXVersion (Major, Minor, Micro);
371
371
372
- auto floorFor64e = [&Triple](llvm::VersionTuple v) {
373
- if (Triple.getArchName () != " arm64e " ) return v;
374
- // macOS got first arm64e support in 11.0, i.e. VersionTuple(5, 3)
372
+ auto floorFor64 = [&Triple](llvm::VersionTuple v) {
373
+ if (! Triple.isAArch64 () ) return v;
374
+ // macOS got first arm64(e) support in 11.0, i.e. VersionTuple(5, 3)
375
375
return MAX (v, llvm::VersionTuple (5 , 3 ));
376
376
};
377
377
378
378
if (Major == 10 ) {
379
379
if (Triple.isAArch64 () && Minor <= 16 )
380
- return floorFor64e (llvm::VersionTuple (5 , 3 ));
380
+ return floorFor64 (llvm::VersionTuple (5 , 3 ));
381
381
382
382
if (Minor <= 14 ) {
383
- return floorFor64e (llvm::VersionTuple (5 , 0 ));
383
+ return floorFor64 (llvm::VersionTuple (5 , 0 ));
384
384
} else if (Minor <= 15 ) {
385
385
if (Micro <= 3 ) {
386
- return floorFor64e (llvm::VersionTuple (5 , 1 ));
386
+ return floorFor64 (llvm::VersionTuple (5 , 1 ));
387
387
} else {
388
- return floorFor64e (llvm::VersionTuple (5 , 2 ));
388
+ return floorFor64 (llvm::VersionTuple (5 , 2 ));
389
389
}
390
390
}
391
391
} else if (Major == 11 ) {
392
- return floorFor64e (llvm::VersionTuple (5 , 3 ));
392
+ return floorFor64 (llvm::VersionTuple (5 , 3 ));
393
393
}
394
394
} else if (Triple.isiOS ()) { // includes tvOS
395
395
Triple.getiOSVersion (Major, Minor, Micro);
0 commit comments