Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ARMv7-M, ARMv8-M using Thumb2 version of ARMASM #515

Merged
merged 2 commits into from
Oct 30, 2024
Merged

ARMv7-M, ARMv8-M using Thumb2 version of ARMASM #515

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0aa9090
ARMv7-M, ARMv8-M using Thumb2 version of ARMASM
danielinux Oct 30, 2024
da5d10d
Cortex-M: remove ARMASM_INLINE
danielinux Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 13 additions & 18 deletions arch.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,24 +211,21 @@ else
./lib/wolfssl/wolfcrypt/src/port/arm/armv8-chacha.o \
./lib/wolfssl/wolfcrypt/src/port/arm/armv8-sha256.o \
./lib/wolfssl/wolfcrypt/src/port/arm/armv8-sha512.o \
./lib/wolfssl/wolfcrypt/src/port/arm/armv8-32-aes-asm.o \
./lib/wolfssl/wolfcrypt/src/port/arm/armv8-32-aes-asm_c.o \
./lib/wolfssl/wolfcrypt/src/port/arm/armv8-32-sha256-asm.o \
./lib/wolfssl/wolfcrypt/src/port/arm/armv8-32-sha256-asm_c.o \
./lib/wolfssl/wolfcrypt/src/port/arm/armv8-32-sha512-asm.o \
./lib/wolfssl/wolfcrypt/src/port/arm/armv8-32-sha512-asm_c.o \
./lib/wolfssl/wolfcrypt/src/port/arm/armv8-32-sha3-asm.o \
./lib/wolfssl/wolfcrypt/src/port/arm/armv8-32-sha3-asm_c.o \
./lib/wolfssl/wolfcrypt/src/port/arm/armv8-32-chacha-asm.o \
./lib/wolfssl/wolfcrypt/src/port/arm/armv8-32-chacha-asm_c.o


CORTEXM_ARM_THUMB_EXTRA_OBJS= \
./lib/wolfssl/wolfcrypt/src/port/arm/thumb2-aes-asm.o \
./lib/wolfssl/wolfcrypt/src/port/arm/thumb2-aes-asm_c.o \
./lib/wolfssl/wolfcrypt/src/port/arm/thumb2-sha256-asm.o \
./lib/wolfssl/wolfcrypt/src/port/arm/thumb2-sha256-asm_c.o
./lib/wolfssl/wolfcrypt/src/port/arm/thumb2-sha256-asm_c.o \
./lib/wolfssl/wolfcrypt/src/port/arm/thumb2-sha512-asm.o \
./lib/wolfssl/wolfcrypt/src/port/arm/thumb2-sha512-asm_c.o \
./lib/wolfssl/wolfcrypt/src/port/arm/thumb2-sha3-asm.o \
./lib/wolfssl/wolfcrypt/src/port/arm/thumb2-sha3-asm_c.o \
./lib/wolfssl/wolfcrypt/src/port/arm/thumb2-chacha-asm.o \
./lib/wolfssl/wolfcrypt/src/port/arm/thumb2-chacha-asm_c.o


CORTEXM_ARM_EXTRA_CFLAGS+=-DWOLFSSL_ARMASM -DWOLFSSL_ARMASM_NO_HW_CRYPTO \
-DWOLFSSL_ARMASM_INLINE -DWOLFSSL_ARMASM_NO_NEON
-DWOLFSSL_ARMASM_NO_NEON
CORTEXM_ARM_EXTRA_CFLAGS+=-DWOLFSSL_ARMASM_THUMB2
endif
ifeq ($(CORTEX_M33),1)
CFLAGS+=-mcpu=cortex-m33 -DCORTEX_M33
Expand Down Expand Up @@ -281,9 +278,7 @@ else
else
CFLAGS+=-DWOLFSSL_SP_ASM -DWOLFSSL_SP_ARM_THUMB_ASM
MATH_OBJS += ./lib/wolfssl/wolfcrypt/src/sp_armthumb.o
# TODO: integrate thumb2-asm
#CFLAGS+=$(CORTEXM_ARM_EXTRA_CFLAGS) -DWOLFSSL_ARM_ARCH=6
#OBJS+=$(CORTEXM_ARM_THUMB_EXTRA_OBJS)
# No ARMASM support available for ARMv6-M.
endif
endif
else
Expand Down
Loading