git: 9f9dd3ded5dd - main - sysutils/acpica-tools: Fix build with LLVM 15
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 01 Mar 2023 00:25:29 UTC
The branch main has been updated by jkim:
URL: https://cgit.FreeBSD.org/ports/commit/?id=9f9dd3ded5dd6bba1e210d5583e93da431640fb5
commit 9f9dd3ded5dd6bba1e210d5583e93da431640fb5
Author: Jung-uk Kim <jkim@FreeBSD.org>
AuthorDate: 2023-03-01 00:24:08 +0000
Commit: Jung-uk Kim <jkim@FreeBSD.org>
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