364 lines
16 KiB
Diff
364 lines
16 KiB
Diff
From 7219ba1c9accbad9b530d312fd9a9f69330c93da Mon Sep 17 00:00:00 2001
|
|
From: Samuel Holland <samuel@sholland.org>
|
|
Date: Sun, 3 May 2020 17:53:33 +0200
|
|
Subject: [PATCH 02/15] Remove -nostdlib and musl_root from musl targets
|
|
|
|
extended by various void contributors to match our musl setup
|
|
|
|
diff --git a/compiler/rustc_target/src/spec/crt_objects.rs b/compiler/rustc_target/src/spec/crt_objects.rs
|
|
index c126390f5..7aef73d3b 100644
|
|
--- a/compiler/rustc_target/src/spec/crt_objects.rs
|
|
+++ b/compiler/rustc_target/src/spec/crt_objects.rs
|
|
@@ -63,28 +63,6 @@ pub(super) fn all(obj: &'static str) -> CrtObjects {
|
|
])
|
|
}
|
|
|
|
-pub(super) fn pre_musl_self_contained() -> CrtObjects {
|
|
- new(&[
|
|
- (LinkOutputKind::DynamicNoPicExe, &["crt1.o", "crti.o", "crtbegin.o"]),
|
|
- (LinkOutputKind::DynamicPicExe, &["Scrt1.o", "crti.o", "crtbeginS.o"]),
|
|
- (LinkOutputKind::StaticNoPicExe, &["crt1.o", "crti.o", "crtbegin.o"]),
|
|
- (LinkOutputKind::StaticPicExe, &["rcrt1.o", "crti.o", "crtbeginS.o"]),
|
|
- (LinkOutputKind::DynamicDylib, &["crti.o", "crtbeginS.o"]),
|
|
- (LinkOutputKind::StaticDylib, &["crti.o", "crtbeginS.o"]),
|
|
- ])
|
|
-}
|
|
-
|
|
-pub(super) fn post_musl_self_contained() -> CrtObjects {
|
|
- new(&[
|
|
- (LinkOutputKind::DynamicNoPicExe, &["crtend.o", "crtn.o"]),
|
|
- (LinkOutputKind::DynamicPicExe, &["crtendS.o", "crtn.o"]),
|
|
- (LinkOutputKind::StaticNoPicExe, &["crtend.o", "crtn.o"]),
|
|
- (LinkOutputKind::StaticPicExe, &["crtendS.o", "crtn.o"]),
|
|
- (LinkOutputKind::DynamicDylib, &["crtendS.o", "crtn.o"]),
|
|
- (LinkOutputKind::StaticDylib, &["crtendS.o", "crtn.o"]),
|
|
- ])
|
|
-}
|
|
-
|
|
pub(super) fn pre_mingw_self_contained() -> CrtObjects {
|
|
new(&[
|
|
(LinkOutputKind::DynamicNoPicExe, &["crt2.o", "rsbegin.o"]),
|
|
diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs
|
|
index 61553e71b..88f807a58 100644
|
|
--- a/compiler/rustc_target/src/spec/linux_musl_base.rs
|
|
+++ b/compiler/rustc_target/src/spec/linux_musl_base.rs
|
|
@@ -1,16 +1,9 @@
|
|
-use crate::spec::crt_objects::{self, LinkSelfContainedDefault};
|
|
use crate::spec::TargetOptions;
|
|
|
|
pub fn opts() -> TargetOptions {
|
|
let mut base = super::linux_base::opts();
|
|
|
|
base.env = "musl".into();
|
|
- base.pre_link_objects_self_contained = crt_objects::pre_musl_self_contained();
|
|
- base.post_link_objects_self_contained = crt_objects::post_musl_self_contained();
|
|
- base.link_self_contained = LinkSelfContainedDefault::Musl;
|
|
-
|
|
- // These targets statically link libc by default
|
|
- base.crt_static_default = true;
|
|
|
|
base
|
|
}
|
|
diff --git a/config.example.toml b/config.example.toml
|
|
index 5c4bee875..bccf81b0a 100644
|
|
--- a/config.example.toml
|
|
+++ b/config.example.toml
|
|
@@ -573,14 +573,6 @@ changelog-seen = 2
|
|
# behavior -- this may lead to miscompilations or other bugs.
|
|
#description = ""
|
|
|
|
-# The root location of the musl installation directory. The library directory
|
|
-# will also need to contain libunwind.a for an unwinding implementation. Note
|
|
-# that this option only makes sense for musl targets that produce statically
|
|
-# linked binaries.
|
|
-#
|
|
-# Defaults to /usr on musl hosts. Has no default otherwise.
|
|
-#musl-root = <platform specific> (path)
|
|
-
|
|
# By default the `rustc` executable is built with `-Wl,-rpath` flags on Unix
|
|
# platforms to ensure that the compiler is usable by default from the build
|
|
# directory (as it links to a number of dynamic libraries). This may not be
|
|
diff --git a/src/bootstrap/cc_detect.rs b/src/bootstrap/cc_detect.rs
|
|
index 2496c2a9d..9aff56181 100644
|
|
--- a/src/bootstrap/cc_detect.rs
|
|
+++ b/src/bootstrap/cc_detect.rs
|
|
@@ -110,7 +110,7 @@ pub fn find_target(build: &Build, target: TargetSelection) {
|
|
if let Some(cc) = config.and_then(|c| c.cc.as_ref()) {
|
|
cfg.compiler(cc);
|
|
} else {
|
|
- set_compiler(&mut cfg, Language::C, target, config, build);
|
|
+ set_compiler(&mut cfg, Language::C, target, config);
|
|
}
|
|
|
|
let compiler = cfg.get_compiler();
|
|
@@ -131,7 +131,7 @@ pub fn find_target(build: &Build, target: TargetSelection) {
|
|
cfg.compiler(cxx);
|
|
true
|
|
} else if build.hosts.contains(&target) || build.build == target {
|
|
- set_compiler(&mut cfg, Language::CPlusPlus, target, config, build);
|
|
+ set_compiler(&mut cfg, Language::CPlusPlus, target, config);
|
|
true
|
|
} else {
|
|
// Use an auto-detected compiler (or one configured via `CXX_target_triple` env vars).
|
|
@@ -166,7 +166,6 @@ fn set_compiler(
|
|
compiler: Language,
|
|
target: TargetSelection,
|
|
config: Option<&Target>,
|
|
- build: &Build,
|
|
) {
|
|
match &*target.triple {
|
|
// When compiling for android we may have the NDK configured in the
|
|
@@ -202,26 +201,6 @@ fn set_compiler(
|
|
}
|
|
}
|
|
|
|
- "mips-unknown-linux-musl" => {
|
|
- if cfg.get_compiler().path().to_str() == Some("gcc") {
|
|
- cfg.compiler("mips-linux-musl-gcc");
|
|
- }
|
|
- }
|
|
- "mipsel-unknown-linux-musl" => {
|
|
- if cfg.get_compiler().path().to_str() == Some("gcc") {
|
|
- cfg.compiler("mipsel-linux-musl-gcc");
|
|
- }
|
|
- }
|
|
-
|
|
- t if t.contains("musl") => {
|
|
- if let Some(root) = build.musl_root(target) {
|
|
- let guess = root.join("bin/musl-gcc");
|
|
- if guess.exists() {
|
|
- cfg.compiler(guess);
|
|
- }
|
|
- }
|
|
- }
|
|
-
|
|
_ => {}
|
|
}
|
|
}
|
|
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
|
|
index 9c68e5a78..09fb6a721 100644
|
|
--- a/src/bootstrap/compile.rs
|
|
+++ b/src/bootstrap/compile.rs
|
|
@@ -256,39 +256,7 @@ fn copy_self_contained_objects(
|
|
let mut target_deps = vec![];
|
|
|
|
// Copies the libc and CRT objects.
|
|
- //
|
|
- // rustc historically provides a more self-contained installation for musl targets
|
|
- // not requiring the presence of a native musl toolchain. For example, it can fall back
|
|
- // to using gcc from a glibc-targeting toolchain for linking.
|
|
- // To do that we have to distribute musl startup objects as a part of Rust toolchain
|
|
- // and link with them manually in the self-contained mode.
|
|
- if target.contains("musl") && !target.contains("unikraft") {
|
|
- let srcdir = builder.musl_libdir(target).unwrap_or_else(|| {
|
|
- panic!("Target {:?} does not have a \"musl-libdir\" key", target.triple)
|
|
- });
|
|
- for &obj in &["libc.a", "crt1.o", "Scrt1.o", "rcrt1.o", "crti.o", "crtn.o"] {
|
|
- copy_and_stamp(
|
|
- builder,
|
|
- &libdir_self_contained,
|
|
- &srcdir,
|
|
- obj,
|
|
- &mut target_deps,
|
|
- DependencyType::TargetSelfContained,
|
|
- );
|
|
- }
|
|
- let crt_path = builder.ensure(llvm::CrtBeginEnd { target });
|
|
- for &obj in &["crtbegin.o", "crtbeginS.o", "crtend.o", "crtendS.o"] {
|
|
- let src = crt_path.join(obj);
|
|
- let target = libdir_self_contained.join(obj);
|
|
- builder.copy(&src, &target);
|
|
- target_deps.push((target, DependencyType::TargetSelfContained));
|
|
- }
|
|
-
|
|
- if !target.starts_with("s390x") {
|
|
- let libunwind_path = copy_llvm_libunwind(builder, target, &libdir_self_contained);
|
|
- target_deps.push((libunwind_path, DependencyType::TargetSelfContained));
|
|
- }
|
|
- } else if target.contains("-wasi") {
|
|
+ if target.contains("-wasi") {
|
|
let srcdir = builder
|
|
.wasi_root(target)
|
|
.unwrap_or_else(|| {
|
|
@@ -390,15 +358,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
|
|
.arg("--manifest-path")
|
|
.arg(builder.src.join("library/sysroot/Cargo.toml"));
|
|
|
|
- // Help the libc crate compile by assisting it in finding various
|
|
- // sysroot native libraries.
|
|
- if target.contains("musl") {
|
|
- if let Some(p) = builder.musl_libdir(target) {
|
|
- let root = format!("native={}", p.to_str().unwrap());
|
|
- cargo.rustflag("-L").rustflag(&root);
|
|
- }
|
|
- }
|
|
-
|
|
if target.contains("-wasi") {
|
|
if let Some(p) = builder.wasi_root(target) {
|
|
let root = format!(
|
|
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
|
|
index 4821d20a8..b9743ce8b 100644
|
|
--- a/src/bootstrap/config.rs
|
|
+++ b/src/bootstrap/config.rs
|
|
@@ -264,7 +264,6 @@ pub struct Config {
|
|
pub missing_tools: bool,
|
|
|
|
// Fallback musl-root for all targets
|
|
- pub musl_root: Option<PathBuf>,
|
|
pub prefix: Option<PathBuf>,
|
|
pub sysconfdir: Option<PathBuf>,
|
|
pub datadir: Option<PathBuf>,
|
|
@@ -537,8 +536,6 @@ pub struct Target {
|
|
pub profiler: Option<StringOrBool>,
|
|
pub rpath: Option<bool>,
|
|
pub crt_static: Option<bool>,
|
|
- pub musl_root: Option<PathBuf>,
|
|
- pub musl_libdir: Option<PathBuf>,
|
|
pub wasi_root: Option<PathBuf>,
|
|
pub qemu_rootfs: Option<PathBuf>,
|
|
pub no_std: bool,
|
|
@@ -998,7 +995,6 @@ define_config! {
|
|
default_linker: Option<String> = "default-linker",
|
|
channel: Option<String> = "channel",
|
|
description: Option<String> = "description",
|
|
- musl_root: Option<String> = "musl-root",
|
|
rpath: Option<bool> = "rpath",
|
|
verbose_tests: Option<bool> = "verbose-tests",
|
|
optimize_tests: Option<bool> = "optimize-tests",
|
|
@@ -1047,8 +1043,6 @@ define_config! {
|
|
profiler: Option<StringOrBool> = "profiler",
|
|
rpath: Option<bool> = "rpath",
|
|
crt_static: Option<bool> = "crt-static",
|
|
- musl_root: Option<String> = "musl-root",
|
|
- musl_libdir: Option<String> = "musl-libdir",
|
|
wasi_root: Option<String> = "wasi-root",
|
|
qemu_rootfs: Option<String> = "qemu-rootfs",
|
|
no_std: Option<bool> = "no-std",
|
|
@@ -1430,7 +1424,6 @@ impl Config {
|
|
set(&mut config.llvm_tools_enabled, rust.llvm_tools);
|
|
config.rustc_parallel = rust.parallel_compiler.unwrap_or(false);
|
|
config.rustc_default_linker = rust.default_linker;
|
|
- config.musl_root = rust.musl_root.map(PathBuf::from);
|
|
config.save_toolstates = rust.save_toolstates.map(PathBuf::from);
|
|
set(
|
|
&mut config.deny_warnings,
|
|
@@ -1615,8 +1608,6 @@ impl Config {
|
|
target.ranlib = cfg.ranlib.map(PathBuf::from);
|
|
target.linker = cfg.linker.map(PathBuf::from);
|
|
target.crt_static = cfg.crt_static;
|
|
- target.musl_root = cfg.musl_root.map(PathBuf::from);
|
|
- target.musl_libdir = cfg.musl_libdir.map(PathBuf::from);
|
|
target.wasi_root = cfg.wasi_root.map(PathBuf::from);
|
|
target.qemu_rootfs = cfg.qemu_rootfs.map(PathBuf::from);
|
|
target.sanitizers = cfg.sanitizers;
|
|
diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
|
|
index 15e8c1eb9..7749fc54d 100755
|
|
--- a/src/bootstrap/configure.py
|
|
+++ b/src/bootstrap/configure.py
|
|
@@ -110,34 +110,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk",
|
|
"aarch64-linux-android NDK standalone path")
|
|
v("x86_64-linux-android-ndk", "target.x86_64-linux-android.android-ndk",
|
|
"x86_64-linux-android NDK standalone path")
|
|
-v("musl-root", "target.x86_64-unknown-linux-musl.musl-root",
|
|
- "MUSL root installation directory (deprecated)")
|
|
-v("musl-root-x86_64", "target.x86_64-unknown-linux-musl.musl-root",
|
|
- "x86_64-unknown-linux-musl install directory")
|
|
-v("musl-root-i586", "target.i586-unknown-linux-musl.musl-root",
|
|
- "i586-unknown-linux-musl install directory")
|
|
-v("musl-root-i686", "target.i686-unknown-linux-musl.musl-root",
|
|
- "i686-unknown-linux-musl install directory")
|
|
-v("musl-root-arm", "target.arm-unknown-linux-musleabi.musl-root",
|
|
- "arm-unknown-linux-musleabi install directory")
|
|
-v("musl-root-armhf", "target.arm-unknown-linux-musleabihf.musl-root",
|
|
- "arm-unknown-linux-musleabihf install directory")
|
|
-v("musl-root-armv5te", "target.armv5te-unknown-linux-musleabi.musl-root",
|
|
- "armv5te-unknown-linux-musleabi install directory")
|
|
-v("musl-root-armv7", "target.armv7-unknown-linux-musleabi.musl-root",
|
|
- "armv7-unknown-linux-musleabi install directory")
|
|
-v("musl-root-armv7hf", "target.armv7-unknown-linux-musleabihf.musl-root",
|
|
- "armv7-unknown-linux-musleabihf install directory")
|
|
-v("musl-root-aarch64", "target.aarch64-unknown-linux-musl.musl-root",
|
|
- "aarch64-unknown-linux-musl install directory")
|
|
-v("musl-root-mips", "target.mips-unknown-linux-musl.musl-root",
|
|
- "mips-unknown-linux-musl install directory")
|
|
-v("musl-root-mipsel", "target.mipsel-unknown-linux-musl.musl-root",
|
|
- "mipsel-unknown-linux-musl install directory")
|
|
-v("musl-root-mips64", "target.mips64-unknown-linux-muslabi64.musl-root",
|
|
- "mips64-unknown-linux-muslabi64 install directory")
|
|
-v("musl-root-mips64el", "target.mips64el-unknown-linux-muslabi64.musl-root",
|
|
- "mips64el-unknown-linux-muslabi64 install directory")
|
|
v("musl-root-riscv32gc", "target.riscv32gc-unknown-linux-musl.musl-root",
|
|
"riscv32gc-unknown-linux-musl install directory")
|
|
v("musl-root-riscv64gc", "target.riscv64gc-unknown-linux-musl.musl-root",
|
|
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
|
|
index 4396bbc51..683ba5480 100644
|
|
--- a/src/bootstrap/lib.rs
|
|
+++ b/src/bootstrap/lib.rs
|
|
@@ -1289,25 +1289,6 @@ impl Build {
|
|
}
|
|
}
|
|
|
|
- /// Returns the "musl root" for this `target`, if defined
|
|
- fn musl_root(&self, target: TargetSelection) -> Option<&Path> {
|
|
- self.config
|
|
- .target_config
|
|
- .get(&target)
|
|
- .and_then(|t| t.musl_root.as_ref())
|
|
- .or_else(|| self.config.musl_root.as_ref())
|
|
- .map(|p| &**p)
|
|
- }
|
|
-
|
|
- /// Returns the "musl libdir" for this `target`.
|
|
- fn musl_libdir(&self, target: TargetSelection) -> Option<PathBuf> {
|
|
- let t = self.config.target_config.get(&target)?;
|
|
- if let libdir @ Some(_) = &t.musl_libdir {
|
|
- return libdir.clone();
|
|
- }
|
|
- self.musl_root(target).map(|root| root.join("lib"))
|
|
- }
|
|
-
|
|
/// Returns the sysroot for the wasi target, if defined
|
|
fn wasi_root(&self, target: TargetSelection) -> Option<&Path> {
|
|
self.config.target_config.get(&target).and_then(|t| t.wasi_root.as_ref()).map(|p| &**p)
|
|
diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
|
|
index 7e83b508e..761e83ddc 100644
|
|
--- a/src/bootstrap/sanity.rs
|
|
+++ b/src/bootstrap/sanity.rs
|
|
@@ -11,7 +11,6 @@
|
|
use std::collections::HashMap;
|
|
use std::env;
|
|
use std::ffi::{OsStr, OsString};
|
|
-use std::fs;
|
|
use std::path::PathBuf;
|
|
use std::process::Command;
|
|
|
|
@@ -205,28 +204,6 @@ than building it.
|
|
}
|
|
}
|
|
|
|
- // Make sure musl-root is valid
|
|
- if target.contains("musl") && !target.contains("unikraft") {
|
|
- // If this is a native target (host is also musl) and no musl-root is given,
|
|
- // fall back to the system toolchain in /usr before giving up
|
|
- if build.musl_root(*target).is_none() && build.config.build == *target {
|
|
- let target = build.config.target_config.entry(*target).or_default();
|
|
- target.musl_root = Some("/usr".into());
|
|
- }
|
|
- match build.musl_libdir(*target) {
|
|
- Some(libdir) => {
|
|
- if fs::metadata(libdir.join("libc.a")).is_err() {
|
|
- panic!("couldn't find libc.a in musl libdir: {}", libdir.display());
|
|
- }
|
|
- }
|
|
- None => panic!(
|
|
- "when targeting MUSL either the rust.musl-root \
|
|
- option or the target.$TARGET.musl-root option must \
|
|
- be specified in config.toml"
|
|
- ),
|
|
- }
|
|
- }
|
|
-
|
|
// Some environments don't want or need these tools, such as when testing Miri.
|
|
// FIXME: it would be better to refactor this code to split necessary setup from pure sanity
|
|
// checks, and have a regular flag for skipping the latter. Also see
|