From nobody Wed Jan 31 18:47:44 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQ9yT03Shz593DG; Wed, 31 Jan 2024 18:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TQ9yS5KmJz4SRf; Wed, 31 Jan 2024 18:47:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706726864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LR98SMg2VVfNxuZPvhHBw6K+A+HPDoaGo3PnCogmbmk=; b=VZpCkyOm4tcO4wIWLe2SAmnf3Qdf5X3U/dlpt+YSKhtNCaa8urLtCN8EGVwKRaa6ig1l74 UxHePFsRBHHslHk2Juj5ITRcf8KCoov3BB3WJpqiz6meTT2cCxbUSpHNuO0FI05WuUjfpy gx8EfBEHiF6y7+FdONqRzXlLxDGUJYghGFiLCNgFgeJsR9/07IEPYOIjLQJrmrXklPdum3 5pmSnwml8KuEz0G0zOYoxy2ukrtIdX4K695uAMJvC8jM/D8b/O3dOhOa3eM+JwluuiFaTo 3mXQdDKa5kbtxNOWulNgrKsIwhqeLEnjFNX2phqJUD3gSMxuPIhF/JHW5/9kIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706726864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LR98SMg2VVfNxuZPvhHBw6K+A+HPDoaGo3PnCogmbmk=; b=r8dhdGqpELx0KPpPome0ev0gIMaDZ8ZuZKqtZqLuOVl9KgNLObB01tE187AwPecRWnJUF4 SNUr/hP74mVc/iODwuSSxj36+NKHRMEI4UvE0cfMP5y8E9zcTED1wYyzt1aHGak+LAYiLN vj4bn7kfamIXBwcg0RUxAuz/8f5H57c7rvDjqv66Kboj41U1PAP2DB9NhmLBuwNkP0zBKb 78RePTYHmEQT+w9XYybK1GBvU+MjZRljlPrqUUENpVjWXABpgJQuV8cu3ZL7uxXcgyUz96 b4KTzooDkyHp88Dt9hZ4zO1ZnT+y0ALTy1KCHF7Qdh3klLDK6FpF2fVw/rql8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706726864; a=rsa-sha256; cv=none; b=Vm4MmaOvCnyjqzF7siwRry1VIdFe5YoaPmKPQDxKEodaFZYG0+GsOYUoGc7BVOWDblc7jf T51+EU4t4PW2Iel5Uh5myFFulGTJWVc0VktKIkfmhuFcjxVezeS3LaTJR3hb3zZ+rvYBVd NklzftP8bJrpiV5NaSruYTXrZiDqmtrZlMAir/LXyROzpQbbQs+OtPt3u5FaQjuAMy8AgM 0c1lKqFFrIHQ+LG69TPegfRpSY9mMrUenBMvQvmnCRKIOSlQlRL/n3gh1tPVTLvPUnxK7/ BCLI4DOcZq9bVmywPmCd3GinDmP46wKjsUwJ0AJkvltGd/CP1q3H3bV/VvMoZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQ9yS4QV1zVn8; Wed, 31 Jan 2024 18:47:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40VIliIq079868; Wed, 31 Jan 2024 18:47:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40VIlioU079865; Wed, 31 Jan 2024 18:47:44 GMT (envelope-from git) Date: Wed, 31 Jan 2024 18:47:44 GMT Message-Id: <202401311847.40VIlioU079865@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jung-uk Kim Subject: git: 81bee6d793ee - main - acpica: Fix build with ACPICA 20230331 and later List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81bee6d793ee9543dc5391d980b0675cbdeb189a Auto-Submitted: auto-generated The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=81bee6d793ee9543dc5391d980b0675cbdeb189a commit 81bee6d793ee9543dc5391d980b0675cbdeb189a Author: Jung-uk Kim AuthorDate: 2024-01-31 18:41:29 +0000 Commit: Jung-uk Kim 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. */