Update to 20191213 upstream source, and GCC10

Signed-off-by: Al Stone <ahs3@redhat.com>
This commit is contained in:
Al Stone 2020-02-24 15:20:53 -07:00
parent 9a78de1296
commit 7ca9ff9b51
6 changed files with 74 additions and 24 deletions

2
.gitignore vendored
View File

@ -121,3 +121,5 @@ series
/acpitests-unix-20190816.tar.gz /acpitests-unix-20190816.tar.gz
/acpica-unix2-20191018.tar.gz /acpica-unix2-20191018.tar.gz
/acpitests-unix-20191018.tar.gz /acpitests-unix-20191018.tar.gz
/acpica-unix2-20191213.tar.gz
/acpitests-unix-20191213.tar.gz

View File

@ -1,6 +1,6 @@
Name: acpica-tools Name: acpica-tools
Version: 20191018 Version: 20191213
Release: 2%{?dist} Release: 1%{?dist}
Summary: ACPICA tools for the development and debug of ACPI tables Summary: ACPICA tools for the development and debug of ACPI tables
License: GPLv2 License: GPLv2
@ -46,7 +46,8 @@ Patch18: str-trunc-warn.patch
Patch19: ptr-cast.patch Patch19: ptr-cast.patch
Patch20: aslcodegen.patch Patch20: aslcodegen.patch
Patch21: facp.patch Patch21: facp.patch
Patch22: badexit.patch Patch22: dup-symbol.patch
Patch23: no-common.patch
BuildRequires: bison patchutils flex gcc BuildRequires: bison patchutils flex gcc
@ -120,7 +121,8 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
%patch19 -p1 -b .ptr-cast %patch19 -p1 -b .ptr-cast
%patch20 -p1 -b .aslcodegen %patch20 -p1 -b .aslcodegen
%patch21 -p1 -b .facp %patch21 -p1 -b .facp
%patch22 -p1 -b .badexit %patch22 -p1 -b .dup-symbol
%patch23 -p1 -b .no-common
cp -p %{SOURCE2} README.Fedora cp -p %{SOURCE2} README.Fedora
cp -p %{SOURCE3} iasl.1 cp -p %{SOURCE3} iasl.1
@ -237,6 +239,12 @@ fi
%changelog %changelog
* Sun Feb 23 2020 Al Stone <ahs3@redhat.com> - 20191213-1
- Update to 20191213 source tree, including patch refeshes.
- badexit patch no longer needed, so removed
- GCC10 enforces -fno-common now, catching multiple places where linkage
is not explicitly stated; added a patch to resolve the linker errors
* Sun Feb 23 2020 Al Stone <ahs3@redhat.com> - 20191018-2 * Sun Feb 23 2020 Al Stone <ahs3@redhat.com> - 20191018-2
- Upstream does not build from source -- this release not pushed into - Upstream does not build from source -- this release not pushed into
the archives and noted here just for record keeping the archives and noted here just for record keeping

View File

@ -1,18 +0,0 @@
When iasl is invoked with 'iasl -T ALL', and everything works correctly,
it still exits with a non-zero value. Exit with zero if all is well.
Signed-off-by: Al Stone <ahs3@redhat.com>
Index: acpica-unix-20191018/source/compiler/asloptions.c
===================================================================
--- acpica-unix-20191018.orig/source/compiler/asloptions.c
+++ acpica-unix-20191018/source/compiler/asloptions.c
@@ -111,7 +111,7 @@ AslCommandLine (
{
exit (-1);
}
- exit (1);
+ exit (0);
}
/* Next parameter must be the input filename */

22
dup-symbol.patch Normal file
View File

@ -0,0 +1,22 @@
diff -Naur acpica-unix2-20191213.orig/source/tools/acpiexec/aemain.c acpica-unix2-20191213/source/tools/acpiexec/aemain.c
--- acpica-unix2-20191213.orig/source/tools/acpiexec/aemain.c 2020-02-23 16:32:25.935853162 -0700
+++ acpica-unix2-20191213/source/tools/acpiexec/aemain.c 2020-02-23 16:44:38.949901103 -0700
@@ -84,7 +84,6 @@
UINT8 AcpiGbl_RegionFillValue = 0;
BOOLEAN AcpiGbl_IgnoreErrors = FALSE;
BOOLEAN AcpiGbl_AbortLoopOnTimeout = FALSE;
-BOOLEAN AcpiGbl_DbOpt_NoRegionSupport = FALSE;
UINT8 AcpiGbl_UseHwReducedFadt = FALSE;
BOOLEAN AcpiGbl_DoInterfaceTests = FALSE;
BOOLEAN AcpiGbl_LoadTestTables = FALSE;
@@ -549,6 +548,10 @@
goto NormalExit;
}
+ /* Initialize globals modified by command line options */
+
+ AcpiGbl_DbOpt_NoRegionSupport = FALSE;
+
/* Get the command line options */
ExitCode = AeDoOptions (argc, argv);

36
no-common.patch Normal file
View File

@ -0,0 +1,36 @@
diff -Naur acpica-unix2-20191213.orig/source/compiler/dtcompiler.h acpica-unix2-20191213/source/compiler/dtcompiler.h
--- acpica-unix2-20191213.orig/source/compiler/dtcompiler.h 2020-02-23 18:05:24.257395129 -0700
+++ acpica-unix2-20191213/source/compiler/dtcompiler.h 2020-02-23 18:06:42.956236378 -0700
@@ -351,7 +351,7 @@
/* dtparser - lex/yacc files */
-UINT64 DtCompilerParserResult; /* Expression return value */
+extern UINT64 DtCompilerParserResult; /* Expression return value */
int
DtCompilerParserparse (
void);
diff -Naur acpica-unix2-20191213.orig/source/compiler/aslcompiler.l acpica-unix2-20191213/source/compiler/aslcompiler.l
--- acpica-unix2-20191213.orig/source/compiler/aslcompiler.l 2019-12-13 08:58:18.000000000 -0700
+++ acpica-unix2-20191213/source/compiler/aslcompiler.l 2020-02-24 15:08:53.067560139 -0700
@@ -48,7 +48,7 @@
#include <stdlib.h>
#include <string.h>
-YYSTYPE AslCompilerlval;
+extern YYSTYPE AslCompilerlval;
/*
* Generation: Use the following command line:
diff -Naur acpica-unix2-20191213.orig/source/compiler/prparser.l acpica-unix2-20191213/source/compiler/prparser.l
--- acpica-unix2-20191213.orig/source/compiler/prparser.l 2019-12-13 08:58:19.000000000 -0700
+++ acpica-unix2-20191213/source/compiler/prparser.l 2020-02-24 15:09:25.909839732 -0700
@@ -116,7 +116,7 @@
/*
* Local support functions
*/
-YY_BUFFER_STATE LexBuffer;
+extern YY_BUFFER_STATE LexBuffer;
/******************************************************************************

View File

@ -1,2 +1,2 @@
SHA512 (acpica-unix2-20191018.tar.gz) = 4b6cfcfe7866f5cde8085d9deb539d7653043b806aa40466873bdc1e4e875c0be4b4906e53c087f9f34ec755518cb0a206b5107eae557b977a2a2ca184069244 SHA512 (acpica-unix2-20191213.tar.gz) = 144b8b8d56d3a1da0d11cbbfae7912860f995730c0d2ad34346ffcab3fa7fe9f907d14027b4ad7cc5b15d6ef6f6f9c44c34ee416e440ee578888c6dfcbf01cbf
SHA512 (acpitests-unix-20191018.tar.gz) = a51ef4c9dfad41bc34a8ec9c2251c8f9266ec20e7bff2f15c0244f06291ff665fb36825e2d60745179067f59f8be10e1a3b1f1496d25def6feb0d03a287be90d SHA512 (acpitests-unix-20191213.tar.gz) = 109f54dd5077a10a633afaa1436afdbcd55684d7c413ab361c5a355905dfe70cd351a861fd5f59ff0c0ea2f5a0fd934e701f16e31e7a5fbdf6bc11045a1be48a