OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Apply several fixes for Illumos support

Browse Source
This commit is contained in:
Nikita Baksalyar 2016-01-26 17:15:10 +03:00
parent f189d7a693
commit ebab24059a
No known key found for this signature in database
GPG Key ID: 3EEA378A0EA758DA
5 changed files with 79 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -1,12 +1,12 @@
#!/bin/sh
# /bin/sh on Solaris is not a POSIX compatible shell, but /usr/bin/ksh is.
# /bin/sh on Solaris is not a POSIX compatible shell, but /usr/bin/bash is.
if [ `uname -s` = 'SunOS' -a "${POSIX_SHELL}" != "true" ]; then
POSIX_SHELL="true"
export POSIX_SHELL
exec /usr/bin/bash $0 "$@"
exec /usr/bin/env bash $0 "$@"
fi
unset POSIX_SHELL # clear it so if we invoke other scripts, they run as ksh as well
unset POSIX_SHELL # clear it so if we invoke other scripts, they run as bash as well
msg() {
echo "configure: $*"

2
src/librustc_back/target/x86_64_sun_solaris.rs
View File

@ -13,8 +13,6 @@ use target::Target;
pub fn target() -> Target {
let mut base = super::sunos_base::opts();
base.pre_link_args.push("-m64".to_string());
base.pre_link_args.push("-lsocket".to_string());
base.pre_link_args.push("-lposix4".to_string());
Target {
llvm_target: "x86_64-pc-solaris2.11".to_string(),

99
src/libstd/num/f64.rs
View File

@ -84,38 +84,6 @@ mod cmath {
}
}
#[cfg(not(target_os = "sunos"))]
macro_rules! log_wrapper {
($num:ident, $f:ident) => (
unsafe { intrinsics::$f($num) }
)
}
// Illumos requires a wrapper around log, log2, and log10 functions
// because of non-standard behavior (e.g. log(-n) returns -Inf instead
// of expected NaN).
#[cfg(target_os = "sunos")]
macro_rules! log_wrapper {
($num:ident, $f:ident) => (
if $num.is_finite() {
if $num > 0.0 {
return unsafe { intrinsics::$f($num) }
}
return if $num == 0.0 {
NEG_INFINITY // log(0) = -Inf
} else {
NAN // log(-ve) = NaN
}
} else if $num.is_nan() {
$num // log(NaN) = NaN
} else if $num > 0.0 {
$num // log(Inf) = Inf
} else {
return NAN // log(-Inf) = NaN
}
)
}
#[cfg(not(test))]
#[lang = "f64"]
impl f64 {
@ -543,7 +511,28 @@ impl f64 {
#[stable(feature = "rust1", since = "1.0.0")]
#[inline]
pub fn ln(self) -> f64 {
log_wrapper!(self, logf64)
if !cfg!(target_os = "sunos") {
unsafe { intrinsics::logf64(self) }
} else {
// 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).
if self.is_finite() {
if self > 0.0 {
unsafe { intrinsics::logf64(self) }
} else if self == 0.0 {
NEG_INFINITY // log(0) = -Inf
} else {
NAN // log(-n) = NaN
}
} else if self.is_nan() {
self // log(NaN) = NaN
} else if self > 0.0 {
self // log(Inf) = Inf
} else {
NAN // log(-Inf) = NaN
}
}
}
/// Returns the logarithm of the number with respect to an arbitrary base.
@ -578,7 +567,27 @@ impl f64 {
#[stable(feature = "rust1", since = "1.0.0")]
#[inline]
pub fn log2(self) -> f64 {
log_wrapper!(self, log2f64)
if !cfg!(target_os = "sunos") {
unsafe { intrinsics::log2f64(self) }
} else {
// Illumos requires a wrapper around the log2 function because of
// its non-standard behavior
if self.is_finite() {
if self > 0.0 {
unsafe { intrinsics::log2f64(self) }
} else if self == 0.0 {
NEG_INFINITY // log2(0) = -Inf
} else {
NAN // log2(-n) = NaN
}
} else if self.is_nan() {
self // log2(NaN) = NaN
} else if self > 0.0 {
self // log2(Inf) = Inf
} else {
NAN // log2(-Inf) = NaN
}
}
}
/// Returns the base 10 logarithm of the number.
@ -594,7 +603,27 @@ impl f64 {
#[stable(feature = "rust1", since = "1.0.0")]
#[inline]
pub fn log10(self) -> f64 {
log_wrapper!(self, log10f64)
if !cfg!(target_os = "sunos") {
unsafe { intrinsics::log10f64(self) }
} else {
// Illumos requires a wrapper around the log10 function because of
// its non-standard behavior.
if self.is_finite() {
if self > 0.0 {
unsafe { intrinsics::log10f64(self) }
} else if self == 0.0 {
NEG_INFINITY // log10(0) = -Inf
} else {
NAN // log10(-n) = NaN
}
} else if self.is_nan() {
self // log10(NaN) = NaN
} else if self > 0.0 {
self // log10(Inf) = Inf
} else {
NAN // log10(-Inf) = NaN
}
}
}
/// Converts radians to degrees.

6
src/libstd/rtdeps.rs
View File

@ -39,6 +39,12 @@ extern {}
#[link(name = "pthread")]
extern {}
#[cfg(target_os = "sunos")]
#[link(name = "socket")]
#[link(name = "posix4")]
#[link(name = "pthread")]
extern {}
// For PNaCl targets, nacl_io is a Pepper wrapper for some IO functions
// missing (ie always error) in Newlib.
#[cfg(all(target_os = "nacl", not(test)))]

10
src/libstd/sys/unix/os.rs
View File

@ -269,12 +269,14 @@ pub fn current_exe() -> io::Result<PathBuf> {
Err(io::Error::last_os_error())
} else {
let filename = CStr::from_ptr(path).to_bytes();
let path = PathBuf::from(<OsStr as OsStrExt>::from_bytes(filename));
// Prepend a current working directory to the path if
// it doesn't contain an absolute pathname.
if filename[0] == b'/' {
Ok(PathBuf::from(<OsStr as OsStrExt>::from_bytes(filename)))
Ok(path)
} else {
// Prepend current working directory to the path if
// it doesn't contain an absolute pathname.
return getcwd().map(|cwd| cwd.join(<OsStr as OsStrExt>::from_bytes(filename)))
getcwd().map(|cwd| cwd.join(path))
}
}
}