Merge branch 'master' into master

.travis.yml

@@ -45,8 +45,8 @@ matrix:
  os: osx
  osx_image: xcode8.2
  install: &osx_install_sccache >
- curl -L https://api.pub.build.mozilla.org/tooltool/sha512/d0025b286468cc5ada83b23d3fafbc936b9f190eaa7d4a981715b18e8e3bf720a7bcee7bfe758cfdeb8268857f6098fd52dcdd8818232692a30ce91039936596 |
- tar xJf - -C /usr/local/bin --strip-components=1
+ curl -o /usr/local/bin/sccache https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-apple-darwin &&
+ chmod +x /usr/local/bin/sccache
  - env: >
  RUST_CHECK_TARGET=check
  RUST_CONFIGURE_ARGS=--build=i686-apple-darwin
@@ -63,8 +63,10 @@ matrix:
  os: osx
  osx_image: xcode8.2
  install: >
- curl -L https://api.pub.build.mozilla.org/tooltool/sha512/d0025b286468cc5ada83b23d3fafbc936b9f190eaa7d4a981715b18e8e3bf720a7bcee7bfe758cfdeb8268857f6098fd52dcdd8818232692a30ce91039936596 |
- tar xJf - -C /usr/local/bin --strip-components=1 && brew uninstall --ignore-dependencies openssl && brew install openssl --universal --without-test
+ curl -o /usr/local/bin/sccache https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-apple-darwin &&
+ chmod +x /usr/local/bin/sccache &&
+ brew uninstall --ignore-dependencies openssl &&
+ brew install openssl --universal --without-test
  - env: >
  RUST_CHECK_TARGET=dist
  RUST_CONFIGURE_ARGS="--target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-extended"

appveyor.yml

@@ -115,11 +115,9 @@ install:
  - set PATH=C:\Python27;%PATH%
 
  # Download and install sccache
- - appveyor DownloadFile https://api.pub.build.mozilla.org/tooltool/sha512/%SCCACHE_DIGEST%
- - mv %SCCACHE_DIGEST% sccache.tar.bz2
- - 7z x -y sccache.tar.bz2 > nul
- - 7z x -y sccache.tar > nul
- - set PATH=%PATH%;%CD%\sccache2
+ - appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-24-sccache-x86_64-pc-windows-msvc
+ - mv 2017-02-24-sccache-x86_64-pc-windows-msvc sccache
+ - set PATH=%PATH%;%CD%
 
  # Install InnoSetup to get `iscc` used to produce installers
  - choco install -y InnoSetup

src/Cargo.toml

@@ -2,8 +2,8 @@
 members = [
  "bootstrap",
  "rustc",
- "rustc/std_shim",
- "rustc/test_shim",
+ "libstd",
+ "libtest",
  "tools/cargotest",
  "tools/compiletest",
  "tools/error_index_generator",

src/bootstrap/README.md

@@ -267,8 +267,8 @@ build/
 The current build is unfortunately not quite as simple as `cargo build` in a
 directory, but rather the compiler is split into three different Cargo projects:
 
-* `src/rustc/std_shim` - a project which builds and compiles libstd
-* `src/rustc/test_shim` - a project which builds and compiles libtest
+* `src/libstd` - the standard library
+* `src/libtest` - testing support, depends on libstd
 * `src/rustc` - the actual compiler itself
 
 Each "project" has a corresponding Cargo.lock file with all dependencies, and

src/bootstrap/bin/rustc.rs

@@ -68,6 +68,7 @@ fn main() {
  };
  let stage = env::var("RUSTC_STAGE").expect("RUSTC_STAGE was not set");
  let sysroot = env::var_os("RUSTC_SYSROOT").expect("RUSTC_SYSROOT was not set");
+ let mut on_fail = env::var_os("RUSTC_ON_FAIL").map(|of| Command::new(of));
 
  let rustc = env::var_os(rustc).unwrap_or_else(|| panic!("{:?} was not set", rustc));
  let libdir = env::var_os(libdir).unwrap_or_else(|| panic!("{:?} was not set", libdir));
@@ -217,9 +218,20 @@ fn main() {
  }
 
  // Actually run the compiler!
- std::process::exit(match exec_cmd(&mut cmd) {
- Ok(s) => s.code().unwrap_or(0xfe),
- Err(e) => panic!("\n\nfailed to run {:?}: {}\n\n", cmd, e),
+ std::process::exit(if let Some(ref mut on_fail) = on_fail {
+ match cmd.status() {
+ Ok(s) if s.success() => 0,
+ _ => {
+ println!("\nDid not run successfully:\n{:?}\n-------------", cmd);
+ exec_cmd(on_fail).expect("could not run the backup command");
+ 1
+ }
+ }
+ } else {
+ std::process::exit(match exec_cmd(&mut cmd) {
+ Ok(s) => s.code().unwrap_or(0xfe),
+ Err(e) => panic!("\n\nfailed to run {:?}: {}\n\n", cmd, e),
+ })
  })
 }
 

src/bootstrap/bootstrap.py

@@ -59,20 +59,33 @@ def delete_if_present(path, verbose):
 
 
 def download(path, url, probably_big, verbose):
+ for x in range(0, 4):
+ try:
+ _download(path, url, probably_big, verbose, True)
+ return
+ except RuntimeError:
+ print("\nspurious failure, trying again")
+ _download(path, url, probably_big, verbose, False)
+
+
+def _download(path, url, probably_big, verbose, exception):
  if probably_big or verbose:
  print("downloading {}".format(url))
  # see http://serverfault.com/questions/301128/how-to-download
  if sys.platform == 'win32':
  run(["PowerShell.exe", "/nologo", "-Command",
  "(New-Object System.Net.WebClient)"
  ".DownloadFile('{}', '{}')".format(url, path)],
- verbose=verbose)
+ verbose=verbose,
+ exception=exception)
  else:
  if probably_big or verbose:
  option = "-#"
  else:
  option = "-s"
- run(["curl", option, "--retry", "3", "-Sf", "-o", path, url], verbose=verbose)
+ run(["curl", option, "--retry", "3", "-Sf", "-o", path, url],
+ verbose=verbose,
+ exception=exception)
 
 
 def verify(path, sha_path, verbose):
@@ -112,7 +125,7 @@ def unpack(tarball, dst, verbose=False, match=None):
  shutil.move(tp, fp)
  shutil.rmtree(os.path.join(dst, fname))
 
-def run(args, verbose=False):
+def run(args, verbose=False, exception=False):
  if verbose:
  print("running: " + ' '.join(args))
  sys.stdout.flush()
@@ -122,7 +135,7 @@ def run(args, verbose=False):
  code = ret.wait()
  if code != 0:
  err = "failed to run: " + ' '.join(args)
- if verbose:
+ if verbose or exception:
  raise RuntimeError(err)
  sys.exit(err)
 
@@ -342,8 +355,12 @@ def build_bootstrap(self):
  env = os.environ.copy()
  env["CARGO_TARGET_DIR"] = build_dir
  env["RUSTC"] = self.rustc()
- env["LD_LIBRARY_PATH"] = os.path.join(self.bin_root(), "lib")
- env["DYLD_LIBRARY_PATH"] = os.path.join(self.bin_root(), "lib")
+ env["LD_LIBRARY_PATH"] = os.path.join(self.bin_root(), "lib") + \
+ (os.pathsep + env["LD_LIBRARY_PATH"]) \
+ if "LD_LIBRARY_PATH" in env else ""
+ env["DYLD_LIBRARY_PATH"] = os.path.join(self.bin_root(), "lib") + \
+ (os.pathsep + env["DYLD_LIBRARY_PATH"]) \
+ if "DYLD_LIBRARY_PATH" in env else ""
  env["PATH"] = os.path.join(self.bin_root(), "bin") + \
  os.pathsep + env["PATH"]
  if not os.path.isfile(self.cargo()):
@@ -472,6 +489,8 @@ def build_triple(self):
  ostype += 'abi64'
  elif cputype in {'powerpc', 'ppc', 'ppc64'}:
  cputype = 'powerpc'
+ elif cputype == 'sparcv9':
+ pass
  elif cputype in {'amd64', 'x86_64', 'x86-64', 'x64'}:
  cputype = 'x86_64'
  else:

src/bootstrap/check.rs

@@ -346,10 +346,10 @@ pub fn krate(build: &Build,
  krate: Option<&str>) {
  let (name, path, features, root) = match mode {
  Mode::Libstd => {
- ("libstd", "src/rustc/std_shim", build.std_features(), "std_shim")
+ ("libstd", "src/libstd", build.std_features(), "std")
  }
  Mode::Libtest => {
- ("libtest", "src/rustc/test_shim", String::new(), "test_shim")
+ ("libtest", "src/libtest", String::new(), "test")
  }
  Mode::Librustc => {
  ("librustc", "src/rustc", build.rustc_features(), "rustc-main")

src/bootstrap/compile.rs

@@ -21,7 +21,7 @@ use std::fs::{self, File};
 use std::path::{Path, PathBuf};
 use std::process::Command;
 
-use build_helper::{output, mtime};
+use build_helper::{output, mtime, up_to_date};
 use filetime::FileTime;
 
 use util::{exe, libdir, is_dylib, copy};
@@ -64,7 +64,7 @@ pub fn std(build: &Build, target: &str, compiler: &Compiler) {
  }
  cargo.arg("--features").arg(features)
  .arg("--manifest-path")
- .arg(build.src.join("src/rustc/std_shim/Cargo.toml"));
+ .arg(build.src.join("src/libstd/Cargo.toml"));
 
  if let Some(target) = build.config.target_config.get(target) {
  if let Some(ref jemalloc) = target.jemalloc {
@@ -132,21 +132,29 @@ pub fn build_startup_objects(build: &Build, for_compiler: &Compiler, target: &st
 
  let compiler = Compiler::new(0, &build.config.build);
  let compiler_path = build.compiler_path(&compiler);
- let into = build.sysroot_libdir(for_compiler, target);
- t!(fs::create_dir_all(&into));
-
- for file in t!(fs::read_dir(build.src.join("src/rtstartup"))) {
- let file = t!(file);
- let mut cmd = Command::new(&compiler_path);
- build.run(cmd.env("RUSTC_BOOTSTRAP", "1")
- .arg("--target").arg(target)
- .arg("--emit=obj")
- .arg("--out-dir").arg(&into)
- .arg(file.path()));
+ let src_dir = &build.src.join("src/rtstartup");
+ let dst_dir = &build.native_dir(target).join("rtstartup");
+ let sysroot_dir = &build.sysroot_libdir(for_compiler, target);
+ t!(fs::create_dir_all(dst_dir));
+ t!(fs::create_dir_all(sysroot_dir));
+
+ for file in &["rsbegin", "rsend"] {
+ let src_file = &src_dir.join(file.to_string() + ".rs");
+ let dst_file = &dst_dir.join(file.to_string() + ".o");
+ if !up_to_date(src_file, dst_file) {
+ let mut cmd = Command::new(&compiler_path);
+ build.run(cmd.env("RUSTC_BOOTSTRAP", "1")
+ .arg("--target").arg(target)
+ .arg("--emit=obj")
+ .arg("--out-dir").arg(dst_dir)
+ .arg(src_file));
+ }
+
+ copy(dst_file, &sysroot_dir.join(file.to_string() + ".o"));
  }
 
  for obj in ["crt2.o", "dllcrt2.o"].iter() {
- copy(&compiler_file(build.cc(target), obj), &into.join(obj));
+ copy(&compiler_file(build.cc(target), obj), &sysroot_dir.join(obj));
  }
 }
 
@@ -162,7 +170,7 @@ pub fn test(build: &Build, target: &str, compiler: &Compiler) {
  build.clear_if_dirty(&out_dir, &libstd_stamp(build, compiler, target));
  let mut cargo = build.cargo(compiler, Mode::Libtest, target, "build");
  cargo.arg("--manifest-path")
- .arg(build.src.join("src/rustc/test_shim/Cargo.toml"));
+ .arg(build.src.join("src/libtest/Cargo.toml"));
  build.run(&mut cargo);
  update_mtime(build, &libtest_stamp(build, compiler, target));
 }

src/bootstrap/doc.rs

@@ -148,7 +148,7 @@ pub fn std(build: &Build, stage: u32, target: &str) {
 
  let mut cargo = build.cargo(&compiler, Mode::Libstd, target, "doc");
  cargo.arg("--manifest-path")
- .arg(build.src.join("src/rustc/std_shim/Cargo.toml"))
+ .arg(build.src.join("src/libstd/Cargo.toml"))
  .arg("--features").arg(build.std_features());
 
  // We don't want to build docs for internal std dependencies unless
@@ -194,7 +194,7 @@ pub fn test(build: &Build, stage: u32, target: &str) {
 
  let mut cargo = build.cargo(&compiler, Mode::Libtest, target, "doc");
  cargo.arg("--manifest-path")
- .arg(build.src.join("src/rustc/test_shim/Cargo.toml"));
+ .arg(build.src.join("src/libtest/Cargo.toml"));
  build.run(&mut cargo);
  cp_r(&out_dir, &out)
 }

src/bootstrap/flags.rs

@@ -28,6 +28,7 @@ use step;
 /// Deserialized version of all flags for this compile.
 pub struct Flags {
  pub verbose: usize, // verbosity level: 0 == not verbose, 1 == verbose, 2 == very verbose
+ pub on_fail: Option<String>,
  pub stage: Option<u32>,
  pub keep_stage: Option<u32>,
  pub build: String,
@@ -81,6 +82,7 @@ impl Flags {
  opts.optopt("", "build", "build target of the stage0 compiler", "BUILD");
  opts.optmulti("", "host", "host targets to build", "HOST");
  opts.optmulti("", "target", "target targets to build", "TARGET");
+ opts.optopt("", "on-fail", "command to run on failure", "CMD");
  opts.optopt("", "stage", "stage to build", "N");
  opts.optopt("", "keep-stage", "stage to keep without recompiling", "N");
  opts.optopt("", "src", "path to the root of the rust checkout", "DIR");
@@ -283,6 +285,7 @@ To learn more about a subcommand, run `./x.py <command> -h`
  Flags {
  verbose: m.opt_count("v"),
  stage: stage,
+ on_fail: m.opt_str("on-fail"),
  keep_stage: m.opt_str("keep-stage").map(|j| j.parse().unwrap()),
  build: m.opt_str("build").unwrap_or_else(|| {
  env::var("BUILD").unwrap()

src/bootstrap/lib.rs

@@ -499,6 +499,10 @@ impl Build {
  cargo.env("RUSTC_INCREMENTAL", incr_dir);
  }
 
+ if let Some(ref on_fail) = self.flags.on_fail {
+ cargo.env("RUSTC_ON_FAIL", on_fail);
+ }
+
  let verbose = cmp::max(self.config.verbose, self.flags.verbose);
  cargo.env("RUSTC_VERBOSE", format!("{}", verbose));
 
@@ -828,17 +832,6 @@ impl Build {
  if target.contains("apple-darwin") {
  base.push("-stdlib=libc++".into());
  }
- // This is a hack, because newer binutils broke things on some vms/distros
- // (i.e., linking against unknown relocs disabled by the following flag)
- // See: https://github.com/rust-lang/rust/issues/34978
- match target {
- "i586-unknown-linux-gnu" |
- "i686-unknown-linux-musl" |
- "x86_64-unknown-linux-musl" => {
- base.push("-Wa,-mrelax-relocations=no".into());
- },
- _ => {},
- }
  return base
  }
 

src/bootstrap/metadata.rs

@@ -43,8 +43,8 @@ struct ResolveNode {
 }
 
 pub fn build(build: &mut Build) {
- build_krate(build, "src/rustc/std_shim");
- build_krate(build, "src/rustc/test_shim");
+ build_krate(build, "src/libstd");
+ build_krate(build, "src/libtest");
  build_krate(build, "src/rustc");
 }