From nobody Wed Mar 01 00:25:29 2023 X-Original-To: dev-commits-ports-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 4PRFPj6yRtz3v7w7; Wed, 1 Mar 2023 00:25:29 +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 4PRFPj6Nffz4Ltl; Wed, 1 Mar 2023 00:25:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677630329; 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=XZkeXbhmG4fwRRaCN5vKnzdFgOrJQyTqOQ7pkthEb7A=; b=aM4xGk37OE2vEqmBPmufNFoM2WJDLRZ/tqNgGEO/N/CbXMt5l1B6IUmkbf9A8M4/06ELjQ EcX8C+IW+RdN2NeWjRcXT+QGQNdnJVBH6BSBBP8h2gN50ZjAs6RHWbr1Qg4KDaPtX8nRFf b2gv97/ogdX+r46eLMa3doP8Qlt6+D60MDLwo3jJJ7hglqZuIOt/7qy+jGIMCOcVLt8yDh UkFW5WEqkq1JwvTp6bDBZi+lO8BrAzFzf4fbNgDepShvER8bojaaHwMMLWGARvYuBQYw7J 0a3MCGO+baN0+IwdN8BmcEdvgf9XHmcQzl0lSaY+scH53ez9S+H+IV3Xr1qADQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677630329; 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=XZkeXbhmG4fwRRaCN5vKnzdFgOrJQyTqOQ7pkthEb7A=; b=jwcECGZba83ZNGQor4cdi1k56H6Sc0Siq00i+jto4Z7ZjJ65vKG25MsxQL76/KTa2mUmEJ n2gCq8VgKmoBXeknHY1byJuI4i1Lti5A8MKGKjulKAEFHFc5e0I3/vSpf/DsYxNnp3fYhj Uc3tEvhzPxYLTdARuiPsHQ5YASN27pqhN/OoAYRLMg+c+vkOuCcqrZCHhLPD9mi0ufsNRh jlkhPkZrrU0clzsKu0VZrNyg4JZgv6CLjP5FMcquq7PO5fpwtKGsA335OrMhOTKcWIP2j3 MTQ98Gf8evXZ1/4TPYZDCkbslL56BmQFXenSoYPt246ArjP8PcnDKOGYNRLDcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677630329; a=rsa-sha256; cv=none; b=Vc4FfR88nqnULmraViAT7s92cqnq8VI53/3ocwXi1XN8A77P1eU+YU3NxbcrKLf2pSPJ59 lIiLTGKJoyt0fNGzdNRAGd6kcmAZtvptisNECmllUx1hgVOjIx/5j0ScyEZvriWfosocyt cK9NE1rTXbOApbW5ZmXiaK3eOWTDoUzz+avoblS3R17R7SgkCcmXeGhWRJPhgzUs6+lcFs 9EJdfTo5ddEYH50+Y1W1Fa1KmtqhkuYzqJRCsRa2LQ4CYx/0hrRUklaijO8BDZBUVBrmdT KOJMF/2w2w/dRUjmy13Tb8VdAEiJb/hoQoEgOastnr4xUdDOiLCZkLbIwBh0Og== 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 4PRFPj5Q4tz1SLP; Wed, 1 Mar 2023 00:25:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3210PTZc007423; Wed, 1 Mar 2023 00:25:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3210PTIS007422; Wed, 1 Mar 2023 00:25:29 GMT (envelope-from git) Date: Wed, 1 Mar 2023 00:25:29 GMT Message-Id: <202303010025.3210PTIS007422@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jung-uk Kim Subject: git: 9f9dd3ded5dd - main - sysutils/acpica-tools: Fix build with LLVM 15 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-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: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f9dd3ded5dd6bba1e210d5583e93da431640fb5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/ports/commit/?id=9f9dd3ded5dd6bba1e210d5583e93da431640fb5 commit 9f9dd3ded5dd6bba1e210d5583e93da431640fb5 Author: Jung-uk Kim AuthorDate: 2023-03-01 00:24:08 +0000 Commit: Jung-uk Kim CommitDate: 2023-03-01 00:24:08 +0000 sysutils/acpica-tools: Fix build with LLVM 15 PR: 269856 --- .../files/patch-source_common_dmextern.c | 24 +++++++ .../files/patch-source_compiler_aslrestype2s.c | 74 ++++++++++++++++++++++ .../files/patch-source_tools_acpisrc_asconvrt.c | 35 ++++++++++ 3 files changed, 133 insertions(+) diff --git a/sysutils/acpica-tools/files/patch-source_common_dmextern.c b/sysutils/acpica-tools/files/patch-source_common_dmextern.c new file mode 100644 index 000000000000..78aeb7569fd1 --- /dev/null +++ b/sysutils/acpica-tools/files/patch-source_common_dmextern.c @@ -0,0 +1,24 @@ +--- source/common/dmextern.c.orig 2022-10-20 21:12:58 UTC ++++ source/common/dmextern.c +@@ -1493,7 +1493,6 @@ AcpiDmMarkExternalConflict ( + ACPI_EXTERNAL_LIST *ExternalList = AcpiGbl_ExternalList; + char *ExternalPath; + char *InternalPath; +- char *Temp; + ACPI_STATUS Status; + + +@@ -1526,13 +1525,6 @@ AcpiDmMarkExternalConflict ( + + while (ExternalList) + { +- Temp = ExternalList->InternalPath; +- if ((*ExternalList->InternalPath == AML_ROOT_PREFIX) && +- (ExternalList->InternalPath[1])) +- { +- Temp++; +- } +- + if (!strcmp (ExternalList->InternalPath, InternalPath)) + { + ExternalList->Flags |= ACPI_EXT_CONFLICTING_DECLARATION; diff --git a/sysutils/acpica-tools/files/patch-source_compiler_aslrestype2s.c b/sysutils/acpica-tools/files/patch-source_compiler_aslrestype2s.c new file mode 100644 index 000000000000..352b930d4e07 --- /dev/null +++ b/sysutils/acpica-tools/files/patch-source_compiler_aslrestype2s.c @@ -0,0 +1,74 @@ +--- source/compiler/aslrestype2s.c.orig 2022-10-20 21:12:58 UTC ++++ source/compiler/aslrestype2s.c +@@ -1550,7 +1550,6 @@ RsDoPinFunctionDescriptor ( + UINT16 PinListLength; + UINT16 DescriptorSize; + UINT32 CurrentByteOffset; +- UINT32 PinCount = 0; + UINT32 i; + + InitializerOp = Info->DescriptorTypeOp->Asl.Child; +@@ -1668,15 +1667,10 @@ RsDoPinFunctionDescriptor ( + default: + /* + * PINs come through here, repeatedly. Each PIN must be a WORD. +- * NOTE: there is no "length" field for this, so from ACPI spec: +- * The number of pins in the table can be calculated from: +- * PinCount = (Resource Source Name Offset - Pin Table Offset) / 2 +- * (implies resource source must immediately follow the pin list.) + * Name: _PIN + */ + *PinList = (UINT16) InitializerOp->Asl.Value.Integer; + PinList++; +- PinCount++; + + /* Case 8: First pin number in list */ + +@@ -1736,7 +1730,6 @@ RsDoPinConfigDescriptor ( + UINT16 PinListLength; + UINT16 DescriptorSize; + UINT32 CurrentByteOffset; +- UINT32 PinCount = 0; + UINT32 i; + + InitializerOp = Info->DescriptorTypeOp->Asl.Child; +@@ -1868,15 +1861,10 @@ RsDoPinConfigDescriptor ( + default: + /* + * PINs come through here, repeatedly. Each PIN must be a WORD. +- * NOTE: there is no "length" field for this, so from ACPI spec: +- * The number of pins in the table can be calculated from: +- * PinCount = (Resource Source Name Offset - Pin Table Offset) / 2 +- * (implies resource source must immediately follow the pin list.) + * Name: _PIN + */ + *PinList = (UINT16) InitializerOp->Asl.Value.Integer; + PinList++; +- PinCount++; + + /* Case 8: First pin number in list */ + +@@ -1936,7 +1924,6 @@ RsDoPinGroupDescriptor ( + UINT16 PinListLength; + UINT16 DescriptorSize; + UINT32 CurrentByteOffset; +- UINT32 PinCount = 0; + UINT32 i; + + InitializerOp = Info->DescriptorTypeOp->Asl.Child; +@@ -2022,15 +2009,10 @@ RsDoPinGroupDescriptor ( + default: + /* + * PINs come through here, repeatedly. Each PIN must be a WORD. +- * NOTE: there is no "length" field for this, so from ACPI spec: +- * The number of pins in the table can be calculated from: +- * PinCount = (Resource Source Name Offset - Pin Table Offset) / 2 +- * (implies resource source must immediately follow the pin list.) + * Name: _PIN + */ + *PinList = (UINT16) InitializerOp->Asl.Value.Integer; + PinList++; +- PinCount++; + + /* Case 3: First pin number in list */ + diff --git a/sysutils/acpica-tools/files/patch-source_tools_acpisrc_asconvrt.c b/sysutils/acpica-tools/files/patch-source_tools_acpisrc_asconvrt.c new file mode 100644 index 000000000000..fb4420e741bf --- /dev/null +++ b/sysutils/acpica-tools/files/patch-source_tools_acpisrc_asconvrt.c @@ -0,0 +1,35 @@ +--- source/tools/acpisrc/asconvrt.c.orig 2022-10-20 21:13:02 UTC ++++ source/tools/acpisrc/asconvrt.c +@@ -1230,7 +1230,6 @@ AsTabify8 ( + char *NewSubBuffer; + char *CommentEnd = NULL; + UINT32 SpaceCount = 0; +- UINT32 Column = 0; + UINT32 TabCount = 0; + UINT32 LastLineTabCount = 0; + UINT32 LastLineColumnStart = 0; +@@ -1246,7 +1245,6 @@ AsTabify8 ( + /* This is a standalone blank line */ + + FirstNonBlank = NULL; +- Column = 0; + SpaceCount = 0; + TabCount = 0; + SubBuffer++; +@@ -1285,8 +1283,6 @@ AsTabify8 ( + } + } + +- Column++; +- + /* Check if we are in a comment */ + + if ((SubBuffer[0] == '*') && +@@ -1379,7 +1375,6 @@ AsTabify8 ( + + FirstNonBlank = NULL; + LastLineColumnStart = ThisColumnStart; +- Column = 0; + SpaceCount = 0; + } + else