From b8d03463ff688f3eafbac20e5a1e9f11a522f2f0 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Fri, 18 Mar 2022 16:09:50 -0600 Subject: [PATCH] Add two new patches to correct compilation errors in rawhide Signed-off-by: Al Stone --- dangling-ptr.patch | 24 ++++++++++++++++++++++++ uuid-len.patch | 12 ++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 dangling-ptr.patch create mode 100644 uuid-len.patch diff --git a/dangling-ptr.patch b/dangling-ptr.patch new file mode 100644 index 0000000..582fb9e --- /dev/null +++ b/dangling-ptr.patch @@ -0,0 +1,24 @@ +diff -Naur acpica-unix2-20211217/source/components/utilities/utdebug.c acpica-unix2-20211217.orig/source/components/utilities/utdebug.c +--- acpica-unix2-20211217/source/components/utilities/utdebug.c 2022-03-15 17:05:07.992387565 -0600 ++++ acpica-unix2-20211217.orig/source/components/utilities/utdebug.c 2021-12-17 10:48:16.000000000 -0700 +@@ -58,6 +58,10 @@ + static const char *AcpiGbl_FunctionExitPrefix = "----Exit-"; + + ++#if defined(__GNUC__) && (__GNUC__ > 11) ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wdangling-pointer" ++#endif + /******************************************************************************* + * + * FUNCTION: AcpiUtInitStackPtrTrace +@@ -114,6 +110,9 @@ + AcpiGbl_DeepestNesting = AcpiGbl_NestingLevel; + } + } ++#if defined(__GNUC__) && (__GNUC__ > 11) ++#pragma GCC diagnostic pop ++#endif + + + /******************************************************************************* diff --git a/uuid-len.patch b/uuid-len.patch new file mode 100644 index 0000000..26fd798 --- /dev/null +++ b/uuid-len.patch @@ -0,0 +1,12 @@ +diff -Naur acpica-unix2-20211217.orig/source/tools/acpiexec/aeregion.c acpica-unix2-20211217/source/tools/acpiexec/aeregion.c +--- acpica-unix2-20211217.orig/source/tools/acpiexec/aeregion.c 2021-12-17 10:48:17.000000000 -0700 ++++ acpica-unix2-20211217/source/tools/acpiexec/aeregion.c 2022-03-18 15:53:25.032687782 -0600 +@@ -97,7 +97,7 @@ + UINT32 Value1; + UINT32 Value2; + ACPI_RESOURCE *Resource; +- char Uuid[ACPI_PRM_INPUT_BUFFER_SIZE + 1]; ++ char Uuid[UUID_STRING_LENGTH + 1]; + + + ACPI_FUNCTION_NAME (AeRegionHandler);