diff mbox series

[1/2] arm/tf-a-tests: Workaround GCC errors for 'unused-but-set-variable'

Message ID 20260602125811.54843-1-jon.mason@arm.com
State New
Headers show
Series [1/2] arm/tf-a-tests: Workaround GCC errors for 'unused-but-set-variable' | expand

Commit Message

Jon Mason June 2, 2026, 12:58 p.m. UTC 
New GCC is logging errors for unused-but-set-variable in
tftf/tests/runtime_services/standard_service/psci/api_tests/psci_stat/test_psci_stat.c

Workaround this by adding -Wno-unused-but-set-variable to the Makefile
Refer to https://github.com/TrustedFirmware-A/tf-a-tests/issues/4
For the upstream resolution, if/when that arrives.

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 ...1-Fix-GCC-errors-in-test_psci_stat.c.patch | 41 +++++++++++++++++++
 .../trusted-firmware-a/tf-a-tests_2.14.0.bb   |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/0001-Fix-GCC-errors-in-test_psci_stat.c.patch
diff mbox series

Patch

diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-Fix-GCC-errors-in-test_psci_stat.c.patch b/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-Fix-GCC-errors-in-test_psci_stat.c.patch
new file mode 100644
index 000000000000..a03fb8405832
--- /dev/null
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-Fix-GCC-errors-in-test_psci_stat.c.patch
@@ -0,0 +1,41 @@ 
+From 042dcbc95249a2311e8a784fa7193299aa2ad651 Mon Sep 17 00:00:00 2001
+From: Jon Mason <jon.mason@arm.com>
+Date: Sat, 30 May 2026 10:24:53 -0400
+Subject: [PATCH] Fix GCC errors in test_psci_stat.c
+
+With the latest GCC, we're seeing the errors:
+
+| tftf/tests/runtime_services/standard_service/psci/api_tests/psci_stat/test_psci_stat.c: In function 'test_psci_stats_cpu_off':
+| tftf/tests/runtime_services/standard_service/psci/api_tests/psci_stat/test_psci_stat.c:681:23: error: variable 'off_cpu_count' set but not used [-Werror=unused-but-set-variable=]
+|   681 |         int cpu_node, off_cpu_count = 0, ret;
+|       |                       ^~~~~~~~~~~~~
+| tftf/tests/runtime_services/standard_service/psci/api_tests/psci_stat/test_psci_stat.c: In function 'test_psci_stats_system_suspend':
+| tftf/tests/runtime_services/standard_service/psci/api_tests/psci_stat/test_psci_stat.c:800:23: error: variable 'off_cpu_count' set but not used [-Werror=unused-but-set-variable=]
+|   800 |         int cpu_node, off_cpu_count = 0;
+|       |                       ^~~~~~~~~~~~~
+
+This is because assert is being #ifdef'ed out and thus the variable is
+never being used.  Add '-Wno-unused-but-set-variable' to the Makefile to
+workaround the issue.
+
+See https://github.com/TrustedFirmware-A/tf-a-tests/issues/4
+
+Signed-off-by: Jon Mason <jon.mason@arm.com>
+Upstream-Status: Pending
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 9d222acc30b4..806329382da5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -277,7 +277,7 @@ GCC_ASFLAGS_aarch64	:=	-mgeneral-regs-only ${march64-directive}
+ 
+ GCC_WARNINGS		+=	-nostdinc -ffreestanding -Wall -Werror 	\
+ 				-Wmissing-include-dirs  $(GCC_CFLAGS_$(ARCH)) \
+-				-std=gnu99 -Os
++				-Wno-unused-but-set-variable -std=gnu99 -Os
+ 
+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105523
+ GCC_CFLAGS		+=	$(call cc_option, --param=min-pagesize=0)
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.14.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.14.0.bb
index dcd97d1a196d..a65106f24ede 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.14.0.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.14.0.bb
@@ -12,6 +12,8 @@  SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A_TESTS};branch=${SRCBRANCH}"
 SRCBRANCH = "master"
 SRCREV = "3b3d800133081b48482b1205a32671b82bc2b640"
 
+SRC_URI += "file://0001-Fix-GCC-errors-in-test_psci_stat.c.patch"
+
 EXTRA_OEMAKE += "USE_NVM=0"
 EXTRA_OEMAKE += "SHELL_COLOR=1"
 EXTRA_OEMAKE += "DEBUG=1"