From 03d02309753b1a6c2e512bff27dca190e8f64e5c Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Sat, 14 Dec 2013 16:15:25 +0000
Subject: Add AVX2 compiler flags for GCC and Clang. Tidy compiler option
 ordering.

---
 src/build-data/cc/clang.txt | 12 +++++++++---
 src/build-data/cc/gcc.txt   |  2 ++
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'src/build-data/cc')

diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
index 0af44768b..163e64272 100644
--- a/src/build-data/cc/clang.txt
+++ b/src/build-data/cc/clang.txt
@@ -30,9 +30,14 @@ darwin  -> "$(CXX) -dynamiclib -fPIC -install_name $(LIBDIR)/$(SONAME)"
 </so_link_flags>
 
 <isa_flags>
+"sse2"   -> "-msse2"
+"ssse3"  -> "-mssse3"
+"sse4.1" -> "-msse4.1"
+"sse4.2" -> "-msse4.2"
+"avx"    -> "-mavx"
 "aes-ni" -> "-maes"
-"ssse3" -> "-mssse3"
-"sse2" -> "-msse2"
+"avx2"   -> "-mavx2"
+"bmi2"   -> "-mbmi2"
 </isa_flags>
 
 <mach_opt>
@@ -43,7 +48,8 @@ ivybridge   -> "-march=core-avx-i"
 </mach_opt>
 
 <mach_abi_linking>
-all     -> "-stdlib=libc++ -pthread"
+#all     -> "-stdlib=libc++ -pthread"
+all     -> "-stdlib=libstdc++ -pthread"
 
 x86_64  -> "-m64"
 ppc64   -> "-m64"
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index b8b9b15b3..52d5020e2 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -44,6 +44,8 @@ solaris -> "$(CXX) -shared -fPIC -Wl,-h,$(SONAME)"
 "sse4.2" -> "-msse4.2"
 "avx"    -> "-mavx"
 "aes-ni" -> "-maes"
+"avx2"   -> "-mavx2"
+"bmi2"   -> "-mbmi2"
 </isa_flags>
 
 <mach_opt>
-- 
cgit v1.2.3