From eed791e8510662a87de756ff0fb68349b2822a96 Mon Sep 17 00:00:00 2001 From: Elyes Haouas Date: Sun, 2 Jun 2024 10:45:48 +0000 Subject: [PATCH] Revert "tree: Use Wcalloc-transposed-args command option" This reverts commit b3db3abd6311924930f3250c9f9fc3157fbbf7da. Reason for revert: `Wcalloc-transposed-args` is new command option came with GCC-14. older versions will not support it. Change-Id: I74ef8de1f7d38e1e0519c3b41e79fd9b11d8e16f Signed-off-by: Elyes Haouas Reviewed-on: https://review.coreboot.org/c/coreboot/+/82759 Reviewed-by: Nico Huber Reviewed-by: Angel Pons Tested-by: build bot (Jenkins) --- Makefile.mk | 1 - src/southbridge/intel/common/rcba_pirq.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.mk b/Makefile.mk index e406702552..0358c8833f 100644 --- a/Makefile.mk +++ b/Makefile.mk @@ -502,7 +502,6 @@ CFLAGS_common += -fstrict-aliasing -ffunction-sections -fdata-sections -fno-pie CFLAGS_common += -Wstring-compare ifeq ($(CONFIG_COMPILER_GCC),y) CFLAGS_common += -Wold-style-declaration -Wflex-array-member-not-at-end -CFLAGS_common += -Wcalloc-transposed-args # Don't add these GCC specific flags when running scan-build ifeq ($(CCC_ANALYZER_OUTPUT_FORMAT),) CFLAGS_common += -Wno-packed-not-aligned diff --git a/src/southbridge/intel/common/rcba_pirq.c b/src/southbridge/intel/common/rcba_pirq.c index 956fe633da..c9ab140c6f 100644 --- a/src/southbridge/intel/common/rcba_pirq.c +++ b/src/southbridge/intel/common/rcba_pirq.c @@ -59,7 +59,7 @@ void intel_acpi_gen_def_acpi_pirq(const struct device *lpc) printk(BIOS_DEBUG, "Generating ACPI PIRQ entries\n"); - pin_irq_map = calloc(MAX_SLOTS * PCI_INT_MAX, sizeof(struct slot_pin_irq_map)); + pin_irq_map = calloc(sizeof(struct slot_pin_irq_map), MAX_SLOTS * PCI_INT_MAX); pirq_map.type = PIRQ_SOURCE_PATH; for (i = 0; i < PIRQ_COUNT; i++) snprintf(pirq_map.source_path[i], sizeof(pirq_map.source_path[i]),