Rename sunos to solaris

Author: nbaksalyar

src/compiletest/util.rs

@@ -25,7 +25,7 @@ const OS_TABLE: &'static [(&'static str, &'static str)] = &[
     ("openbsd", "openbsd"),
     ("win32", "windows"),
     ("windows", "windows"),
-    ("solaris", "sunos"),
+    ("solaris", "solaris"),
 ];
 
 const ARCH_TABLE: &'static [(&'static str, &'static str)] = &[

src/etc/snapshot.py

@@ -48,7 +48,7 @@ def scrub(b):
         "macos": ["bin/rustc"],
         "netbsd": ["bin/rustc"],
         "openbsd": ["bin/rustc"],
-        "sunos": ["bin/rustc"],
+        "solaris": ["bin/rustc"],
         "winnt": ["bin/rustc.exe"],
         }
 

src/librustc_back/target/mod.rs

@@ -59,7 +59,7 @@ mod freebsd_base;
 mod linux_base;
 mod openbsd_base;
 mod netbsd_base;
-mod sunos_base;
+mod solaris_base;
 mod windows_base;
 mod windows_msvc_base;
 
@@ -159,7 +159,7 @@ pub struct TargetOptions {
     /// Whether the target toolchain is like Solaris's.
     /// Only useful for compiling against Illumos/Solaris,
     /// as they have a different set of linker flags. Defaults to false.
-    pub is_like_sunos: bool,
+    pub is_like_solaris: bool,
     /// Whether the target toolchain is like Windows'. Only useful for compiling against Windows,
     /// only really used for figuring out how to find libraries, since Windows uses its own
     /// library naming convention. Defaults to false.
@@ -232,7 +232,7 @@ impl Default for TargetOptions {
             staticlib_suffix: ".a".to_string(),
             target_family: None,
             is_like_osx: false,
-            is_like_sunos: false,
+            is_like_solaris: false,
             is_like_windows: false,
             is_like_android: false,
             is_like_msvc: false,

src/librustc_back/target/sunos_base.rs renamed to src/librustc_back/target/solaris_base.rs

@@ -17,7 +17,7 @@ pub fn opts() -> TargetOptions {
         dynamic_linking: true,
         executables: true,
         has_rpath: true,
-        is_like_sunos: true,
+        is_like_solaris: true,
         archive_format: "gnu".to_string(),
         exe_allocation_crate: super::maybe_jemalloc(),
 

src/librustc_back/target/x86_64_sun_solaris.rs

@@ -11,15 +11,15 @@
 use target::Target;
 
 pub fn target() -> Target {
-    let mut base = super::sunos_base::opts();
+    let mut base = super::solaris_base::opts();
     base.pre_link_args.push("-m64".to_string());
 
     Target {
-        llvm_target: "x86_64-pc-solaris2.11".to_string(),
+        llvm_target: "x86_64-pc-solaris".to_string(),
         target_endian: "little".to_string(),
         target_pointer_width: "64".to_string(),
         arch: "x86_64".to_string(),
-        target_os: "sunos".to_string(),
+        target_os: "solaris".to_string(),
         target_env: "".to_string(),
         target_vendor: "sun".to_string(),
         options: base,

src/librustc_trans/back/linker.rs

@@ -131,7 +131,7 @@ impl<'a> Linker for GnuLinker<'a> {
         // insert it here.
         if self.sess.target.target.options.is_like_osx {
             self.cmd.arg("-Wl,-dead_strip");
-        } else if self.sess.target.target.options.is_like_sunos {
+        } else if self.sess.target.target.options.is_like_solaris {
             self.cmd.arg("-Wl,-z");
             self.cmd.arg("-Wl,ignore");
 

src/librustdoc/flock.rs

@@ -111,7 +111,7 @@ mod imp {
         pub const F_SETLKW: libc::c_int = 9;
     }
 
-    #[cfg(target_os = "sunos")]
+    #[cfg(target_os = "solaris")]
     mod os {
         use libc;
 
@@ -122,8 +122,6 @@ mod imp {
             pub l_len: libc::off_t,
             pub l_sysid: libc::c_int,
             pub l_pid: libc::pid_t,
-
-            // __unused1: [libc::c_long; 4]
         }
 
         pub const F_WRLCK: libc::c_short = 2;

src/libstd/dynamic_lib.rs

@@ -173,7 +173,7 @@ mod tests {
               target_os = "bitrig",
               target_os = "netbsd",
               target_os = "openbsd",
-              target_os = "sunos"))]
+              target_os = "solaris"))]
     #[allow(deprecated)]
     fn test_errors_do_not_crash() {
         use path::Path;
@@ -197,7 +197,7 @@ mod tests {
           target_os = "bitrig",
           target_os = "netbsd",
           target_os = "openbsd",
-          target_os = "sunos"))]
+          target_os = "solaris"))]
 mod dl {
     use prelude::v1::*;
 

src/libstd/env.rs

@@ -642,7 +642,7 @@ pub mod consts {
     /// - bitrig
     /// - netbsd
     /// - openbsd
-    /// - sunos
+    /// - solaris
     /// - android
     /// - windows
     #[stable(feature = "env", since = "1.0.0")]
@@ -803,10 +803,10 @@ mod os {
     pub const EXE_EXTENSION: &'static str = "";
 }
 
-#[cfg(target_os = "sunos")]
+#[cfg(target_os = "solaris")]
 mod os {
     pub const FAMILY: &'static str = "unix";
-    pub const OS: &'static str = "sunos";
+    pub const OS: &'static str = "solaris";
     pub const DLL_PREFIX: &'static str = "lib";
     pub const DLL_SUFFIX: &'static str = ".so";
     pub const DLL_EXTENSION: &'static str = "so";

src/libstd/num/f64.rs

@@ -1066,11 +1066,11 @@ impl f64 {
         0.5 * ((2.0 * self) / (1.0 - self)).ln_1p()
     }
 
-    // Illumos requires a wrapper around log, log2, and log10 functions
+    // Solaris/Illumos requires a wrapper around log, log2, and log10 functions
     // because of their non-standard behavior (e.g. log(-n) returns -Inf instead
     // of expected NaN).
     fn log_wrapper<F: Fn(f64) -> f64>(self, log_fn: F) -> f64 {
-        if !cfg!(target_os = "sunos") {
+        if !cfg!(target_os = "solaris") {
             log_fn(self)
         } else {
             if self.is_finite() {