diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-12-05 15:27:37 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-12-05 15:27:37 +0100 |
| commit | 6d9a9aa29b77a22f4de2e56b815639e06a876b48 (patch) | |
| tree | 7d3e9de8c7a63c62b6cf3c9cc0d34085cf6bd5d7 /src/crypto/zinc/chacha20 | |
| parent | c5591560ff58201c58379b80630134a1784bb36d (diff) | |
crypto: use new assembler macros for 5.5
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'src/crypto/zinc/chacha20')
| -rw-r--r-- | src/crypto/zinc/chacha20/chacha20-unrolled-arm.S | 8 | ||||
| -rw-r--r-- | src/crypto/zinc/chacha20/chacha20-x86_64.pl | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/crypto/zinc/chacha20/chacha20-unrolled-arm.S b/src/crypto/zinc/chacha20/chacha20-unrolled-arm.S index 2140319..8fb4bc2 100644 --- a/src/crypto/zinc/chacha20/chacha20-unrolled-arm.S +++ b/src/crypto/zinc/chacha20/chacha20-unrolled-arm.S @@ -394,7 +394,7 @@ * void chacha20_arm(u8 *out, const u8 *in, size_t len, const u32 key[8], * const u32 iv[4]); */ -ENTRY(chacha20_arm) +SYM_FUNC_START(chacha20_arm) cmp r2, #0 // len == 0? reteq lr @@ -428,12 +428,12 @@ ENTRY(chacha20_arm) add sp, #76 pop {r4-r11, pc} -ENDPROC(chacha20_arm) +SYM_FUNC_END(chacha20_arm) /* * void hchacha20_arm(const u32 state[16], u32 out[8]); */ -ENTRY(hchacha20_arm) +SYM_FUNC_START(hchacha20_arm) push {r1,r4-r11,lr} mov r14, r0 @@ -458,4 +458,4 @@ ENTRY(hchacha20_arm) stm r4, {X0,X1,X2,X3,X12,X13,X14,X15} pop {r4-r11,pc} -ENDPROC(hchacha20_arm) +SYM_FUNC_END(hchacha20_arm) diff --git a/src/crypto/zinc/chacha20/chacha20-x86_64.pl b/src/crypto/zinc/chacha20/chacha20-x86_64.pl index cec7572..29906a6 100644 --- a/src/crypto/zinc/chacha20/chacha20-x86_64.pl +++ b/src/crypto/zinc/chacha20/chacha20-x86_64.pl @@ -124,7 +124,7 @@ sub declare_function() { my ($name, $align, $nargs) = @_; if($kernel) { $code .= ".align $align\n"; - $code .= "ENTRY($name)\n"; + $code .= "SYM_FUNC_START($name)\n"; $code .= ".L$name:\n"; } else { $code .= ".globl $name\n"; @@ -137,7 +137,7 @@ sub declare_function() { sub end_function() { my ($name) = @_; if($kernel) { - $code .= "ENDPROC($name)\n"; + $code .= "SYM_FUNC_END($name)\n"; } else { $code .= ".size $name,.-$name\n"; } |