7 files changed, 17 insertions, 114 deletions
diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
index c4bfe1961..2e02cb7b5 100644
--- a/src/build-data/cc/clang.txt
+++ b/src/build-data/cc/clang.txt
@@ -51,15 +51,9 @@ arm32:neon    -> "-mfpu=neon"
 arm64:neon    -> ""
 </isa_flags>
 
-<mach_opt>
-all_llvm    -> "-emit-llvm -fno-use-cxa-atexit"
-
-x86_32      -> "-march=SUBMODEL"
-x86_64      -> "-march=SUBMODEL"
-nehalem     -> "-march=corei7"
-sandybridge -> "-march=corei7-avx"
-ivybridge   -> "-march=core-avx-i"
-</mach_opt>
+<cpu_flags>
+llvm    -> "-emit-llvm -fno-use-cxa-atexit"
+</cpu_flags>
 
 <mach_abi_linking>
 all!haiku -> "-pthread"
diff --git a/src/build-data/cc/ekopath.txt b/src/build-data/cc/ekopath.txt
index dedbaaf61..490396ac4 100644
--- a/src/build-data/cc/ekopath.txt
+++ b/src/build-data/cc/ekopath.txt
@@ -15,14 +15,3 @@ shared_flags "-fPIC"
 <so_link_commands>
 default -> "$(CXX) -shared -fPIC -Wl,-soname,{soname_abi}"
 </so_link_commands>
-
-<mach_opt>
-athlon   -> "-mcpu=athlon"
-pentium4 -> "-mcpu=pentium4"
-
-k8       -> "-mcpu=opteron"
-core2    -> "-mcpu=core"
-
-x86_32   -> "-mcpu=anyx86"
-x86_64   -> "-mcpu=athlon64"
-</mach_opt>
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index 553e71295..236b588a5 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -63,52 +63,10 @@ arm32:neon    -> "-mfpu=neon"
 arm64:neon    -> ""
 </isa_flags>
 
-<mach_opt>
-# Avoid using -march=i[3456]86, instead tune for generic
-i386        -> "-mtune=generic"
-i486        -> "-mtune=generic"
-i586        -> "-mtune=generic"
-i686        -> "-mtune=generic"
-
-# Translate to GCC-speak
-nehalem     -> "-march=corei7"
-sandybridge -> "-march=corei7-avx"
-ivybridge   -> "-march=core-avx-i"
-
-ppc601      -> "-mpowerpc -mcpu=601"
-cellppu     -> "-mcpu=cell"
-e500v2      -> "-mcpu=8548"
-
-# No scheduler in GCC for anything after EV67
-alpha-ev68  -> "-mcpu=ev67"
-alpha-ev7   -> "-mcpu=ev67"
-
-# The patch from Debian bug 594159 has this, don't know why though...
-sh4         -> "-m4 -mieee"
-
-# Default family options (SUBMODEL is substitued with the actual
-# submodel name). Anything after the pipe will be removed from the
-# submodel name before it's put into SUBMODEL.
-
-alpha     -> "-mcpu=SUBMODEL|alpha-"
-arm32     -> "-march=SUBMODEL"
-arm64     -> "-march=SUBMODEL"
-superh    -> "-mSUBMODEL|sh"
-hppa      -> "-march=SUBMODEL|hppa"
-ia64      -> "-mtune=SUBMODEL"
-m68k      -> "-mSUBMODEL"
-mips32    -> "-mips1 -mcpu=SUBMODEL|mips32-"
-mips64    -> "-mips3 -mcpu=SUBMODEL|mips64-"
-ppc32     -> "-mcpu=SUBMODEL|ppc"
-ppc64     -> "-mcpu=SUBMODEL|ppc"
-sparc32   -> "-mcpu=SUBMODEL -Wa,-xarch=v8plus|sparc32-"
-sparc64   -> "-mcpu=v9 -mtune=SUBMODEL"
-x86_32    -> "-march=SUBMODEL"
-x86_64    -> "-march=SUBMODEL"
-
-all_x86_32 -> "-momit-leaf-frame-pointer"
-all_x86_64 -> "-momit-leaf-frame-pointer"
-</mach_opt>
+<cpu_flags>
+x86_32 -> "-momit-leaf-frame-pointer"
+x86_64 -> "-momit-leaf-frame-pointer"
+</cpu_flags>
 
 # Flags set here are included at compile and link time
 <mach_abi_linking>
diff --git a/src/build-data/cc/icc.txt b/src/build-data/cc/icc.txt
index f50ea6d11..c8a1aa3dc 100644
--- a/src/build-data/cc/icc.txt
+++ b/src/build-data/cc/icc.txt
@@ -5,20 +5,19 @@ 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"
 
-<mach_opt>
-pentium3  -> "-march=pentium3"
-pentium4  -> "-march=pentium4"
-pentium-m -> "-march=pentium3"
-core2     -> "-march=core2"
-
-# ICC 11.1 doesn't have native Nehalem or Westmere support
-nehalem   -> "-march=core2"
-westmere  -> "-march=core2"
-</mach_opt>
+<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>
 
 <so_link_commands>
 default -> "$(CXX) -fPIC -shared -Wl,-soname,{soname_abi}"
diff --git a/src/build-data/cc/pgi.txt b/src/build-data/cc/pgi.txt
index 213a69d27..5ec658628 100644
--- a/src/build-data/cc/pgi.txt
+++ b/src/build-data/cc/pgi.txt
@@ -9,11 +9,3 @@ shared_flags "-fPIC"
 linux   -> "$(CXX) -shared -fPIC -Wl,-soname,{soname_abi}"
 solaris -> "$(CXX) -G -fPIC -Wl,-h,{soname_abi}"
 </so_link_commands>
-
-<mach_opt>
-i586     -> "-tp p5"
-i686     -> "-tp p6"
-athlon   -> "-tp k7"
-pentium4 -> "-tp p6"
-x86_32   -> "-tp px"
-</mach_opt>
diff --git a/src/build-data/cc/sunstudio.txt b/src/build-data/cc/sunstudio.txt
index e983bf701..c5dac65de 100644
--- a/src/build-data/cc/sunstudio.txt
+++ b/src/build-data/cc/sunstudio.txt
@@ -15,30 +15,6 @@ ar_options "-xar -o"
 default -> "$(CXX) -G -h{soname_abi}"
 </so_link_commands>
 
-<mach_opt>
-i386       -> "-xtarget=486"
-i486       -> "-xtarget=486"
-i586       -> "-xtarget=pentium"
-k6         -> "-xtarget=pentium"
-i686       -> "-xtarget=pentium_pro"
-
-pentium3   -> "-xtarget=pentium3"
-pentium4   -> "-xtarget=pentium4"
-
-core2      -> "-xtarget=core2"
-opteron    -> "-xtarget=opteron"
-nehalem    -> "-xtarget=nehalem"
-
-sparc32-v9 -> "-xchip=ultra -xarch=v8"
-
-ultrasparc3 -> "-xchip=ultra3"
-niagra1    -> "-xchip=ultraT1"
-niagra2    -> "-xchip=ultraT2"
-
-sparc32    -> "-xchip=ultra -xarch=SUBMODEL|sparc32-"
-sparc64    -> "-xchip=generic"
-</mach_opt>
-
 <mach_abi_linking>
 # Needed on some Linux distros
 linux      -> "-library=stlport4"
diff --git a/src/build-data/cc/xlc.txt b/src/build-data/cc/xlc.txt
index c28fdb1a0..0ab45242a 100644
--- a/src/build-data/cc/xlc.txt
+++ b/src/build-data/cc/xlc.txt
@@ -6,11 +6,6 @@ optimization_flags "-O2"
 
 lang_flags "-std=c++11"
 
-<mach_opt>
-power8   -> "-qarch=pwr8"
-power9   -> "-qarch=pwr9"
-</mach_opt>
-
 <isa_flags>
 altivec -> "-qaltivec"
 </isa_flags>