Skip to content

Commit ebfe806

Browse files
committed
Fix stdlib in clang, limit test to a few targets
1 parent 3ecb535 commit ebfe806

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
@@ -78,7 +78,17 @@ jobs:
7878
sudo apt-get install -y gcc-arm-none-eabi gcc-aarch64-linux-gnu gcc-powerpc-linux-gnu gnu-efi
7979
8080
- name: Install Clang
81-
if: inputs.arch == 'arm' || inputs.arch == 'ARM'
81+
if: |
82+
inputs.config-file == './config/examples/stm32c0.config' ||
83+
inputs.config-file == './config/examples/stm32c0-rsa2048.config' ||
84+
inputs.config-file == './config/examples/stm32h5.config' ||
85+
inputs.config-file == './config/examples/stm32h5-dualbank.config' ||
86+
inputs.config-file == './config/examples/stm32h7.config' ||
87+
inputs.config-file == './config/examples/stm32h7-octospi.config' ||
88+
inputs.config-file == './config/examples/stm32u5.config' ||
89+
inputs.config-file == './config/examples/stm32u5-wolfcrypt-tz.config' ||
90+
inputs.config-file == './config/examples/stm32u5-nonsecure-dualbank.config' ||
91+
inputs.config-file == 'config/examples/stm32n567.config'
8292
run: |
8393
sudo apt-get install -y clang
8494
@@ -99,7 +109,17 @@ jobs:
99109
make ${{inputs.make-args}}
100110
101111
- name: Rebuild wolfboot with Clang
102-
if: inputs.arch == 'arm' || inputs.arch == 'ARM'
112+
if: |
113+
inputs.config-file == './config/examples/stm32c0.config' ||
114+
inputs.config-file == './config/examples/stm32c0-rsa2048.config' ||
115+
inputs.config-file == './config/examples/stm32h5.config' ||
116+
inputs.config-file == './config/examples/stm32h5-dualbank.config' ||
117+
inputs.config-file == './config/examples/stm32h7.config' ||
118+
inputs.config-file == './config/examples/stm32h7-octospi.config' ||
119+
inputs.config-file == './config/examples/stm32u5.config' ||
120+
inputs.config-file == './config/examples/stm32u5-wolfcrypt-tz.config' ||
121+
inputs.config-file == './config/examples/stm32u5-nonsecure-dualbank.config' ||
122+
inputs.config-file == 'config/examples/stm32n567.config'
103123
run: |
104124
make distclean
105125
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)