diff options
| author | Uros Bizjak <ubizjak@gmail.com> | 2014-11-20 11:43:45 +0100 |
|---|---|---|
| committer | Uros Bizjak <uros@gcc.gnu.org> | 2014-11-20 11:43:45 +0100 |
| commit | 8a23b1006359c176dcc6cfd0a6a7cabcf58687c7 (patch) | |
| tree | d52f51303885afd5b826b8def36df3e892c52422 /libcpp | |
| parent | 3cb9a885dfef841f13f4b96fb5b1fae318f4a8bb (diff) | |
re PR target/63966 (inconsistent operand constraints compiling build libcpp)
PR target/63966
* lex.c [__i386__ || __x86_64__]: Include system <cpuid.h> for
GCC_VERSION < 5000.
From-SVN: r217830
Diffstat (limited to 'libcpp')
| -rw-r--r-- | libcpp/ChangeLog | 6 | ||||
| -rw-r--r-- | libcpp/lex.c | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 5814dc4da18..66cc81a377d 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,9 @@ +2014-11-20 Uros Bizjak <ubizjak@gmail.com> + + PR target/63966 + * lex.c [__i386__ || __x86_64__]: Include system <cpuid.h> for + GCC_VERSION < 5000. + 2014-11-13 Manuel López-Ibáñez <manu@gcc.gnu.org> * include/line-map.h: Include EXPR, so that unused variable warnings diff --git a/libcpp/lex.c b/libcpp/lex.c index 2247386f829..298dd7fff3d 100644 --- a/libcpp/lex.c +++ b/libcpp/lex.c @@ -471,7 +471,11 @@ search_line_sse42 (const uchar *s, const uchar *end) /* Check the CPU capabilities. */ +#if (GCC_VERSION >= 5000) #include "../gcc/config/i386/cpuid.h" +#else +#include <cpuid.h> +#endif typedef const uchar * (*search_line_fast_type) (const uchar *, const uchar *); static search_line_fast_type search_line_fast; |