Skip to content

Commit 1911aad

Browse files
author
Arnaud Bouchez
committed
try to fix armv8.o linking when cross-compiling
1 parent 8e7875b commit 1911aad

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/crypt/mormot.crypt.core.pas

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3952,9 +3952,7 @@ procedure MakeDecrKeyPas(rounds: integer; k: PAWk);
39523952

39533953
{$ifdef CPUAARCH64}
39543954

3955-
{$L ..\..\static\aarch64-linux\armv8.o} // could we reuse Linux .o on any POSIX?
3956-
{$L ..\..\static\aarch64-linux\sha256armv8.o}
3957-
3955+
// aes/gcm code is already included in armv8.o from mormot.core.os:
39583956
procedure aesencryptarm128(rk, bi, bo: pointer); external;
39593957
procedure aesencryptarm192(rk, bi, bo: pointer); external;
39603958
procedure aesencryptarm256(rk, bi, bo: pointer); external;
@@ -3963,6 +3961,8 @@ procedure aesdecryptarm128(rk, bi, bo: pointer); external;
39633961
procedure aesdecryptarm192(rk, bi, bo: pointer); external;
39643962
procedure aesdecryptarm256(rk, bi, bo: pointer); external;
39653963
procedure gf_mul_h_arm(a, b: pointer); external;
3964+
3965+
{$L ..\..\static\aarch64-linux\sha256armv8.o}
39663966
procedure sha256_block_data_order(ctx, bi: pointer; count: PtrInt); external;
39673967

39683968
{$endif CPUAARCH64}

src/mormot.commit.inc

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

0 commit comments

Comments
 (0)