From bba11c5d6ee451cfe11e05051c62cce5979ab0f8 Mon Sep 17 00:00:00 2001
From: "Joshua M. Clulow" <jmc@oxide.computer>
Date: Sat, 22 Aug 2020 17:41:01 -0700
Subject: [PATCH] add support for illumos

I agree to license my contributions to each file under the terms given
at the top of each file I changed.
---
 Cargo.toml                  | 2 +-
 crypto/perlasm/x86asm.pl    | 2 +-
 src/rand.rs                 | 2 ++
 util/make_prefix_headers.go | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index b1c29cf024..da0fd17b51 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -304,7 +304,7 @@ spin = { version = "0.5.2", default-features = false }
 [target.'cfg(any(target_os = "android", target_os = "linux"))'.dependencies]
 libc = { version = "0.2.69", default-features = false }
 
-[target.'cfg(any(target_os = "android", target_os = "freebsd", target_os = "linux", target_os = "netbsd", target_os = "openbsd", target_os = "solaris"))'.dependencies]
+[target.'cfg(any(target_os = "android", target_os = "freebsd", target_os = "linux", target_os = "netbsd", target_os = "openbsd", target_os = "illumos", target_os = "solaris"))'.dependencies]
 once_cell = { version = "1.3.1", default-features = false, features=["std"], optional = true }
 
 [target.'cfg(all(target_arch = "wasm32", target_vendor = "unknown", target_os = "unknown", target_env = ""))'.dependencies]
diff --git a/crypto/perlasm/x86asm.pl b/crypto/perlasm/x86asm.pl
index 9ab8201e94..0fc3c06ca4 100644
--- a/crypto/perlasm/x86asm.pl
+++ b/crypto/perlasm/x86asm.pl
@@ -311,7 +311,7 @@ sub ::asm_init
     else
     {	print STDERR <<"EOF";
 Pick one target type from
-	elf	- Linux, FreeBSD, Solaris x86, etc.
+	elf	- Linux, FreeBSD, illumos, Solaris x86, etc.
 	a.out	- DJGPP, elder OpenBSD, etc.
 	coff	- GAS/COFF such as Win32 targets
 	win32n	- Windows 95/Windows NT NASM format
diff --git a/src/rand.rs b/src/rand.rs
index fb395cdae8..fd8a719b6f 100644
--- a/src/rand.rs
+++ b/src/rand.rs
@@ -183,6 +183,7 @@ use self::sysrand_or_urandom::fill as fill_impl;
     target_os = "freebsd",
     target_os = "netbsd",
     target_os = "openbsd",
+    target_os = "illumos",
     target_os = "solaris"
 ))]
 use self::urandom::fill as fill_impl;
@@ -354,6 +355,7 @@ mod sysrand_or_urandom {
     target_os = "freebsd",
     target_os = "netbsd",
     target_os = "openbsd",
+    target_os = "illumos",
     target_os = "solaris"
 ))]
 mod urandom {
diff --git a/util/make_prefix_headers.go b/util/make_prefix_headers.go
index b536f14cea..737b325ebf 100644
--- a/util/make_prefix_headers.go
+++ b/util/make_prefix_headers.go
@@ -23,7 +23,7 @@
 // instead of a custom macro. This avoids the need for a custom macro, but also
 // ensures that our renaming won't conflict with symbols defined and used by our
 // consumers (the "HMAC" problem). An example of this approach can be seen in
-// IllumOS' fork of OpenSSL:
+// the SmartOS fork of OpenSSL:
 // https://github.com/joyent/illumos-extra/blob/master/openssl1x/sunw_prefix.h
 
 package main