openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <lv.zheng@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Lv Zheng 2016-08-04 16:45:40 +08:00 committed by Rafael J. Wysocki
parent d2d48eae46
commit 9fa1cebdbf
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/acpi/platform/acenv.h
View File

@ -166,10 +166,21 @@
/****************************************************************************** /******************************************************************************
* *
* Host configuration files. The compiler configuration files are included * Host configuration files. The compiler configuration files are included
* by the host files. * first.
* *
*****************************************************************************/ *****************************************************************************/
#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
#include <acpi/platform/acgcc.h>
#elif defined(_MSC_VER)
#include "acmsvc.h"
#elif defined(__INTEL_COMPILER)
#include "acintel.h"
#endif
#if defined(_LINUX) || defined(__linux__) #if defined(_LINUX) || defined(__linux__)
#include <acpi/platform/aclinux.h> #include <acpi/platform/aclinux.h>

8
include/acpi/platform/acenvex.h
View File

@ -56,9 +56,6 @@
#if defined(_LINUX) || defined(__linux__) #if defined(_LINUX) || defined(__linux__)
#include <acpi/platform/aclinuxex.h> #include <acpi/platform/aclinuxex.h>
#elif defined(WIN32)
#include "acwinex.h"
#elif defined(__DragonFly__) #elif defined(__DragonFly__)
#include "acdragonflyex.h" #include "acdragonflyex.h"
@ -72,6 +69,11 @@
#endif #endif
#if defined(_MSC_VER)
#include "acmsvcex.h"
#endif
/*! [End] no source code translation !*/ /*! [End] no source code translation !*/
#endif /* __ACENVEX_H__ */ #endif /* __ACENVEX_H__ */

4
include/acpi/platform/aclinux.h
View File

@ -215,8 +215,4 @@
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
/* Linux uses GCC */
#include <acpi/platform/acgcc.h>
#endif /* __ACLINUX_H__ */ #endif /* __ACLINUX_H__ */