Merge pull request niXman#166 from net147/develop

Fix conflict including algorithm before intrin.h
Alexpux · Mar 25, 2013 · 9c9cc73 · 9c9cc73
2 parents b03052c + a3d3907
commit 9c9cc73
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/patches/gcc/gcc-4.8-intrin.patch b/patches/gcc/gcc-4.8-intrin.patch
@@ -0,0 +1,12 @@
+--- 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
+
++extern "C" {
+ #include <x86intrin.h>
++}
+
+
+ #pragma GCC system_header
diff --git a/scripts/gcc-4_8-branch.sh b/scripts/gcc-4_8-branch.sh
@@ -46,6 +46,7 @@ PRIORITY=main
 PATCHES=(
 	gcc/gcc-4.7-stdthreads.patch
 	gcc/gcc-4.8-iconv.patch
+	gcc/gcc-4.8-intrin.patch
 	gcc/gcc-4.8-libstdc++export.patch
 )
 

diff --git a/scripts/gcc-trunk.sh b/scripts/gcc-trunk.sh
@@ -46,6 +46,7 @@ PRIORITY=main
 PATCHES=(
 	gcc/gcc-4.7-stdthreads.patch
 	gcc/gcc-4.8-iconv.patch
+	gcc/gcc-4.8-intrin.patch
 	gcc/gcc-4.8-libstdc++export.patch
 )