From bd3fe498e5d1587e8081607731113593cee1c0dc Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Tue, 29 Dec 2015 22:33:58 +0000 Subject: [PATCH] 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 diff --git a/mk/cfg/i686-unknown-linux-musl.mk b/mk/cfg/i686-unknown-linux-musl.mk new file mode 100644 index 000000000000..ac05798c7673 --- /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 9d75771dc80a..dff9c33f8db4 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 000000000000..77bc7bb51755 --- /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 de38b473b0ba..c61ae547a225 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 883aae8120e7..9d74bcb58242 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")),