Skip to content

Commit f7b2e5a

Browse files
danielinuxmattia-moffa
authored andcommitted
Fix stdlib in clang, limit test to a few targets
1 parent f6ec476 commit f7b2e5a

3 files changed

Lines changed: 26 additions & 4 deletions

File tree

.github/workflows/test-build.yml

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,17 @@ jobs:
3131
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
3232

3333
- name: Install Clang
34-
if: inputs.arch == 'arm' || inputs.arch == 'ARM'
34+
if: |
35+
inputs.config-file == './config/examples/stm32c0.config' ||
36+
inputs.config-file == './config/examples/stm32c0-rsa2048.config' ||
37+
inputs.config-file == './config/examples/stm32h5.config' ||
38+
inputs.config-file == './config/examples/stm32h5-dualbank.config' ||
39+
inputs.config-file == './config/examples/stm32h7.config' ||
40+
inputs.config-file == './config/examples/stm32h7-octospi.config' ||
41+
inputs.config-file == './config/examples/stm32u5.config' ||
42+
inputs.config-file == './config/examples/stm32u5-wolfcrypt-tz.config' ||
43+
inputs.config-file == './config/examples/stm32u5-nonsecure-dualbank.config' ||
44+
inputs.config-file == 'config/examples/stm32n567.config'
3545
run: |
3646
sudo apt-get install -y clang
3747
@@ -52,7 +62,17 @@ jobs:
5262
make ${{inputs.make-args}}
5363
5464
- name: Rebuild wolfboot with Clang
55-
if: inputs.arch == 'arm' || inputs.arch == 'ARM'
65+
if: |
66+
inputs.config-file == './config/examples/stm32c0.config' ||
67+
inputs.config-file == './config/examples/stm32c0-rsa2048.config' ||
68+
inputs.config-file == './config/examples/stm32h5.config' ||
69+
inputs.config-file == './config/examples/stm32h5-dualbank.config' ||
70+
inputs.config-file == './config/examples/stm32h7.config' ||
71+
inputs.config-file == './config/examples/stm32h7-octospi.config' ||
72+
inputs.config-file == './config/examples/stm32u5.config' ||
73+
inputs.config-file == './config/examples/stm32u5-wolfcrypt-tz.config' ||
74+
inputs.config-file == './config/examples/stm32u5-nonsecure-dualbank.config' ||
75+
inputs.config-file == 'config/examples/stm32n567.config'
5676
run: |
5777
make distclean
5878
cp ${{inputs.config-file}} .config

arch.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1300,7 +1300,6 @@ ifeq ($(USE_CLANG),1)
13001300
CFLAGS+=-DWOLFSSL_NO_ATOMIC -DWOLFSSL_NO_ATOMICS
13011301
CFLAGS+=-Wno-unknown-attributes -Wno-error=unknown-attributes
13021302
CFLAGS+=-fno-unwind-tables -fno-asynchronous-unwind-tables
1303-
LDFLAGS+=-nostdlib
13041303
LSCRIPT_FLAGS+=-T hal/clang-discard.ld
13051304
endif
13061305

test-app/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,10 @@ ifeq ($(TZEN),1)
305305
WOLFCRYPT_APP_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/random.o
306306
endif
307307
endif
308-
CFLAGS+=-DWOLFBOOT_SECURE_CALLS -Wstack-usage=19184
308+
CFLAGS+=-DWOLFBOOT_SECURE_CALLS
309+
ifneq ($(USE_CLANG),1)
310+
CFLAGS+=-Wstack-usage=19184
311+
endif
309312
LDFLAGS+=--specs=nosys.specs -u _printf_float
310313
endif
311314
ifeq ($(WOLFCRYPT_TZ_PSA),1)

0 commit comments

Comments
 (0)