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 e3061efca4f5f3508df853e8a8cb232c46ba0e35..ff0b048a444d564c0caa169cf51641a624b99d8f 100644 (file)
--- 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 4495569ab26a4535c0547a2bbac7dff1512785e3..a9f6c1355e7070356cc38ce95815a4c52c4801b3 100644 (file)
--- 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 0bcfa4a3016506154b6afde2970fa78d660b62e0..ba363ce23e7033c104eba15234240f48f756efa2 100644 (file)
--- 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)