From e93fcd7c88cb7ad600907bacc08e757f3ccf2dda Mon Sep 17 00:00:00 2001 From: Al Stone Date: Jan 31 2017 00:28:11 +0000 Subject: Add patch to fix arm7hl build. Signed-off-by: Al Stone --- diff --git a/acpica-tools.spec b/acpica-tools.spec index 1a65836..c448e65 100644 --- a/acpica-tools.spec +++ b/acpica-tools.spec @@ -37,6 +37,7 @@ Patch10: free.patch Patch11: update-big-endian.patch Patch12: aslts.patch Patch13: ppc64le.patch +Patch14: arm7hl.patch BuildRequires: bison patchutils flex @@ -100,6 +101,7 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f - %patch11 -p1 -b .update-big-endian %patch12 -p1 -b .aslts %patch13 -p1 -b .ppc64le +%patch14 -p1 -b .arm7hl cp -p %{SOURCE2} README.Fedora cp -p %{SOURCE3} iasl.1 @@ -199,6 +201,7 @@ fi - Refresh patches. - Add patch to fix ASLTS. - Add patch to fix ppc64le build. +- Add patch to fix arm7hl build. * Mon Jan 9 2017 Al Stone - 20161222-1 - Update to latest upstream. Closes BZ#1381017. diff --git a/arm7hl.patch b/arm7hl.patch new file mode 100644 index 0000000..fb10291 --- /dev/null +++ b/arm7hl.patch @@ -0,0 +1,20 @@ +diff -Naur acpica-unix2-20170119/source/include/acmacros.h acpica-unix2-20170119-arm7hl/source/include/acmacros.h +--- acpica-unix2-20170119/source/include/acmacros.h 2017-01-30 17:25:54.346151952 -0700 ++++ acpica-unix2-20170119-arm7hl/source/include/acmacros.h 2017-01-30 17:22:25.249388742 -0700 +@@ -178,6 +178,8 @@ + + /* 16-bit source, 16/32/64 destination */ + ++#define ACPI_MOVE_16_TO_8(d, s) {(( UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[0];} ++ + #define ACPI_MOVE_16_TO_16(d, s) {(( UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[0];\ + (( UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[1];} + +@@ -199,6 +201,7 @@ + + /* 64-bit source, 16/32/64 destination */ + ++#define ACPI_MOVE_64_TO_8(d, s) ACPI_MOVE_16_TO_8(d, s) /* Truncate to 8 */ + #define ACPI_MOVE_64_TO_16(d, s) ACPI_MOVE_16_TO_16(d, s) /* Truncate to 16 */ + #define ACPI_MOVE_64_TO_32(d, s) ACPI_MOVE_32_TO_32(d, s) /* Truncate to 32 */ + #define ACPI_MOVE_64_TO_64(d, s) {(( UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[0];\