From d6c0d859f6d859aa6e418b5ec58246071efbc9de Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Thu, 26 Nov 2015 19:05:10 +0000 Subject: Add the asmjs-unknown-emscripten triple. Add cfgs to libs. Backtraces, and the compilation of libbacktrace for asmjs, are disabled. This port doesn't use jemalloc so, like pnacl, it disables jemalloc *for all targets* in the configure file. It disables stack protection. --- src/libstd/sys/common/args.rs | 3 ++- src/libstd/sys/common/libunwind.rs | 4 ++++ src/libstd/sys/common/mod.rs | 2 +- src/libstd/sys/unix/backtrace/printing/mod.rs | 6 ++++-- src/libstd/sys/unix/fs.rs | 6 ++++-- src/libstd/sys/unix/mod.rs | 1 + src/libstd/sys/unix/os.rs | 8 +++++--- src/libstd/sys/unix/process.rs | 3 ++- src/libstd/sys/unix/thread.rs | 4 +++- 9 files changed, 26 insertions(+), 11 deletions(-) (limited to 'src/libstd/sys') diff --git a/src/libstd/sys/common/args.rs b/src/libstd/sys/common/args.rs index 4600983eb3b..58417540664 100644 --- a/src/libstd/sys/common/args.rs +++ b/src/libstd/sys/common/args.rs @@ -39,7 +39,8 @@ pub fn clone() -> Option>> { imp::clone() } target_os = "bitrig", target_os = "netbsd", target_os = "openbsd", - target_os = "solaris"))] + target_os = "solaris", + target_os = "emscripten"))] mod imp { use prelude::v1::*; diff --git a/src/libstd/sys/common/libunwind.rs b/src/libstd/sys/common/libunwind.rs index 956f6005f1c..3f70afe6ad7 100644 --- a/src/libstd/sys/common/libunwind.rs +++ b/src/libstd/sys/common/libunwind.rs @@ -86,6 +86,10 @@ pub const unwinder_private_data_size: usize = 2; #[cfg(any(target_arch = "powerpc", target_arch = "powerpc64"))] pub const unwinder_private_data_size: usize = 2; +#[cfg(target_arch = "asmjs")] +// FIXME: Copied from arm. Need to confirm. +pub const unwinder_private_data_size: usize = 20; + #[repr(C)] pub struct _Unwind_Exception { pub exception_class: _Unwind_Exception_Class, diff --git a/src/libstd/sys/common/mod.rs b/src/libstd/sys/common/mod.rs index 5062be8cd63..56628a4c754 100644 --- a/src/libstd/sys/common/mod.rs +++ b/src/libstd/sys/common/mod.rs @@ -45,7 +45,7 @@ pub mod unwind; pub mod util; pub mod wtf8; -#[cfg(any(all(unix, not(any(target_os = "macos", target_os = "ios"))), +#[cfg(any(all(unix, not(any(target_os = "macos", target_os = "ios", target_os = "emscripten"))), all(windows, target_env = "gnu")))] pub mod gnu; diff --git a/src/libstd/sys/unix/backtrace/printing/mod.rs b/src/libstd/sys/unix/backtrace/printing/mod.rs index e09832c231e..02e53854727 100644 --- a/src/libstd/sys/unix/backtrace/printing/mod.rs +++ b/src/libstd/sys/unix/backtrace/printing/mod.rs @@ -10,10 +10,12 @@ pub use self::imp::print; -#[cfg(any(target_os = "macos", target_os = "ios"))] +#[cfg(any(target_os = "macos", target_os = "ios", + target_os = "emscripten"))] #[path = "dladdr.rs"] mod imp; -#[cfg(not(any(target_os = "macos", target_os = "ios")))] +#[cfg(not(any(target_os = "macos", target_os = "ios", + target_os = "emscripten")))] #[path = "gnu.rs"] mod imp; diff --git a/src/libstd/sys/unix/fs.rs b/src/libstd/sys/unix/fs.rs index e672d9f1586..79cf4841300 100644 --- a/src/libstd/sys/unix/fs.rs +++ b/src/libstd/sys/unix/fs.rs @@ -293,7 +293,8 @@ impl DirEntry { #[cfg(any(target_os = "macos", target_os = "ios", target_os = "linux", - target_os = "solaris"))] + target_os = "solaris", + target_os = "emscripten"))] pub fn ino(&self) -> raw::ino_t { self.entry.d_ino } @@ -326,7 +327,8 @@ impl DirEntry { } } #[cfg(any(target_os = "android", - target_os = "linux"))] + target_os = "linux", + target_os = "emscripten"))] fn name_bytes(&self) -> &[u8] { unsafe { CStr::from_ptr(self.entry.d_name.as_ptr()).to_bytes() diff --git a/src/libstd/sys/unix/mod.rs b/src/libstd/sys/unix/mod.rs index f8a4bcdecd7..ac24cdb4d1c 100644 --- a/src/libstd/sys/unix/mod.rs +++ b/src/libstd/sys/unix/mod.rs @@ -26,6 +26,7 @@ use ops::Neg; #[cfg(target_os = "netbsd")] pub use os::netbsd as platform; #[cfg(target_os = "openbsd")] pub use os::openbsd as platform; #[cfg(target_os = "solaris")] pub use os::solaris as platform; +#[cfg(target_os = "emscripten")] pub use os::emscripten as platform; pub mod backtrace; pub mod condvar; diff --git a/src/libstd/sys/unix/os.rs b/src/libstd/sys/unix/os.rs index da770514593..9def3adc303 100644 --- a/src/libstd/sys/unix/os.rs +++ b/src/libstd/sys/unix/os.rs @@ -38,7 +38,8 @@ static ENV_LOCK: StaticMutex = StaticMutex::new(); /// Returns the platform-specific value of errno pub fn errno() -> i32 { extern { - #[cfg_attr(any(target_os = "linux"), link_name = "__errno_location")] + #[cfg_attr(any(target_os = "linux", target_os = "emscripten"), + link_name = "__errno_location")] #[cfg_attr(any(target_os = "bitrig", target_os = "netbsd", target_os = "openbsd", @@ -235,7 +236,7 @@ pub fn current_exe() -> io::Result { } } -#[cfg(any(target_os = "linux", target_os = "android"))] +#[cfg(any(target_os = "linux", target_os = "android", target_os = "emscripten"))] pub fn current_exe() -> io::Result { ::fs::read_link("/proc/self/exe") } @@ -385,7 +386,8 @@ pub fn args() -> Args { target_os = "netbsd", target_os = "openbsd", target_os = "solaris", - target_os = "nacl"))] + target_os = "nacl", + target_os = "emscripten"))] pub fn args() -> Args { use sys_common; let bytes = sys_common::args::clone().unwrap_or(Vec::new()); diff --git a/src/libstd/sys/unix/process.rs b/src/libstd/sys/unix/process.rs index 3ce2c684f07..f881070d241 100644 --- a/src/libstd/sys/unix/process.rs +++ b/src/libstd/sys/unix/process.rs @@ -131,7 +131,8 @@ impl fmt::Debug for Command { pub struct ExitStatus(c_int); #[cfg(any(target_os = "linux", target_os = "android", - target_os = "nacl", target_os = "solaris"))] + target_os = "nacl", target_os = "solaris", + target_os = "emscripten"))] mod status_imp { pub fn WIFEXITED(status: i32) -> bool { (status & 0xff) == 0 } pub fn WEXITSTATUS(status: i32) -> i32 { (status >> 8) & 0xff } diff --git a/src/libstd/sys/unix/thread.rs b/src/libstd/sys/unix/thread.rs index 277aa5f19f0..883aae8120e 100644 --- a/src/libstd/sys/unix/thread.rs +++ b/src/libstd/sys/unix/thread.rs @@ -81,7 +81,9 @@ impl Thread { debug_assert_eq!(ret, 0); } - #[cfg(any(target_os = "linux", target_os = "android"))] + #[cfg(any(target_os = "linux", + target_os = "android", + target_os = "emscripten"))] pub fn set_name(name: &str) { const PR_SET_NAME: libc::c_int = 15; let cname = CString::new(name).unwrap_or_else(|_| { -- cgit 1.4.1-3-g733a5 From bd3fe498e5d1587e8081607731113593cee1c0dc Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Tue, 29 Dec 2015 22:33:58 +0000 Subject: Add support for i686-unknown-linux-musl --- mk/cfg/i686-unknown-linux-musl.mk | 28 +++++++++++++ mk/main.mk | 3 ++ .../target/i686_unknown_linux_musl.rs | 46 ++++++++++++++++++++++ src/librustc_back/target/mod.rs | 1 + src/libstd/sys/unix/thread.rs | 4 +- 5 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 mk/cfg/i686-unknown-linux-musl.mk create mode 100644 src/librustc_back/target/i686_unknown_linux_musl.rs (limited to 'src/libstd/sys') diff --git a/mk/cfg/i686-unknown-linux-musl.mk b/mk/cfg/i686-unknown-linux-musl.mk new file mode 100644 index 00000000000..ac05798c767 --- /dev/null +++ b/mk/cfg/i686-unknown-linux-musl.mk @@ -0,0 +1,28 @@ +# i686-unknown-linux-musl configuration +CC_i686-unknown-linux-musl=$(CFG_MUSL_ROOT)/bin/musl-gcc +CXX_i686-unknown-linux-musl=notaprogram +CPP_i686-unknown-linux-musl=$(CFG_MUSL_ROOT)/bin/musl-gcc -E +AR_i686-unknown-linux-musl=$(AR) +CFG_INSTALL_ONLY_RLIB_i686-unknown-linux-musl = 1 +CFG_LIB_NAME_i686-unknown-linux-musl=lib$(1).so +CFG_STATIC_LIB_NAME_i686-unknown-linux-musl=lib$(1).a +CFG_LIB_GLOB_i686-unknown-linux-musl=lib$(1)-*.so +CFG_JEMALLOC_CFLAGS_i686-unknown-linux-musl := -m32 -Wl,-melf_i386 +CFG_GCCISH_CFLAGS_i686-unknown-linux-musl := -Wall -Werror -g -fPIC -m32 -Wl,-melf_i386 +CFG_GCCISH_CXXFLAGS_i686-unknown-linux-musl := +CFG_GCCISH_LINK_FLAGS_i686-unknown-linux-musl := +CFG_GCCISH_DEF_FLAG_i686-unknown-linux-musl := +CFG_LLC_FLAGS_i686-unknown-linux-musl := +CFG_INSTALL_NAME_i686-unknown-linux-musl = +CFG_EXE_SUFFIX_i686-unknown-linux-musl = +CFG_WINDOWSY_i686-unknown-linux-musl := +CFG_UNIXY_i686-unknown-linux-musl := 1 +CFG_LDPATH_i686-unknown-linux-musl := +CFG_RUN_i686-unknown-linux-musl=$(2) +CFG_RUN_TARG_i686-unknown-linux-musl=$(call CFG_RUN_i686-unknown-linux-musl,,$(2)) +CFG_GNU_TRIPLE_i686-unknown-linux-musl := i686-unknown-linux-musl +CFG_THIRD_PARTY_OBJECTS_i686-unknown-linux-musl := crt1.o crti.o crtn.o +CFG_INSTALLED_OBJECTS_i686-unknown-linux-musl := crt1.o crti.o crtn.o + +NATIVE_DEPS_libc_T_i686-unknown-linux-musl += libc.a +NATIVE_DEPS_std_T_i686-unknown-linux-musl += libunwind.a crt1.o crti.o crtn.o diff --git a/mk/main.mk b/mk/main.mk index 9d75771dc80..dff9c33f8db 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -361,6 +361,9 @@ export CFG_DISABLE_UNSTABLE_FEATURES export RUSTC_BOOTSTRAP_KEY:=$(CFG_BOOTSTRAP_KEY) endif export CFG_BOOTSTRAP_KEY +ifdef CFG_MUSL_ROOT +export CFG_MUSL_ROOT +endif ###################################################################### # Per-stage targets and runner diff --git a/src/librustc_back/target/i686_unknown_linux_musl.rs b/src/librustc_back/target/i686_unknown_linux_musl.rs new file mode 100644 index 00000000000..77bc7bb5175 --- /dev/null +++ b/src/librustc_back/target/i686_unknown_linux_musl.rs @@ -0,0 +1,46 @@ +// Copyright 2014 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// See x86_64_unknown_linux_musl for explanation of arguments + +use target::Target; + +pub fn target() -> Target { + let mut base = super::linux_base::opts(); + base.cpu = "pentium4".to_string(); + base.pre_link_args.push("-m32".to_string()); + base.pre_link_args.push("-Wl,-melf_i386".to_string()); + + base.pre_link_args.push("-nostdlib".to_string()); + base.pre_link_args.push("-static".to_string()); + base.pre_link_args.push("-Wl,--eh-frame-hdr".to_string()); + + base.pre_link_args.push("-Wl,-(".to_string()); + base.post_link_args.push("-Wl,-)".to_string()); + + base.pre_link_objects_exe.push("crt1.o".to_string()); + base.pre_link_objects_exe.push("crti.o".to_string()); + base.post_link_objects.push("crtn.o".to_string()); + + base.dynamic_linking = false; + base.has_rpath = false; + base.position_independent_executables = false; + + Target { + llvm_target: "i686-unknown-linux-musl".to_string(), + target_endian: "little".to_string(), + target_pointer_width: "32".to_string(), + arch: "x86".to_string(), + target_os: "linux".to_string(), + target_env: "musl".to_string(), + target_vendor: "unknown".to_string(), + options: base, + } +} diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs index de38b473b0b..c61ae547a22 100644 --- a/src/librustc_back/target/mod.rs +++ b/src/librustc_back/target/mod.rs @@ -431,6 +431,7 @@ impl Target { armv7_unknown_linux_gnueabihf, aarch64_unknown_linux_gnu, x86_64_unknown_linux_musl, + i686_unknown_linux_musl, mips_unknown_linux_musl, mipsel_unknown_linux_musl, diff --git a/src/libstd/sys/unix/thread.rs b/src/libstd/sys/unix/thread.rs index 883aae8120e..9d74bcb5824 100644 --- a/src/libstd/sys/unix/thread.rs +++ b/src/libstd/sys/unix/thread.rs @@ -168,7 +168,7 @@ impl Drop for Thread { } } -#[cfg(all(not(target_os = "linux"), +#[cfg(all(not(all(target_os = "linux", not(target_env = "musl"))), not(target_os = "macos"), not(target_os = "bitrig"), not(all(target_os = "netbsd", not(target_vendor = "rumprun"))), @@ -181,7 +181,7 @@ pub mod guard { } -#[cfg(any(target_os = "linux", +#[cfg(any(all(target_os = "linux", not(target_env = "musl")), target_os = "macos", target_os = "bitrig", all(target_os = "netbsd", not(target_vendor = "rumprun")), -- cgit 1.4.1-3-g733a5