propagate from branch 'net.randombit.botan' (head 39f53266912f33dc48e942b1b865ddcd6af66d8d)

            to branch 'net.randombit.botan.cxx11' (head 0bf26cec09f71e75c547b4ec53365748c6d80d86)

5 files changed, 21 insertions, 12 deletions

diff --git a/src/build-data/arch/x86_64.txt b/src/build-data/arch/x86_64.txt
index 97b84fbde..922daa104 100644
--- a/src/build-data/arch/x86_64.txt
+++ b/src/build-data/arch/x86_64.txt
@@ -13,11 +13,12 @@ x64
 <submodels>
 k8
 k10
+atom
 nocona
 core2
 nehalem
 westmere
-atom
+sandybridge
 </submodels>
 
 <submodel_aliases>
@@ -37,6 +38,6 @@ corei7cpu860 -> nehalem
 
 <isa_extn>
 sse2:all
-ssse3:core2,nehalem,westmere,atom
-aes-ni:westmere
+ssse3:core2,nehalem,westmere,atom,sandybridge
+aes-ni:westmere,sandybridge
 </isa_extn>
diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
index c8867ba93..8860a30ba 100644
--- a/src/build-data/cc/clang.txt
+++ b/src/build-data/cc/clang.txt
@@ -31,7 +31,8 @@ default -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)"
 
 <mach_opt>
 x86_64    -> "-march=SUBMODEL"
-nehalem   -> "-march=core2 -mssse3 -msse4.1"
+nehalem   -> "-march=corei7"
+westmere  -> "-march=corei7 -maes"
 </mach_opt>
 
 <mach_abi_linking>
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index dbf892dcf..be1830bb8 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -45,25 +45,27 @@ i386        -> "-mtune=generic -momit-leaf-frame-pointer"
 i486        -> "-mtune=generic -momit-leaf-frame-pointer"
 i586        -> "-mtune=generic -momit-leaf-frame-pointer"
 
+# Translate to GCC-speak
+nehalem     -> "-march=corei7 -momit-leaf-frame-pointer"
+westmere    -> "-march=corei7 -maes -momit-leaf-frame-pointer"
+sandybridge -> "-march=corei7-avx -momit-leaf-frame-pointer"
+atom32      -> "-march=atom -momit-leaf-frame-pointer"
+
 ppc601      -> "-mpowerpc -mcpu=601"
 cellppu     -> "-mcpu=cell"
 e500v2      -> "-mcpu=8548"
-atom32      -> "-march=atom -momit-leaf-frame-pointer"
 
+# 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 quotes is what should be
+# *removed* from the submodel name before it's put into SUBMODEL.
 
-# Until GCC gets -march support for these models
-nehalem     -> "-march=core2 -msse4.1 -msse4.2 -momit-leaf-frame-pointer"
-westmere    -> "-march=core2 -maes -msse4.1 -msse4.2 -momit-leaf-frame-pointer"
-
-# Default family options (SUBMODEL is substitued with the real submodel)
-# Anything after the quotes is what should be *removed* from the submodel name
-# before it's put into SUBMODEL.
 alpha     -> "-mcpu=SUBMODEL" alpha-
 arm       -> "-march=SUBMODEL"
 superh    -> "-mSUBMODEL" sh
diff --git a/src/build-data/os/mingw.txt b/src/build-data/os/mingw.txt
index 5daabac90..1268298cb 100644
--- a/src/build-data/os/mingw.txt
+++ b/src/build-data/os/mingw.txt
@@ -20,6 +20,7 @@ mingw32
 </aliases>
 
 <target_features>
+loadlibrary
 win32_virtual_lock
 win32_get_systemtime
 </target_features>
diff --git a/src/build-data/os/nacl.txt b/src/build-data/os/nacl.txt
new file mode 100644
index 000000000..3df798ed8
--- /dev/null
+++ b/src/build-data/os/nacl.txt
@@ -0,0 +1,4 @@
+
+<target_features>
+gettimeofday
+</target_features>