Merge GH #1378 Use OS feature flags instead of OS name for enabling system specific code

20 files changed, 84 insertions, 83 deletions

diff --git a/src/build-data/buildh.in b/src/build-data/buildh.in
index 10b03ca70..9333cfb8a 100644
--- a/src/build-data/buildh.in
+++ b/src/build-data/buildh.in
@@ -45,9 +45,6 @@
 /* Target identification and feature test macros */
 
 #define BOTAN_TARGET_OS_IS_%{os_name|upper}
-%{if os_type}
-#define BOTAN_TARGET_OS_TYPE_IS_%{os_type|upper}
-%{endif}
 
 %{for os_features}
 #define BOTAN_TARGET_OS_HAS_%{i|upper}
diff --git a/src/build-data/os/aix.txt b/src/build-data/os/aix.txt
index b12685c61..caf94fdd4 100644
--- a/src/build-data/os/aix.txt
+++ b/src/build-data/os/aix.txt
@@ -1,14 +1,14 @@
-os_type unix
 
 soname_suffix "so"
 
 use_stack_protector no
 
 <target_features>
+posix1
 clock_gettime
-gmtime_r
-dlopen
-readdir
+dev_random
+proc_fs
+
 sockets
 threads
 filesystem
diff --git a/src/build-data/os/android.txt b/src/build-data/os/android.txt
index 79031d4f7..b45287b54 100644
--- a/src/build-data/os/android.txt
+++ b/src/build-data/os/android.txt
@@ -1,16 +1,17 @@
-os_type unix
 
 soname_suffix "so"
 
 <target_features>
+posix1
+
+dev_random
 clock_gettime
-posix_mlock
-gmtime_r
+
 # getauxval is available in Android NDK for min API 18 and in Crystax NDK
-# for all min API levels. Comment out if older API levels must be supported.
+# for all min API levels. Use --without-os-feature=getauxval to disable
 getauxval
-dlopen
-readdir
+
+sockets
 threads
 filesystem
 </target_features>
diff --git a/src/build-data/os/cygwin.txt b/src/build-data/os/cygwin.txt
index f4118aedb..1d106b06c 100644
--- a/src/build-data/os/cygwin.txt
+++ b/src/build-data/os/cygwin.txt
@@ -1,4 +1,3 @@
-os_type unix
 
 program_suffix .exe
 
@@ -10,7 +9,10 @@ install_root c:\Botan
 doc_dir docs
 
 <target_features>
-readdir
+posix1
+dev_random
+
+sockets
 threads
 filesystem
 </target_features>
diff --git a/src/build-data/os/darwin.txt b/src/build-data/os/darwin.txt
index acc59f2c2..3c221e0b9 100644
--- a/src/build-data/os/darwin.txt
+++ b/src/build-data/os/darwin.txt
@@ -1,4 +1,3 @@
-os_type unix
 
 soname_pattern_base  "libbotan-{version_major}.dylib"
 soname_pattern_abi   "libbotan-{version_major}.{abi_rev}.dylib"
@@ -11,13 +10,14 @@ so_post_link_command "install_name_tool -change '$(INSTALLED_LIB_DIR)/{soname_ab
 doc_dir doc
 
 <target_features>
+posix1
 arc4random
-dlopen
-filesystem
-gmtime_r
-readdir
+dev_random
+security_framework
+
 sockets
 threads
+filesystem
 </target_features>
 
 <aliases>
diff --git a/src/build-data/os/dragonfly.txt b/src/build-data/os/dragonfly.txt
index 9a5590d89..257b2ef6b 100644
--- a/src/build-data/os/dragonfly.txt
+++ b/src/build-data/os/dragonfly.txt
@@ -1,13 +1,14 @@
-os_type unix
 
 soname_suffix "so"
 
 <target_features>
+posix1
 clock_gettime
-posix_mlock
+proc_fs
+dev_random
+arc4random
+
 sockets
 threads
 filesystem
-readdir
-dlopen
 </target_features>
diff --git a/src/build-data/os/freebsd.txt b/src/build-data/os/freebsd.txt
index 17cad3ac0..4de44a318 100644
--- a/src/build-data/os/freebsd.txt
+++ b/src/build-data/os/freebsd.txt
@@ -1,13 +1,12 @@
-os_type unix
 
 soname_suffix "so"
 
 <target_features>
+posix1
 clock_gettime
-posix_mlock
-gmtime_r
-dlopen
-readdir
+dev_random
+arc4random
+
 sockets
 threads
 filesystem
diff --git a/src/build-data/os/haiku.txt b/src/build-data/os/haiku.txt
index 37f3d862f..e203a0d26 100644
--- a/src/build-data/os/haiku.txt
+++ b/src/build-data/os/haiku.txt
@@ -1,4 +1,3 @@
-os_type unix
 
 soname_suffix "so"
 
@@ -10,10 +9,10 @@ doc_dir system/documentation
 use_stack_protector no
 
 <target_features>
+posix1
 clock_gettime
-gmtime_r
-dlopen
-readdir
+dev_random
+
 sockets
 threads
 filesystem
diff --git a/src/build-data/os/hpux.txt b/src/build-data/os/hpux.txt
index 86a79e5ca..112ad1ea3 100644
--- a/src/build-data/os/hpux.txt
+++ b/src/build-data/os/hpux.txt
@@ -1,9 +1,13 @@
-os_type unix
 
 # It is "sl" on HP-PA, but HP-UX on PA is EOL
 soname_suffix "so"
 
 <target_features>
+posix1
+clock_gettime
+dev_random
+
+sockets
 threads
 filesystem
 </target_features>
diff --git a/src/build-data/os/hurd.txt b/src/build-data/os/hurd.txt
index 846117805..29ca47490 100644
--- a/src/build-data/os/hurd.txt
+++ b/src/build-data/os/hurd.txt
@@ -1,9 +1,12 @@
-os_type unix
 
 soname_suffix "so"
 
 <target_features>
-posix_mlock
+posix1
+dev_random
+clock_gettime
+
+sockets
 threads
 filesystem
 </target_features>
diff --git a/src/build-data/os/includeos.txt b/src/build-data/os/includeos.txt
index cabcec6b9..7d2ebfdc9 100644
--- a/src/build-data/os/includeos.txt
+++ b/src/build-data/os/includeos.txt
@@ -1,5 +1,4 @@
-os_type unikernel
-
-
 <target_features>
+posix1
+dev_random
 </target_features>
diff --git a/src/build-data/os/ios.txt b/src/build-data/os/ios.txt
index c0195fa9e..e5729fed8 100644
--- a/src/build-data/os/ios.txt
+++ b/src/build-data/os/ios.txt
@@ -1,4 +1,3 @@
-os_type unix
 
 soname_pattern_base  "libbotan-{version_major}.{version_minor}.dylib"
 soname_pattern_abi   "libbotan-{version_major}.{version_minor}.{abi_rev}.dylib"
@@ -7,13 +6,12 @@ soname_pattern_patch "libbotan-{version_major}.{version_minor}.{abi_rev}.{versio
 doc_dir doc
 
 <target_features>
+posix1
 arc4random
-dlopen
-filesystem
-gmtime_r
-readdir
+
 sockets
 threads
+filesystem
 </target_features>
 
 <aliases>
diff --git a/src/build-data/os/linux.txt b/src/build-data/os/linux.txt
index 99bcf21eb..7029adbef 100644
--- a/src/build-data/os/linux.txt
+++ b/src/build-data/os/linux.txt
@@ -1,14 +1,14 @@
-os_type unix
 
 soname_suffix "so"
 
 <target_features>
+posix1
+
+dev_random
+proc_fs
 clock_gettime
-posix_mlock
-gmtime_r
-dlopen
 getauxval
-readdir
+
 sockets
 threads
 filesystem
diff --git a/src/build-data/os/mingw.txt b/src/build-data/os/mingw.txt
index b0e98e166..b74aa2d49 100644
--- a/src/build-data/os/mingw.txt
+++ b/src/build-data/os/mingw.txt
@@ -1,4 +1,3 @@
-os_type windows
 
 program_suffix .exe
 obj_suffix o
@@ -16,9 +15,10 @@ mingw32.*
 </aliases>
 
 <target_features>
+win32
 cryptgenrandom
-loadlibrary
 virtual_lock
+
 threads
 filesystem
 </target_features>
diff --git a/src/build-data/os/netbsd.txt b/src/build-data/os/netbsd.txt
index 21f388e29..4de44a318 100644
--- a/src/build-data/os/netbsd.txt
+++ b/src/build-data/os/netbsd.txt
@@ -1,13 +1,13 @@
-os_type unix
 
 soname_suffix "so"
 
 <target_features>
+posix1
 clock_gettime
-posix_mlock
-gmtime_r
-dlopen
-readdir
+dev_random
+arc4random
+
+sockets
 threads
 filesystem
 </target_features>
diff --git a/src/build-data/os/openbsd.txt b/src/build-data/os/openbsd.txt
index a5db3fd8e..99a3edf79 100644
--- a/src/build-data/os/openbsd.txt
+++ b/src/build-data/os/openbsd.txt
@@ -1,17 +1,16 @@
-os_type unix
 
 soname_pattern_base  "libbotan-{version_major}.so"
 soname_pattern_abi   "libbotan-{version_major}.so.{abi_rev}"
 soname_pattern_patch "libbotan-{version_major}.so.{abi_rev}.{version_minor}"
 
 <target_features>
-arc4random
+posix1
 clock_gettime
+dev_random
+arc4random
+getentropy
 explicit_bzero
-posix_mlock
-gmtime_r
-dlopen
-readdir
+
 sockets
 threads
 filesystem
diff --git a/src/build-data/os/qnx.txt b/src/build-data/os/qnx.txt
index 65fd8acf0..70810d2d9 100644
--- a/src/build-data/os/qnx.txt
+++ b/src/build-data/os/qnx.txt
@@ -1,13 +1,11 @@
-# not really, but for our purposes
-os_type unix
-
 soname_suffix "so"
 
 <target_features>
+posix1
 clock_gettime
-posix_mlock
-gmtime_r
-dlopen
+dev_random
+
+sockets
 threads
 filesystem
 </target_features>
diff --git a/src/build-data/os/solaris.txt b/src/build-data/os/solaris.txt
index 7c89e4ad9..f2bfca616 100644
--- a/src/build-data/os/solaris.txt
+++ b/src/build-data/os/solaris.txt
@@ -1,11 +1,14 @@
-os_type unix
 
 soname_suffix "so"
 
 <target_features>
-posix_mlock
+posix1
+clock_gettime
+dev_random
+proc_fs
+
 threads
-readdir
+sockets
 filesystem
 </target_features>
 
diff --git a/src/build-data/os/windows.txt b/src/build-data/os/windows.txt
index 639b0512d..8fb8bc586 100644
--- a/src/build-data/os/windows.txt
+++ b/src/build-data/os/windows.txt
@@ -1,4 +1,3 @@
-os_type windows
 
 cli_exe_name botan-cli
 
@@ -17,16 +16,17 @@ install_root c:\\Botan
 doc_dir docs
 
 <target_features>
+win32
+winsock2
+
 cryptgenrandom
-gmtime_s
-loadlibrary
-query_perf_counter
-virtual_lock
 rtlsecurezeromemory
+
+virtual_lock
 stl_filesystem_msvc
+
 threads
 filesystem
-sockets
 </target_features>
 
 <aliases>
diff --git a/src/build-data/os/winphone.txt b/src/build-data/os/winphone.txt
index 34f2e0f5f..bc0179c12 100644
--- a/src/build-data/os/winphone.txt
+++ b/src/build-data/os/winphone.txt
@@ -1,4 +1,3 @@
-os_type windows
 
 # ?
 program_suffix .exe
@@ -9,13 +8,12 @@ install_root c:\\Botan
 doc_dir docs
 
 <target_features>
+win32
+winsock2
+
 crypto_ng
-gmtime_s
-loadlibrary
-query_perf_counter
 rtlsecurezeromemory
-#stl_filesystem_msvc
+
 threads
 filesystem
-sockets
 </target_features>