Skip to content

Commit bc79dbf

Browse files
committed
Fix CI false positive Stack usage warnings with wolfTPM
1 parent cf1b841 commit bc79dbf

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

options.mk

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,10 @@ ifeq ($(WOLFBOOT_SMALL_STACK),1)
131131
OBJS+=./src/xmalloc.o
132132
endif
133133

134+
# GCC 13 overestimates some wolfTPM wrapper stack usage; keep TPM
135+
# limits above 10 KB to avoid false -Wstack-usage failures.
136+
STACK_USAGE_WOLFTPM=10680
137+
134138

135139
ECC_OBJS= \
136140
$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/ecc.o
@@ -192,7 +196,7 @@ ifeq ($(SIGN),ECC256)
192196
STACK_USAGE=4096
193197
else
194198
ifeq ($(WOLFTPM),1)
195-
STACK_USAGE=7616
199+
STACK_USAGE=$(STACK_USAGE_WOLFTPM)
196200
else
197201
ifneq ($(SPMATH),1)
198202
STACK_USAGE=5264
@@ -216,7 +220,7 @@ ifeq ($(SIGN),ECC384)
216220
STACK_USAGE=5880
217221
else
218222
ifeq ($(WOLFTPM),1)
219-
STACK_USAGE=6680
223+
STACK_USAGE=$(STACK_USAGE_WOLFTPM)
220224
else
221225
ifneq ($(SPMATH),1)
222226
STACK_USAGE=11248
@@ -240,7 +244,7 @@ ifeq ($(SIGN),ECC521)
240244
STACK_USAGE=4096
241245
else
242246
ifeq ($(WOLFTPM),1)
243-
STACK_USAGE=6680
247+
STACK_USAGE=$(STACK_USAGE_WOLFTPM)
244248
else
245249
ifneq ($(SPMATH),1)
246250
STACK_USAGE=11256
@@ -261,7 +265,7 @@ ifeq ($(SIGN),ED25519)
261265
WOLFCRYPT_OBJS+=$(ED25519_OBJS)
262266
CFLAGS+=-D"WOLFBOOT_SIGN_ED25519"
263267
ifeq ($(WOLFTPM),1)
264-
STACK_USAGE=6680
268+
STACK_USAGE=$(STACK_USAGE_WOLFTPM)
265269
else
266270
STACK_USAGE?=5000
267271
endif
@@ -275,7 +279,7 @@ ifeq ($(SIGN),ED448)
275279
SIGN_OPTIONS+=--ed448
276280
WOLFCRYPT_OBJS+= $(ED448_OBJS)
277281
ifeq ($(WOLFTPM),1)
278-
STACK_USAGE=6680
282+
STACK_USAGE=$(STACK_USAGE_WOLFTPM)
279283
else
280284
ifeq ($(WOLFBOOT_SMALL_STACK),1)
281285
STACK_USAGE?=1024
@@ -313,7 +317,7 @@ ifneq ($(findstring RSA2048,$(SIGN)),)
313317
endif
314318
else
315319
ifeq ($(WOLFTPM),1)
316-
STACK_USAGE=9096
320+
STACK_USAGE=$(STACK_USAGE_WOLFTPM)
317321
else
318322
ifneq ($(SPMATH),1)
319323
STACK_USAGE=35952
@@ -346,7 +350,7 @@ ifneq ($(findstring RSA3072,$(SIGN)),)
346350
endif
347351
else
348352
ifeq ($(WOLFTPM),1)
349-
STACK_USAGE=9096
353+
STACK_USAGE=$(STACK_USAGE_WOLFTPM)
350354
else
351355
ifneq ($(SPMATH),1)
352356
STACK_USAGE=52592
@@ -383,7 +387,7 @@ ifneq ($(findstring RSA4096,$(SIGN)),)
383387
endif
384388
else
385389
ifeq ($(WOLFTPM),1)
386-
STACK_USAGE=10680
390+
STACK_USAGE=$(STACK_USAGE_WOLFTPM)
387391
else
388392
ifneq ($(SPMATH),1)
389393
STACK_USAGE=69232

0 commit comments

Comments
 (0)