From: Nathan Froyd <froydnj@gcc.gnu.org>
Date: Tue, 13 Oct 2015 20:55:44 +0000 (+0000)
Subject: opt_random.h: Include pmmintrin.h instead of x86intrin.h, and only do so when __SSE3__
X-Git-Tag: basepoints/gcc-7~3974
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=141aa58b53d979d2ffa38e072691ecf55a5a5b04;p=thirdparty%2Fgcc.git

opt_random.h: Include pmmintrin.h instead of x86intrin.h, and only do so when __SSE3__

	* config/cpu/i486/opt/bits/opt_random.h: Include pmmintrin.h instead
	of x86intrin.h, and only do so when __SSE3__
	* include/ext/random: Include emmintrin.h instead of x86intrin.h

From-SVN: r228786
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e3061efca4f5..ff0b048a444d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-13  Nathan Froyd  <froydnj@gcc.gnu.org>
+
+	* config/cpu/i486/opt/bits/opt_random.h: Include pmmintrin.h instead
+	of x86intrin.h, and only do so when __SSE3__
+	* include/ext/random: Include emmintrin.h instead of x86intrin.h
+
 2015-10-11  Joseph Myers  <joseph@codesourcery.com>
 
 	* crossconfig.m4 (GLIBCXX_CROSSCONFIG) <*-linux* | *-uclinux* |
diff --git a/libstdc++-v3/config/cpu/i486/opt/bits/opt_random.h b/libstdc++-v3/config/cpu/i486/opt/bits/opt_random.h
index 4495569ab26a..a9f6c1355e70 100644
--- a/libstdc++-v3/config/cpu/i486/opt/bits/opt_random.h
+++ b/libstdc++-v3/config/cpu/i486/opt/bits/opt_random.h
@@ -30,7 +30,9 @@
 #ifndef _BITS_OPT_RANDOM_H
 #define _BITS_OPT_RANDOM_H 1
 
-#include <x86intrin.h>
+#ifdef __SSE3__
+#include <pmmintrin.h>
+#endif
 
 
 #pragma GCC system_header
diff --git a/libstdc++-v3/include/ext/random b/libstdc++-v3/include/ext/random
index 0bcfa4a30165..ba363ce23e70 100644
--- a/libstdc++-v3/include/ext/random
+++ b/libstdc++-v3/include/ext/random
@@ -40,7 +40,7 @@
 #include <array>
 #include <ext/cmath>
 #ifdef __SSE2__
-# include <x86intrin.h>
+# include <emmintrin.h>
 #endif
 
 #if defined(_GLIBCXX_USE_C99_STDINT_TR1) && defined(UINT32_C)