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

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 5814dc4da18c66ff0e92b01e508bb4e1a5e3ea49..66cc81a377da588510e1f35b17ed94e239f247ef 100644 (file)
--- 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 2247386f829d23464461e2087879e932fe5d5224..298dd7fff3dce4efe9313b3fc958b30d4c272fac 100644 (file)
--- 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;