From 0aa90902ee79c922de88bf909908c96cce4d732f Mon Sep 17 00:00:00 2001 From: Daniele Lacamera Date: Wed, 30 Oct 2024 12:18:22 +0100 Subject: [PATCH] ARMv7-M, ARMv8-M using Thumb2 version of ARMASM --- arch.mk | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/arch.mk b/arch.mk index aacb5c00f..55fcec200 100644 --- a/arch.mk +++ b/arch.mk @@ -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 + CORTEXM_ARM_EXTRA_CFLAGS+=-DWOLFSSL_ARMASM_THUMB2 endif ifeq ($(CORTEX_M33),1) CFLAGS+=-mcpu=cortex-m33 -DCORTEX_M33 @@ -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