Allow additional CFLAGS for extra sources

Since the addition of -Wconversion and -Wsign-conversion to the default
CFLAGS, compilation of the CMSIS files for AN547 fails.

This commit allows custom Makefiles to not only provide EXTRA_SOURCES
to specify additional sources, but also EXTRA_SOURCES_CFLAGS for additional
CFLAGS, which in particular may overwrite default CFLAGS (they apply later).

This is leveraged in the case of m55-an547/platform.mk to disable
conversion and sign-conversion warnings for all CMSIS files.

Signed-off-by: Hanno Becker <[email protected]>

Author: hanno-becker

test/baremetal/platform/m55-an547/platform.mk

@@ -59,4 +59,7 @@ LDFLAGS += \
 
 # Extra sources to be included in test binaries
 EXTRA_SOURCES = $(wildcard $(M55_AN547_PATH)/*.c)
+# The CMSIS files fail compilation if conversion warnings are enabled
+EXTRA_SOURCES_CFLAGS = -Wno-conversion -Wno-sign-conversion
+
 EXEC_WRAPPER := $(realpath $(PLATFORM_PATH)/exec_wrapper.py)

test/mk/components.mk

@@ -102,3 +102,10 @@ $(foreach scheme,mlkem512 mlkem768 mlkem1024, \
 $(ALL_TESTS:%=$(MLKEM512_DIR)/bin/%512): $(call MAKE_OBJS, $(MLKEM512_DIR), $(wildcard test/notrandombytes/*.c) $(EXTRA_SOURCES))
 $(ALL_TESTS:%=$(MLKEM768_DIR)/bin/%768): $(call MAKE_OBJS, $(MLKEM768_DIR), $(wildcard test/notrandombytes/*.c) $(EXTRA_SOURCES))
 $(ALL_TESTS:%=$(MLKEM1024_DIR)/bin/%1024): $(call MAKE_OBJS, $(MLKEM1024_DIR), $(wildcard test/notrandombytes/*.c) $(EXTRA_SOURCES))
+
+# Apply EXTRA_CFLAGS to EXTRA_SOURCES object files
+ifneq ($(EXTRA_SOURCES),)
+$(call MAKE_OBJS, $(MLKEM512_DIR), $(EXTRA_SOURCES)): CFLAGS += $(EXTRA_SOURCES_CFLAGS)
+$(call MAKE_OBJS, $(MLKEM768_DIR), $(EXTRA_SOURCES)): CFLAGS += $(EXTRA_SOURCES_CFLAGS)
+$(call MAKE_OBJS, $(MLKEM1024_DIR), $(EXTRA_SOURCES)): CFLAGS += $(EXTRA_SOURCES_CFLAGS)
+endif