From 9fa1cebdbfff3db8953cebca8ee327d75edefc40 Mon Sep 17 00:00:00 2001 From: Lv Zheng Date: Thu, 4 Aug 2016 16:45:40 +0800 Subject: [PATCH] ACPICA: OSL: Cleanup the inclusion order of the compiler-specific headers ACPICA commit a760a98ec84b1ec782e0bff5f6612af6fb89c10c Originally compiler specific headers are included by the host-specific headers. This makes build configuration management very inconvenient. And many inclusion order issues can be hidden accross different host OSes. It will then likely that some host builds will be broken just because of fixing some inclusion order issues for other host builds. This patch splits the compiler-specific header inclusions out of the host-specific headers so that compiler-specific inclusion order issues will not get entangled in the host-specific inclusion orders. Note that intel compiler defines __GNUC__, so this patch contains special handling because acintel.h and acgcc.h should be mutual exclusive. Link: https://github.com/acpica/acpica/commit/a760a98e Link: https://bugs.acpica.org/show_bug.cgi?id=1303 Signed-off-by: Lv Zheng Signed-off-by: Bob Moore Signed-off-by: Rafael J. Wysocki --- include/acpi/platform/acenv.h | 13 ++++++++++++- include/acpi/platform/acenvex.h | 8 +++++--- include/acpi/platform/aclinux.h | 4 ---- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h index f9af0e03e592..34cce729109c 100644 --- a/include/acpi/platform/acenv.h +++ b/include/acpi/platform/acenv.h @@ -166,10 +166,21 @@ /****************************************************************************** * * Host configuration files. The compiler configuration files are included - * by the host files. + * first. * *****************************************************************************/ +#if defined(__GNUC__) && !defined(__INTEL_COMPILER) +#include + +#elif defined(_MSC_VER) +#include "acmsvc.h" + +#elif defined(__INTEL_COMPILER) +#include "acintel.h" + +#endif + #if defined(_LINUX) || defined(__linux__) #include diff --git a/include/acpi/platform/acenvex.h b/include/acpi/platform/acenvex.h index 58ca39ce16d4..060fb08e643b 100644 --- a/include/acpi/platform/acenvex.h +++ b/include/acpi/platform/acenvex.h @@ -56,9 +56,6 @@ #if defined(_LINUX) || defined(__linux__) #include -#elif defined(WIN32) -#include "acwinex.h" - #elif defined(__DragonFly__) #include "acdragonflyex.h" @@ -72,6 +69,11 @@ #endif +#if defined(_MSC_VER) +#include "acmsvcex.h" + +#endif + /*! [End] no source code translation !*/ #endif /* __ACENVEX_H__ */ diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index 1380ec7035f8..a5d98d171866 100644 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h @@ -215,8 +215,4 @@ #endif /* __KERNEL__ */ -/* Linux uses GCC */ - -#include - #endif /* __ACLINUX_H__ */