git: 81bee6d793ee - main - acpica: Fix build with ACPICA 20230331 and later
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 31 Jan 2024 18:47:44 UTC
The branch main has been updated by jkim:
URL: https://cgit.FreeBSD.org/src/commit/?id=81bee6d793ee9543dc5391d980b0675cbdeb189a
commit 81bee6d793ee9543dc5391d980b0675cbdeb189a
Author: Jung-uk Kim <jkim@FreeBSD.org>
AuthorDate: 2024-01-31 18:41:29 +0000
Commit: Jung-uk Kim <jkim@FreeBSD.org>
CommitDate: 2024-01-31 18:41:29 +0000
acpica: Fix build with ACPICA 20230331 and later
ACPICA is using flexible arrays since 20230331 and it broke aarch64
build.
--- acpi_iort.o ---
/usr/src/sys/arm64/acpica/acpi_iort.c:103:4: error: field 'data' with
variable sized type 'union (unnamed union at
/usr/src/sys/arm64/acpica/acpi_iort.c:98:2)' not at the end of a struct
or class is a GNU extension [-Werror,-Wgnu-variable-sized-type-not-at-end]
103 | } data;
| ^
Reported by: bapt
Tested by: bapt
---
sys/arm64/acpica/acpi_iort.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys/arm64/acpica/acpi_iort.c b/sys/arm64/acpica/acpi_iort.c
index ef6557ff9c98..a0e24788b775 100644
--- a/sys/arm64/acpica/acpi_iort.c
+++ b/sys/arm64/acpica/acpi_iort.c
@@ -95,16 +95,16 @@ struct iort_node {
u_int nentries; /* items in array below */
u_int usecount; /* for bookkeeping */
u_int revision; /* node revision */
+ union {
+ struct iort_map_entry *mappings; /* node mappings */
+ struct iort_its_entry *its; /* ITS IDs array */
+ } entries;
union {
ACPI_IORT_ROOT_COMPLEX pci_rc; /* PCI root complex */
ACPI_IORT_SMMU smmu;
ACPI_IORT_SMMU_V3 smmu_v3;
struct iort_named_component named_comp;
} data;
- union {
- struct iort_map_entry *mappings; /* node mappings */
- struct iort_its_entry *its; /* ITS IDs array */
- } entries;
};
/* Lists for each of the types. */