Skip to content

Commit e01c613

Browse files
committed
Fix CI tests
1 parent 8bfdf5b commit e01c613

4 files changed

Lines changed: 28 additions & 3 deletions

File tree

hal/stm32h7.ld

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ SECTIONS
2222
*(.ARM.exidx*)
2323
} > FLASH
2424

25+
.keystore :
26+
{
27+
. = ALIGN(4);
28+
KEEP(*(.keystore*))
29+
} > FLASH
30+
2531
_stored_data = .;
2632
.data : AT (_stored_data)
2733
{

options.mk

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,13 @@ ifeq ($(WOLFCRYPT_TZ_PKCS11),1)
803803
CFLAGS+=-DCK_CALLABLE="__attribute__((cmse_nonsecure_entry))"
804804
CFLAGS+=-I$(WOLFBOOT_LIB_WOLFPKCS11)
805805
CFLAGS+=-DWP11_HASH_PIN_COST=3
806-
LDFLAGS+=--specs=nano.specs
806+
ifeq ($(USE_CLANG),1)
807+
CLANG_MULTILIB_FLAGS:=$(filter -mthumb -mlittle-endian,$(LDFLAGS)) $(filter -mcpu=%,$(CFLAGS))
808+
LIBS+=$(shell $(CLANG_GCC_NAME) $(CLANG_MULTILIB_FLAGS) -print-file-name=libc.a)
809+
LIBS+=$(shell $(CLANG_GCC_NAME) $(CLANG_MULTILIB_FLAGS) -print-libgcc-file-name)
810+
else
811+
LDFLAGS+=--specs=nano.specs
812+
endif
807813
WOLFCRYPT_OBJS+=src/store_sbrk.o
808814
WOLFCRYPT_OBJS+=src/pkcs11_store.o
809815
WOLFCRYPT_OBJS+=src/pkcs11_callable.o
@@ -850,7 +856,13 @@ ifeq ($(WOLFCRYPT_TZ_PSA),1)
850856
CFLAGS+=-DNO_DES3 -DNO_DES3_TLS_SUITES
851857
WOLFPSA_CFLAGS+=-I$(WOLFBOOT_LIB_WOLFPSA)
852858
WOLFPSA_CFLAGS+=-I$(WOLFBOOT_LIB_WOLFPSA)/wolfpsa
853-
LDFLAGS+=--specs=nano.specs
859+
ifeq ($(USE_CLANG),1)
860+
CLANG_MULTILIB_FLAGS:=$(filter -mthumb -mlittle-endian,$(LDFLAGS)) $(filter -mcpu=%,$(CFLAGS))
861+
LIBS+=$(shell $(CLANG_GCC_NAME) $(CLANG_MULTILIB_FLAGS) -print-file-name=libc.a)
862+
LIBS+=$(shell $(CLANG_GCC_NAME) $(CLANG_MULTILIB_FLAGS) -print-libgcc-file-name)
863+
else
864+
LDFLAGS+=--specs=nano.specs
865+
endif
854866
WOLFCRYPT_OBJS+=src/store_sbrk.o
855867
WOLFCRYPT_OBJS+=src/psa_store.o
856868
WOLFCRYPT_OBJS+=src/arm_tee_psa_veneer.o

test-app/ARM-stm32h7.ld

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ SECTIONS
1818
_end_text = .;
1919
} > FLASH
2020

21+
.edidx :
22+
{
23+
. = ALIGN(4);
24+
*(.ARM.exidx*)
25+
} > FLASH
26+
2127
_stored_data = .;
2228

2329
.data : AT (_stored_data)

test-app/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,9 @@ ifeq ($(TZEN),1)
303303
CFLAGS+=-DWOLFBOOT_SECURE_CALLS
304304
ifneq ($(USE_CLANG),1)
305305
CFLAGS+=-Wstack-usage=19184
306+
LDFLAGS+=--specs=nosys.specs
306307
endif
307-
LDFLAGS+=--specs=nosys.specs -u _printf_float
308+
LDFLAGS+=-u _printf_float
308309
endif
309310
ifeq ($(WOLFCRYPT_TZ_PSA),1)
310311
CFLAGS+=-DWOLFCRYPT_TZ_PSA -DWOLFSSL_HAVE_PSA

0 commit comments

Comments
 (0)