rpms/acpica-tools
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Cleanup the armv7hl build issues with string usage

Browse Source 
Signed-off-by: Al Stone <ahs3@redhat.com>
This commit is contained in:
Al Stone 2020-02-25 17:13:42 -07:00
parent cd3d796852
commit b2261cf6d3
3 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
acpica-tools.spec
View File

@ -48,7 +48,7 @@ Patch20: aslcodegen.patch
Patch21: facp.patch Patch21: facp.patch
Patch22: dup-symbol.patch Patch22: dup-symbol.patch
Patch23: no-common.patch Patch23: no-common.patch
Patch24: utstring.patch Patch24: armv7-str-fixes.patch
Patch25: dbtest.patch Patch25: dbtest.patch
BuildRequires: bison patchutils flex gcc BuildRequires: bison patchutils flex gcc
@ -125,7 +125,7 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
%patch21 -p1 -b .facp %patch21 -p1 -b .facp
%patch22 -p1 -b .dup-symbol %patch22 -p1 -b .dup-symbol
%patch23 -p1 -b .no-common %patch23 -p1 -b .no-common
%patch24 -p1 -b .utstring %patch24 -p1 -b .armv7-str-fixes
%patch25 -p1 -b .dbtest %patch25 -p1 -b .dbtest
cp -p %{SOURCE2} README.Fedora cp -p %{SOURCE2} README.Fedora

12
armv7-str-fixes.patch Normal file
View File

@ -0,0 +1,12 @@
diff -Naur acpica-unix2-20200214.orig/source/include/actypes.h acpica-unix2-20200214/source/include/actypes.h
--- acpica-unix2-20200214.orig/source/include/actypes.h 2020-02-25 15:41:26.479349637 -0700
+++ acpica-unix2-20200214/source/include/actypes.h 2020-02-25 15:44:49.519082258 -0700
@@ -561,7 +561,7 @@
#define ACPI_COPY_NAMESEG(dest,src) (*ACPI_CAST_PTR (UINT32, (dest)) = *ACPI_CAST_PTR (UINT32, (src)))
#else
#define ACPI_COMPARE_NAMESEG(a,b) (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_CAST_PTR (char, (b)), ACPI_NAMESEG_SIZE))
-#define ACPI_COPY_NAMESEG(dest,src) (strncpy (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAMESEG_SIZE))
+#define ACPI_COPY_NAMESEG(dest,src) (memcpy (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAMESEG_SIZE))
#endif
/* Support for the special RSDP signature (8 characters) */

28
utstring.patch
View File

@ -1,28 +0,0 @@
diff -Naur acpica-unix2-20200214.orig/source/components/utilities/utstring.c acpica-unix2-20200214/source/components/utilities/utstring.c
--- acpica-unix2-20200214.orig/source/components/utilities/utstring.c 2020-02-14 10:33:55.000000000 -0700
+++ acpica-unix2-20200214/source/components/utilities/utstring.c 2020-02-25 11:21:31.329016004 -0700
@@ -185,7 +185,7 @@
{
UINT32 i;
BOOLEAN FoundBadChar = FALSE;
- UINT32 OriginalName;
+ char OriginalName[ACPI_NAMESEG_SIZE+1];
ACPI_FUNCTION_NAME (UtRepairName);
@@ -228,13 +228,13 @@
{
ACPI_WARNING ((AE_INFO,
"Invalid character(s) in name (0x%.8X), repaired: [%4.4s]",
- OriginalName, Name));
+ (unsigned int)*OriginalName, Name));
}
else
{
ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
"Invalid character(s) in name (0x%.8X), repaired: [%4.4s]",
- OriginalName, Name));
+ (unsigned int)*OriginalName, Name));
}
}
}