Merge GH #665 Add IncludeOS target, make filesystem/threads optional

20 files changed, 50 insertions, 1 deletions

diff --git a/src/build-data/buildh.in b/src/build-data/buildh.in
index e943973a0..c84698804 100644
--- a/src/build-data/buildh.in
+++ b/src/build-data/buildh.in
@@ -199,8 +199,15 @@ Each read generates 32 bits of output
 
 %{target_compiler_defines}
 
+
+#if defined(__GNUG__) || defined(__clang__)
+  #define BOTAN_FUNC_ISA(isa) __attribute__ ((target(isa)))
+#else
+  #define BOTAN_FUNC_ISA(isa)
+#endif
+
 /*
-* Compile-time deprecatation warnings
+* Compile-time deprecation warnings
 */
 #if !defined(BOTAN_NO_DEPRECATED_WARNINGS)
 
diff --git a/src/build-data/os/aix.txt b/src/build-data/os/aix.txt
index 369b720c4..de417ce90 100644
--- a/src/build-data/os/aix.txt
+++ b/src/build-data/os/aix.txt
@@ -2,4 +2,6 @@ os_type unix
 
 <target_features>
 gettimeofday
+threads
+filesystem
 </target_features>
diff --git a/src/build-data/os/android.txt b/src/build-data/os/android.txt
index 43e5fdc44..64a639909 100644
--- a/src/build-data/os/android.txt
+++ b/src/build-data/os/android.txt
@@ -11,4 +11,6 @@ posix_mlock
 gmtime_r
 dlopen
 readdir
+threads
+filesystem
 </target_features>
diff --git a/src/build-data/os/cygwin.txt b/src/build-data/os/cygwin.txt
index ee934f787..956f5b28d 100644
--- a/src/build-data/os/cygwin.txt
+++ b/src/build-data/os/cygwin.txt
@@ -13,4 +13,6 @@ doc_dir docs
 <target_features>
 gettimeofday
 timegm
+threads
+filesystem
 </target_features>
diff --git a/src/build-data/os/darwin.txt b/src/build-data/os/darwin.txt
index f95e8f5e8..662101b1c 100644
--- a/src/build-data/os/darwin.txt
+++ b/src/build-data/os/darwin.txt
@@ -18,6 +18,8 @@ memset_s
 readdir
 timegm
 sockets
+threads
+filesystem
 </target_features>
 
 <aliases>
diff --git a/src/build-data/os/dragonfly.txt b/src/build-data/os/dragonfly.txt
index f9137d3c1..1ff2804b0 100644
--- a/src/build-data/os/dragonfly.txt
+++ b/src/build-data/os/dragonfly.txt
@@ -5,4 +5,6 @@ clock_gettime
 gettimeofday
 posix_mlock
 sockets
+threads
+filesystem
 </target_features>
diff --git a/src/build-data/os/freebsd.txt b/src/build-data/os/freebsd.txt
index 9d6ed3614..326e6661a 100644
--- a/src/build-data/os/freebsd.txt
+++ b/src/build-data/os/freebsd.txt
@@ -13,4 +13,6 @@ dlopen
 readdir
 timegm
 sockets
+threads
+filesystem
 </target_features>
diff --git a/src/build-data/os/haiku.txt b/src/build-data/os/haiku.txt
index 8e35e76eb..9ad3f29f7 100644
--- a/src/build-data/os/haiku.txt
+++ b/src/build-data/os/haiku.txt
@@ -8,6 +8,8 @@ doc_dir system/documentation
 <target_features>
 gettimeofday
 gmtime_r
+threads
+filesystem
 </target_features>
 
 <aliases>
diff --git a/src/build-data/os/hpux.txt b/src/build-data/os/hpux.txt
index 22d51ef0a..3f6f0d940 100644
--- a/src/build-data/os/hpux.txt
+++ b/src/build-data/os/hpux.txt
@@ -2,6 +2,8 @@ os_type unix
 
 <target_features>
 gettimeofday
+threads
+filesystem
 </target_features>
 
 <aliases>
diff --git a/src/build-data/os/hurd.txt b/src/build-data/os/hurd.txt
index e3906f63a..35a65315d 100644
--- a/src/build-data/os/hurd.txt
+++ b/src/build-data/os/hurd.txt
@@ -2,6 +2,8 @@ os_type unix
 
 <target_features>
 posix_mlock
+threads
+filesystem
 </target_features>
 
 <aliases>
diff --git a/src/build-data/os/includeos.txt b/src/build-data/os/includeos.txt
new file mode 100644
index 000000000..423575b4a
--- /dev/null
+++ b/src/build-data/os/includeos.txt
@@ -0,0 +1,7 @@
+os_type unikernel
+
+building_shared_supported no
+
+<target_features>
+includeos_rng
+</target_features>
diff --git a/src/build-data/os/irix.txt b/src/build-data/os/irix.txt
index 369b720c4..de417ce90 100644
--- a/src/build-data/os/irix.txt
+++ b/src/build-data/os/irix.txt
@@ -2,4 +2,6 @@ os_type unix
 
 <target_features>
 gettimeofday
+threads
+filesystem
 </target_features>
diff --git a/src/build-data/os/linux.txt b/src/build-data/os/linux.txt
index 42f101c3d..cb6c75df9 100644
--- a/src/build-data/os/linux.txt
+++ b/src/build-data/os/linux.txt
@@ -13,6 +13,8 @@ dlopen
 readdir
 timegm
 sockets
+threads
+filesystem
 </target_features>
 
 <aliases>
diff --git a/src/build-data/os/mingw.txt b/src/build-data/os/mingw.txt
index 5c72099e0..45fad382d 100644
--- a/src/build-data/os/mingw.txt
+++ b/src/build-data/os/mingw.txt
@@ -25,4 +25,6 @@ loadlibrary
 mkgmtime
 win32_virtual_lock
 win32_get_systemtime
+threads
+filesystem
 </target_features>
diff --git a/src/build-data/os/nacl.txt b/src/build-data/os/nacl.txt
index 3df798ed8..e2e2f34be 100644
--- a/src/build-data/os/nacl.txt
+++ b/src/build-data/os/nacl.txt
@@ -1,4 +1,5 @@
 
 <target_features>
 gettimeofday
+threads
 </target_features>
diff --git a/src/build-data/os/netbsd.txt b/src/build-data/os/netbsd.txt
index 510a7accd..baf4b1a9c 100644
--- a/src/build-data/os/netbsd.txt
+++ b/src/build-data/os/netbsd.txt
@@ -8,4 +8,6 @@ gmtime_r
 dlopen
 readdir
 timegm
+threads
+filesystem
 </target_features>
diff --git a/src/build-data/os/openbsd.txt b/src/build-data/os/openbsd.txt
index dfe3d2edf..0e18eb8e1 100644
--- a/src/build-data/os/openbsd.txt
+++ b/src/build-data/os/openbsd.txt
@@ -9,4 +9,6 @@ dlopen
 readdir
 timegm
 sockets
+threads
+filesystem
 </target_features>
diff --git a/src/build-data/os/qnx.txt b/src/build-data/os/qnx.txt
index 4c0965764..a2061594f 100644
--- a/src/build-data/os/qnx.txt
+++ b/src/build-data/os/qnx.txt
@@ -6,4 +6,6 @@ gettimeofday
 posix_mlock
 gmtime_r
 dlopen
+threads
+filesystem
 </target_features>
diff --git a/src/build-data/os/solaris.txt b/src/build-data/os/solaris.txt
index 0ed785036..1e740aea7 100644
--- a/src/build-data/os/solaris.txt
+++ b/src/build-data/os/solaris.txt
@@ -6,6 +6,8 @@ install_cmd_exec '/usr/ucb/install -m 755'
 <target_features>
 posix_mlock
 gettimeofday
+threads
+filesystem
 </target_features>
 
 <aliases>
diff --git a/src/build-data/os/windows.txt b/src/build-data/os/windows.txt
index 32236e00b..679dfe651 100644
--- a/src/build-data/os/windows.txt
+++ b/src/build-data/os/windows.txt
@@ -21,6 +21,8 @@ query_perf_counter
 virtual_lock
 rtlsecurezeromemory
 stl_filesystem_msvc
+threads
+filesystem
 </target_features>
 
 <aliases>