From: Uros Bizjak <ubizjak@gmail.com>
Date: Thu, 20 Nov 2014 10:43:45 +0000 (+0100)
Subject: re PR target/63966 (inconsistent operand constraints compiling build libcpp)
X-Git-Tag: releases/gcc-5.1.0~3024
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a23b1006359c176dcc6cfd0a6a7cabcf58687c7;p=thirdparty%2Fgcc.git

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 5814dc4da18c..66cc81a377da 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 2247386f829d..298dd7fff3dc 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;