18 files changed, 23 insertions, 44 deletions
diff --git a/doc/os.rst b/doc/os.rst
index ca98456fb..f1baa7cde 100644
--- a/doc/os.rst
+++ b/doc/os.rst
@@ -19,8 +19,8 @@ A summary of OS features as defined in ``src/build-data/os``.
   h: hurd
   i: includeos
   i: ios
-  i: irix
   l: linux
+  l: llvm
   m: mingw
   n: nacl
   n: netbsd
@@ -28,32 +28,30 @@ A summary of OS features as defined in ``src/build-data/os``.
   q: qnx
   s: solaris
   w: windows
+  w: winphone
 
 .. csv-table::
-   :header: "Feature", "a", "a", "c", "d", "d", "f", "h", "h", "h", "i", "i", "i", "l", "m", "n", "n", "o", "q", "s", "w"
+   :header: "Feature", "a", "a", "c", "d", "d", "f", "h", "h", "h", "i", "i", "l", "l", "m", "n", "n", "o", "q", "s", "w", "w"
 
-   "clock_gettime", " ", "X", " ", " ", "X", "X", " ", " ", " ", " ", " ", " ", "X", " ", " ", "X", "X", "X", " ", " "
-   "cryptgenrandom", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", "X", " ", " ", " ", " ", " ", "X"
-   "dlopen", " ", "X", " ", "X", " ", "X", " ", " ", " ", " ", "X", " ", "X", " ", " ", "X", "X", "X", " ", " "
-   "filesystem", "X", "X", "X", "X", "X", "X", "X", "X", "X", " ", "X", "X", "X", "X", " ", "X", "X", "X", "X", "X"
-   "gettimeofday", "X", "X", "X", "X", "X", "X", "X", "X", " ", " ", "X", "X", "X", " ", "X", "X", "X", "X", "X", " "
-   "gmtime_r", " ", "X", " ", "X", " ", "X", "X", " ", " ", " ", "X", " ", "X", " ", " ", "X", "X", "X", " ", " "
-   "gmtime_s", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", "X"
-   "includeos_rng", " ", " ", " ", " ", " ", " ", " ", " ", " ", "X", " ", " ", " ", " ", " ", " ", " ", " ", " ", " "
-   "loadlibrary", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", "X", " ", " ", " ", " ", " ", "X"
-   "memset_s", " ", " ", " ", "X", " ", " ", " ", " ", " ", " ", "X", " ", " ", " ", " ", " ", " ", " ", " ", " "
-   "mkgmtime", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", "X", " ", " ", " ", " ", " ", "X"
-   "posix_mlock", " ", "X", " ", " ", "X", "X", " ", " ", "X", " ", " ", " ", "X", " ", " ", "X", "X", "X", "X", " "
-   "query_perf_counter", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", "X"
-   "readdir", " ", "X", " ", "X", " ", "X", " ", " ", " ", " ", "X", " ", "X", " ", " ", "X", "X", " ", " ", " "
-   "rtlsecurezeromemory", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", "X"
-   "sockets", " ", " ", " ", "X", "X", "X", " ", " ", " ", " ", "X", " ", "X", " ", " ", " ", "X", " ", " ", " "
-   "stl_filesystem_msvc", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", "X"
-   "threads", "X", "X", "X", "X", "X", "X", "X", "X", "X", " ", "X", "X", "X", "X", "X", "X", "X", "X", "X", "X"
-   "timegm", " ", " ", "X", "X", " ", "X", " ", " ", " ", " ", "X", " ", "X", " ", " ", "X", "X", " ", " ", " "
-   "virtual_lock", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", "X"
-   "win32_get_systemtime", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", "X", " ", " ", " ", " ", " ", " "
-   "win32_virtual_lock", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", "X", " ", " ", " ", " ", " ", " "
+   "arc4random", " ", " ", " ", "X", " ", " ", " ", " ", " ", " ", "X", " ", " ", " ", " ", " ", "X", " ", " ", " ", " "
+   "clock_gettime", "X", "X", " ", " ", "X", "X", " ", " ", " ", " ", " ", "X", " ", " ", " ", "X", "X", "X", " ", " ", " "
+   "cryptgenrandom", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", "X", " ", " ", " ", " ", " ", "X", " "
+   "crypto_ng", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", "X"
+   "dlopen", "X", "X", " ", "X", "X", "X", " ", " ", " ", " ", "X", "X", " ", " ", " ", "X", "X", "X", " ", " ", " "
+   "explicit_bzero", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", "X", " ", " ", " ", " "
+   "filesystem", "X", "X", "X", "X", "X", "X", "X", "X", "X", " ", "X", "X", "X", "X", " ", "X", "X", "X", "X", "X", "X"
+   "getauxval", " ", "X", " ", " ", " ", " ", " ", " ", " ", " ", " ", "X", " ", " ", " ", " ", " ", " ", " ", " ", " "
+   "gmtime_r", "X", "X", " ", "X", " ", "X", "X", " ", " ", " ", "X", "X", " ", " ", " ", "X", "X", "X", " ", " ", " "
+   "gmtime_s", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", "X", "X"
+   "loadlibrary", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", "X", " ", " ", " ", " ", " ", "X", "X"
+   "posix_mlock", " ", "X", " ", " ", "X", "X", " ", " ", "X", " ", " ", "X", " ", " ", " ", "X", "X", "X", "X", " ", " "
+   "query_perf_counter", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", "X", "X"
+   "readdir", "X", "X", "X", "X", "X", "X", " ", " ", " ", " ", "X", "X", " ", " ", " ", "X", "X", " ", "X", " ", " "
+   "rtlsecurezeromemory", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", "X", "X"
+   "sockets", "X", " ", " ", "X", "X", "X", " ", " ", " ", " ", "X", "X", " ", " ", " ", " ", "X", " ", " ", "X", "X"
+   "stl_filesystem_msvc", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", "X", " "
+   "threads", "X", "X", "X", "X", "X", "X", "X", "X", "X", " ", "X", "X", " ", "X", "X", "X", "X", "X", "X", "X", "X"
+   "virtual_lock", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", "X", " ", " ", " ", " ", " ", "X", " "
 
 .. note::
    This file is auto generated by ``src/scripts/update_docs.py``. Dont modify it manually.
diff --git a/src/build-data/os/aix.txt b/src/build-data/os/aix.txt
index e5a7bc742..6a8a9e4d7 100644
--- a/src/build-data/os/aix.txt
+++ b/src/build-data/os/aix.txt
@@ -4,7 +4,6 @@ soname_suffix "so"
 
 <target_features>
 clock_gettime
-gettimeofday
 gmtime_r
 dlopen
 readdir
diff --git a/src/build-data/os/android.txt b/src/build-data/os/android.txt
index 07c980adf..79031d4f7 100644
--- a/src/build-data/os/android.txt
+++ b/src/build-data/os/android.txt
@@ -4,7 +4,6 @@ soname_suffix "so"
 
 <target_features>
 clock_gettime
-gettimeofday
 posix_mlock
 gmtime_r
 # getauxval is available in Android NDK for min API 18 and in Crystax NDK
diff --git a/src/build-data/os/cygwin.txt b/src/build-data/os/cygwin.txt
index 06f6d60f8..c5a790595 100644
--- a/src/build-data/os/cygwin.txt
+++ b/src/build-data/os/cygwin.txt
@@ -11,7 +11,6 @@ install_root c:\Botan
 doc_dir docs
 
 <target_features>
-gettimeofday
 readdir
 threads
 filesystem
diff --git a/src/build-data/os/darwin.txt b/src/build-data/os/darwin.txt
index 6568a9783..acc59f2c2 100644
--- a/src/build-data/os/darwin.txt
+++ b/src/build-data/os/darwin.txt
@@ -14,9 +14,7 @@ doc_dir doc
 arc4random
 dlopen
 filesystem
-gettimeofday
 gmtime_r
-memset_s
 readdir
 sockets
 threads
diff --git a/src/build-data/os/dragonfly.txt b/src/build-data/os/dragonfly.txt
index 1e567ffd2..9a5590d89 100644
--- a/src/build-data/os/dragonfly.txt
+++ b/src/build-data/os/dragonfly.txt
@@ -4,7 +4,6 @@ soname_suffix "so"
 
 <target_features>
 clock_gettime
-gettimeofday
 posix_mlock
 sockets
 threads
diff --git a/src/build-data/os/freebsd.txt b/src/build-data/os/freebsd.txt
index fb869dfd0..17cad3ac0 100644
--- a/src/build-data/os/freebsd.txt
+++ b/src/build-data/os/freebsd.txt
@@ -4,7 +4,6 @@ soname_suffix "so"
 
 <target_features>
 clock_gettime
-gettimeofday
 posix_mlock
 gmtime_r
 dlopen
diff --git a/src/build-data/os/haiku.txt b/src/build-data/os/haiku.txt
index 8b6f0641d..c9033ff14 100644
--- a/src/build-data/os/haiku.txt
+++ b/src/build-data/os/haiku.txt
@@ -7,7 +7,6 @@ lib_dir system/lib
 doc_dir system/documentation
 
 <target_features>
-gettimeofday
 gmtime_r
 threads
 filesystem
diff --git a/src/build-data/os/hpux.txt b/src/build-data/os/hpux.txt
index f8c2d0d2a..86a79e5ca 100644
--- a/src/build-data/os/hpux.txt
+++ b/src/build-data/os/hpux.txt
@@ -4,7 +4,6 @@ os_type unix
 soname_suffix "so"
 
 <target_features>
-gettimeofday
 threads
 filesystem
 </target_features>
diff --git a/src/build-data/os/includeos.txt b/src/build-data/os/includeos.txt
index 423575b4a..dcac84051 100644
--- a/src/build-data/os/includeos.txt
+++ b/src/build-data/os/includeos.txt
@@ -3,5 +3,4 @@ os_type unikernel
 building_shared_supported no
 
 <target_features>
-includeos_rng
 </target_features>
diff --git a/src/build-data/os/ios.txt b/src/build-data/os/ios.txt
index 96ac73721..c0195fa9e 100644
--- a/src/build-data/os/ios.txt
+++ b/src/build-data/os/ios.txt
@@ -10,9 +10,7 @@ doc_dir doc
 arc4random
 dlopen
 filesystem
-gettimeofday
 gmtime_r
-memset_s
 readdir
 sockets
 threads
diff --git a/src/build-data/os/linux.txt b/src/build-data/os/linux.txt
index 80ea3e63a..99bcf21eb 100644
--- a/src/build-data/os/linux.txt
+++ b/src/build-data/os/linux.txt
@@ -4,7 +4,6 @@ soname_suffix "so"
 
 <target_features>
 clock_gettime
-gettimeofday
 posix_mlock
 gmtime_r
 dlopen
diff --git a/src/build-data/os/mingw.txt b/src/build-data/os/mingw.txt
index 8d4e94249..f1db8fb43 100644
--- a/src/build-data/os/mingw.txt
+++ b/src/build-data/os/mingw.txt
@@ -19,8 +19,7 @@ mingw32
 <target_features>
 cryptgenrandom
 loadlibrary
-win32_virtual_lock
-win32_get_systemtime
+virtual_lock
 threads
 filesystem
 </target_features>
diff --git a/src/build-data/os/nacl.txt b/src/build-data/os/nacl.txt
index c24413618..66ce8f34f 100644
--- a/src/build-data/os/nacl.txt
+++ b/src/build-data/os/nacl.txt
@@ -2,6 +2,5 @@
 building_shared_supported no
 
 <target_features>
-gettimeofday
 threads
 </target_features>
diff --git a/src/build-data/os/netbsd.txt b/src/build-data/os/netbsd.txt
index 50d97fd8f..21f388e29 100644
--- a/src/build-data/os/netbsd.txt
+++ b/src/build-data/os/netbsd.txt
@@ -4,7 +4,6 @@ soname_suffix "so"
 
 <target_features>
 clock_gettime
-gettimeofday
 posix_mlock
 gmtime_r
 dlopen
diff --git a/src/build-data/os/openbsd.txt b/src/build-data/os/openbsd.txt
index b858d497c..a5db3fd8e 100644
--- a/src/build-data/os/openbsd.txt
+++ b/src/build-data/os/openbsd.txt
@@ -8,7 +8,6 @@ soname_pattern_patch "libbotan-{version_major}.so.{abi_rev}.{version_minor}"
 arc4random
 clock_gettime
 explicit_bzero
-gettimeofday
 posix_mlock
 gmtime_r
 dlopen
diff --git a/src/build-data/os/qnx.txt b/src/build-data/os/qnx.txt
index 76a10f951..65fd8acf0 100644
--- a/src/build-data/os/qnx.txt
+++ b/src/build-data/os/qnx.txt
@@ -5,7 +5,6 @@ soname_suffix "so"
 
 <target_features>
 clock_gettime
-gettimeofday
 posix_mlock
 gmtime_r
 dlopen
diff --git a/src/build-data/os/solaris.txt b/src/build-data/os/solaris.txt
index 893b7b568..7c89e4ad9 100644
--- a/src/build-data/os/solaris.txt
+++ b/src/build-data/os/solaris.txt
@@ -4,7 +4,6 @@ soname_suffix "so"
 
 <target_features>
 posix_mlock
-gettimeofday
 threads
 readdir
 filesystem