Skip to content

Commit 2e19dfc

Browse files
author
Arnaud Bouchez
committed
enhanced AARCH64 asm support
(follow-up of previous post)
1 parent abdc3eb commit 2e19dfc

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

src/core/mormot.core.os.posix.inc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2578,9 +2578,9 @@ begin
25782578
end;
25792579

25802580
{$ifdef CPUAARCH64}
2581-
{$ifdef OSLINUX}
2581+
{$ifdef OSLINUXANDROID}
25822582
// AARCH64 armv8.o is only validated on Linux
2583-
// (it should work on other ABI, but was reported to fail e.g. on Mac M1)
2583+
// (it should work on other POSIX ABI, but was reported to fail)
25842584

25852585
{$define ARMV8STATIC}
25862586
{$L ..\..\static\aarch64-linux\armv8.o} // ARMv8 crc32c Linux code
@@ -2590,7 +2590,7 @@ function crc32cby4arm64(crc, value: cardinal): cardinal; external;
25902590
procedure crc32blockarm64(crc128, data128: PBlock128); external;
25912591
procedure crc32blocksarm64(crc128, data128: PBlock128; count: integer); external;
25922592

2593-
{$endif OSLINUX}
2593+
{$endif OSLINUXANDROID}
25942594
{$endif CPUAARCH64}
25952595

25962596
function KB(Size: cardinal): shortstring;

src/crypt/mormot.crypt.core.pas

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ ESynCrypto = class(ESynException);
9191
{$ifdef CPUAARCH64}
9292
{$ifdef OSLINUXANDROID}
9393
{$define USEARMCRYPTO}
94+
// AARCH64 armv8.o / sha256armv8.o are only validated on Linux yet
95+
// (it should work on other POSIX ABI, but was reported to fail)
9496
{$endif OSLINUXANDROID}
9597
{$endif CPUAARCH64}
9698

@@ -3949,7 +3951,7 @@ procedure MakeDecrKeyPas(rounds: integer; k: PAWk);
39493951

39503952
{$ifdef CPUAARCH64}
39513953

3952-
{$L ..\..\static\aarch64-linux\armv8.o} // we can reuse Linux code on any POSIX
3954+
{$L ..\..\static\aarch64-linux\armv8.o} // could we reuse Linux .o on any POSIX?
39533955
{$L ..\..\static\aarch64-linux\sha256armv8.o}
39543956

39553957
procedure aesencryptarm128(rk, bi, bo: pointer); external;

src/mormot.commit.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
'2.0.1'
1+
'2.0.2'

0 commit comments

Comments
 (0)