[PATCH] ACPICA: arm64: fix compile apci tools fail for arm64

From: Yisheng Xie
Date: Thu Oct 13 2016 - 20:00:45 EST


when try to cross compile acpi tool in dir kernel/tools
for arm64 use command:
make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- acpi
it failed with the following log:
In file included
from ../../../../../include/acpi/acpi.h:58:0,
from ../../../../../drivers/acpi/acpica/utstring.c:44:
../../../../../include/acpi/actypes.h:130:34: error: conflicting types for 's64'
typedef signed long long s64;
^
In file included
from /opt/aarch64-linux-gnu/libc/usr/include/asm-generic/types.h:6:0
from /opt/aarch64-linux-gnu/libc/usr/include/asm/types.h:1,
from ../../../../../include/uapi/linux/types.h:4,
from ../../../../../include/linux/types.h:5,
from /opt/aarch64-linux-gnu/libc/usr/include/asm/sigcontext.h:19,
from /opt/aarch64-linux-gnu/libc/usr/include/bits/sigcontext.h:27,
from /opt/aarch64-linux-gnu/libc/usr/include/signal.h:308,
from ../../../../../include/acpi/platform/acenv.h:365,
from ../../../../../include/acpi/acpi.h:56,
from ./acpidump.h:55,
from ../../os_specific/service_layers/oslinuxtbl.c:44:
../../../../../include/asm-generic/int-ll64.h:24:26: note: previous declaration of 's64' was here
typedef signed long long s64;
^
Fix this compile problem.

Fixes: e323c02dee59 ("ACPICA: MSVC9: Fix <sys/stat.h> inclusion order issue")
Signed-off-by: Yisheng Xie <xieyisheng1@xxxxxxxxxx>
---
include/acpi/platform/acenv.h | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h
index 34cce72..0089fa0 100644
--- a/include/acpi/platform/acenv.h
+++ b/include/acpi/platform/acenv.h
@@ -361,9 +361,13 @@
#include <stdio.h>
#include <fcntl.h>
#include <errno.h>
+#ifdef __aarch64__
+#include <sys/stat.h>
+#else
#include <time.h>
#include <signal.h>
#endif
+#endif

#endif /* ACPI_USE_STANDARD_HEADERS */

--
1.7.12.4