diff options
| author | Lv Zheng | 2016-08-04 16:45:47 +0800 |
|---|---|---|
| committer | Rafael J. Wysocki | 2016-08-13 03:16:39 +0200 |
| commit | 34f3a91b3bf3e886c83309fc9f9c27765c27e16d (patch) | |
| tree | 375dc414b009cc71e3225866ff7af208da5e630e /include/acpi/platform/acenvex.h | |
| parent | 9fa1cebdbfff3db8953cebca8ee327d75edefc40 (diff) | |
ACPICA: OSL: Fix a regression that old GCC requires a workaround for strchr()
ACPICA commit be836c36454a624a4fb1d17234080ef8c07993fc
There is a GCC false-warning issue on specific GCC versions that
"strchr" will be preprocessed and extracted to contain
!__buildin_constant_p() checker and it surely is a constant logical
value "1" for strchr() arguments. Then -Wlogical-op errorneously reports a
warning.
The regression is triggered after the standard headers are re-ordered in
the EFI porting task. This patch fixes this regression by moving the
workaround to a new position after including all other standard headers.
Link: https://github.com/acpica/acpica/commit/be836c36
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>
Diffstat (limited to 'include/acpi/platform/acenvex.h')
| -rw-r--r-- | include/acpi/platform/acenvex.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/acpi/platform/acenvex.h b/include/acpi/platform/acenvex.h index 060fb08e643b..b3171b9d6974 100644 --- a/include/acpi/platform/acenvex.h +++ b/include/acpi/platform/acenvex.h @@ -69,7 +69,10 @@ #endif -#if defined(_MSC_VER) +#if defined(__GNUC__) && !defined(__INTEL_COMPILER) +#include "acgccex.h" + +#elif defined(_MSC_VER) #include "acmsvcex.h" #endif |