From 5ac3d723d1be27098bc3a18204a07a5972a0e283 Mon Sep 17 00:00:00 2001
From: Jack Lloyd <jack@randombit.net>
Date: Thu, 4 Jan 2018 11:29:10 -0500
Subject: Update configuration information for Intel C++

This is completely untested and just based on the documentation.
---
 src/build-data/cc/icc.txt | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/build-data/cc/icc.txt b/src/build-data/cc/icc.txt
index f50ea6d11..10f9a6116 100644
--- a/src/build-data/cc/icc.txt
+++ b/src/build-data/cc/icc.txt
@@ -5,19 +5,29 @@ binary_name icpc
 optimization_flags "-O2"
 size_optimization_flags "-Os"
 
-lang_flags "-std=c++0x"
+lang_flags "-std=c++11"
 warning_flags "-w1"
 shared_flags "-fPIC"
 
+<isa_flags>
+sse2    -> "-msse2"
+ssse3   -> "-mssse3"
+sse41   -> "-msse4.1"
+sse42   -> "-msse4.2"
+avx2    -> "-march=core-avx2"
+aesni   -> "-march=corei7"
+rdrand  -> "-march=core-avx-i"
+</isa_flags>
+
 <mach_opt>
 pentium3  -> "-march=pentium3"
 pentium4  -> "-march=pentium4"
-pentium-m -> "-march=pentium3"
+pentium-m -> "-march=pentium-m"
 core2     -> "-march=core2"
 
-# ICC 11.1 doesn't have native Nehalem or Westmere support
-nehalem   -> "-march=core2"
-westmere  -> "-march=core2"
+nehalem     -> "-march=corei7"
+sandybridge -> "-march=corei7-avx"
+ivybridge   -> "-march=core-avx-i"
 </mach_opt>
 
 <so_link_commands>
-- 
cgit v1.2.3