mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3923 from dgarske/armv8

Browse Source 
ARMv8: do not compile code if module is disabled
This commit is contained in:
Sean Parkinson 2021-03-29 08:50:41 +10:00 committed by GitHub
commit c3fcb2e95f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wolfcrypt/src/port/arm/armv8-32-curve25519.S
View File

@ -23,7 +23,7 @@
* cd ../scripts
* ruby ./x25519/x25519.rb arm32 ../wolfssl/wolfcrypt/src/port/arm/armv8-32-curve25519.S
*/
#ifdef WOLFSSL_ARMASM
#if defined(WOLFSSL_ARMASM) && defined(HAVE_CURVE25519)
#ifndef __aarch64__
.text
.align 2
@ -6008,7 +6008,7 @@ fe_ge_sub:
pop {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.size fe_ge_sub,.-fe_ge_sub
#endif /* !__aarch64__ */
#endif /* WOLFSSL_ARMASM */
#endif /* WOLFSSL_ARMASM && HAVE_CURVE25519 */
#if defined(__linux__) && defined(__ELF__)
.section .note.GNU-stack,"",%progbits

4
wolfcrypt/src/port/arm/armv8-32-curve25519.c
View File

@ -23,7 +23,7 @@
* cd ../scripts
* ruby ./x25519/x25519.rb arm32 ../wolfssl/wolfcrypt/src/port/arm/armv8-32-curve25519.c
*/
#ifdef WOLFSSL_ARMASM
#if defined(WOLFSSL_ARMASM) && defined(HAVE_CURVE25519)
#ifndef __aarch64__
#include <stdint.h>
#ifdef HAVE_CONFIG_H
@ -5573,4 +5573,4 @@ void fe_ge_sub(fe rx, fe ry, fe rz, fe rt, const fe px, const fe py, const fe pz
}
#endif /* !__aarch64__ */
#endif /* WOLFSSL_ARMASM */
#endif /* WOLFSSL_ARMASM && HAVE_CURVE25519 */

4
wolfcrypt/src/port/arm/armv8-32-sha512-asm.S
View File

@ -23,7 +23,7 @@
* cd ../scripts
* ruby ./sha2/sha512.rb arm32 ../wolfssl/wolfcrypt/src/port/arm/armv8-32-sha512-asm.S
*/
#ifdef WOLFSSL_ARMASM
#if defined(WOLFSSL_ARMASM) && defined(WOLFSSL_SHA512)
#ifndef __aarch64__
#ifdef WOLFSSL_ARMASM_NO_NEON
.text
@ -5331,7 +5331,7 @@ L_sha512_len_neon_start:
.size Transform_Sha512_Len,.-Transform_Sha512_Len
#endif /* !WOLFSSL_ARMASM_NO_NEON */
#endif /* !__aarch64__ */
#endif /* WOLFSSL_ARMASM */
#endif /* WOLFSSL_ARMASM && WOLFSSL_SHA512 */
#if defined(__linux__) && defined(__ELF__)
.section .note.GNU-stack,"",%progbits

4
wolfcrypt/src/port/arm/armv8-32-sha512-asm.c
View File

@ -23,7 +23,7 @@
* cd ../scripts
* ruby ./sha2/sha512.rb arm32 ../wolfssl/wolfcrypt/src/port/arm/armv8-32-sha512-asm.c
*/
#ifdef WOLFSSL_ARMASM
#if defined(WOLFSSL_ARMASM) && defined(WOLFSSL_SHA512)
#ifndef __aarch64__
#include <stdint.h>
#ifdef HAVE_CONFIG_H
@ -4776,4 +4776,4 @@ void Transform_Sha512_Len(wc_Sha512* sha512, const byte* data, word32 len)
#endif /* !WOLFSSL_ARMASM_NO_NEON */
#endif /* !__aarch64__ */
#endif /* WOLFSSL_ARMASM */
#endif /* WOLFSSL_ARMASM && WOLFSSL_SHA512 */

4
wolfcrypt/src/port/arm/armv8-curve25519.S
View File

@ -28,7 +28,7 @@
* cd ../scripts
* ruby ./x25519/x25519.rb arm64 ../wolfssl/wolfcrypt/src/port/arm/armv8-curve25519.S
*/
#ifdef WOLFSSL_ARMASM
#if defined(WOLFSSL_ARMASM) && defined(HAVE_CURVE25519)
#ifdef __aarch64__
#ifndef __APPLE__
.text
@ -7472,7 +7472,7 @@ _fe_ge_sub:
.size fe_ge_sub,.-fe_ge_sub
#endif /* __APPLE__ */
#endif /* __aarch64__ */
#endif /* WOLFSSL_ARMASM */
#endif /* WOLFSSL_ARMASM && HAVE_CURVE25519 */
#if defined(__linux__) && defined(__ELF__)
.section .note.GNU-stack,"",%progbits

4
wolfcrypt/src/port/arm/armv8-curve25519.c
View File

@ -28,7 +28,7 @@
* cd ../scripts
* ruby ./x25519/x25519.rb arm64 ../wolfssl/wolfcrypt/src/port/arm/armv8-curve25519.c
*/
#ifdef WOLFSSL_ARMASM
#if defined(WOLFSSL_ARMASM) && defined(HAVE_CURVE25519)
#ifdef __aarch64__
#include <wolfssl/wolfcrypt/fe_operations.h>
@ -7217,4 +7217,4 @@ void fe_ge_sub(fe rx, fe ry, fe rz, fe rt, const fe px, const fe py, const fe pz
}
#endif /* __aarch64__ */
#endif /* WOLFSSL_ARMASM */
#endif /* WOLFSSL_ARMASM && HAVE_CURVE25519 */

4
wolfcrypt/src/port/arm/armv8-sha512-asm.S
View File

@ -28,7 +28,7 @@
* cd ../scripts
* ruby ./sha2/sha512.rb arm64 ../wolfssl/wolfcrypt/src/port/arm/armv8-sha512-asm.S
*/
#ifdef WOLFSSL_ARMASM
#if defined(WOLFSSL_ARMASM) && defined(WOLFSSL_SHA512)
#ifdef __aarch64__
#ifndef __APPLE__
.text
@ -1093,7 +1093,7 @@ L_sha512_len_neon_start:
.size Transform_Sha512_Len,.-Transform_Sha512_Len
#endif /* __APPLE__ */
#endif /* __aarch64__ */
#endif /* WOLFSSL_ARMASM */
#endif /* WOLFSSL_ARMASM && WOLFSSL_SHA512 */
#if defined(__linux__) && defined(__ELF__)
.section .note.GNU-stack,"",%progbits

4
wolfcrypt/src/port/arm/armv8-sha512-asm.c
View File

@ -28,7 +28,7 @@
* cd ../scripts
* ruby ./sha2/sha512.rb arm64 ../wolfssl/wolfcrypt/src/port/arm/armv8-sha512-asm.c
*/
#ifdef WOLFSSL_ARMASM
#if defined(WOLFSSL_ARMASM) && defined(WOLFSSL_SHA512)
#ifdef __aarch64__
#include <wolfssl/wolfcrypt/sha512.h>
@ -1050,4 +1050,4 @@ void Transform_Sha512_Len(wc_Sha512* sha512, const byte* data, word32 len)
}
#endif /* __aarch64__ */
#endif /* WOLFSSL_ARMASM */
#endif /* WOLFSSL_ARMASM && WOLFSSL_SHA512 */