rust-lang · Manishearth · May 26, 2020 · May 18, 2020 · Jun 9, 2020 · Jun 10, 2020
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -152,10 152,6 @@ jobs:
  - name: dist-x86_64-linux
  os: ubuntu-latest-xl
  env: {}
- - name: dist-x86_64-linux-alt
- env:
- IMAGE: dist-x86_64-linux
- os: ubuntu-latest-xl
  timeout-minutes: 600
  runs-on: "${{ matrix.os }}"
  steps:
@@ -373,35 369,6 @@ jobs:
  env:
  DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
  os: ubuntu-latest-xl
- - name: dist-x86_64-apple
- env:
- SCRIPT: "./x.py dist"
- RUST_CONFIGURE_ARGS: "--target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc"
- RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
- MACOSX_DEPLOYMENT_TARGET: 10.7
- NO_LLVM_ASSERTIONS: 1
- NO_DEBUG_ASSERTIONS: 1
- DIST_REQUIRE_ALL_TOOLS: 1
- os: macos-latest
- - name: dist-x86_64-apple-alt
- env:
- SCRIPT: "./x.py dist"
- RUST_CONFIGURE_ARGS: "--enable-extended --enable-profiler --set rust.jemalloc"
- RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
- MACOSX_DEPLOYMENT_TARGET: 10.7
- NO_LLVM_ASSERTIONS: 1
- NO_DEBUG_ASSERTIONS: 1
- os: macos-latest
- - name: x86_64-apple
- env:
- SCRIPT: "./x.py test"
- RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc"
- RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
- MACOSX_DEPLOYMENT_TARGET: 10.8
- MACOSX_STD_DEPLOYMENT_TARGET: 10.7
- NO_LLVM_ASSERTIONS: 1
- NO_DEBUG_ASSERTIONS: 1
- os: macos-latest
  - name: x86_64-msvc-1
  env:
  RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
@@ -584,6 551,135 @@ jobs:
  AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
  AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
  if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')"
  auto-fallible:
  name: auto-fallible
  env:
  CI_JOB_NAME: "${{ matrix.name }}"
  SCCACHE_BUCKET: rust-lang-gha-caches
  DEPLOY_BUCKET: rust-lang-gha
  TOOLSTATE_REPO: "https://github.com/pietroalbini/rust-toolstate"
  TOOLSTATE_ISSUES_API_URL: "https://api.github.com/repos/pietroalbini/rust-toolstate/issues"
  TOOLSTATE_PUBLISH: 1
  CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZOMUQATD5
  ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZH5AYXDVF
  CACHE_DOMAIN: ci-caches-gha.rust-lang.org
  if: "github.event_name == 'push' && github.ref == 'refs/heads/auto' && github.repository == 'rust-lang-ci/rust'"
  strategy:
  matrix:
  include:
  - name: dist-x86_64-apple
  env:
  SCRIPT: "./x.py dist"
  RUST_CONFIGURE_ARGS: "--target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc"
  RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
  MACOSX_DEPLOYMENT_TARGET: 10.7
  NO_LLVM_ASSERTIONS: 1
  NO_DEBUG_ASSERTIONS: 1
  DIST_REQUIRE_ALL_TOOLS: 1
  os: macos-latest
  - name: dist-x86_64-apple-alt
  env:
  SCRIPT: "./x.py dist"
  RUST_CONFIGURE_ARGS: "--enable-extended --enable-profiler --set rust.jemalloc"
  RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
  MACOSX_DEPLOYMENT_TARGET: 10.7
  NO_LLVM_ASSERTIONS: 1
  NO_DEBUG_ASSERTIONS: 1
  os: macos-latest
  - name: x86_64-apple
  env:
  SCRIPT: "./x.py test"
  RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc"
  RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
  MACOSX_DEPLOYMENT_TARGET: 10.8
  MACOSX_STD_DEPLOYMENT_TARGET: 10.7
  NO_LLVM_ASSERTIONS: 1
  NO_DEBUG_ASSERTIONS: 1
  os: macos-latest
  timeout-minutes: 600
  runs-on: "${{ matrix.os }}"
  steps:
  - name: disable git crlf conversion
  run: git config --global core.autocrlf false
  shell: bash
  - name: checkout the source code
  uses: actions/checkout@v1
  with:
  fetch-depth: 2
  - name: configure GitHub Actions to kill the build when outdated
  uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
  with:
  github_token: "${{ secrets.github_token }}"
  if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
  - name: add extra environment variables
  run: src/ci/scripts/setup-environment.sh
  env:
  EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
  if: success() && !env.SKIP_JOB
  - name: decide whether to skip this job
  run: src/ci/scripts/should-skip-this.sh
  if: success() && !env.SKIP_JOB
  - name: collect CPU statistics
  run: src/ci/scripts/collect-cpu-stats.sh
  if: success() && !env.SKIP_JOB
  - name: show the current environment
  run: src/ci/scripts/dump-environment.sh
  if: success() && !env.SKIP_JOB
  - name: install awscli
  run: src/ci/scripts/install-awscli.sh
  if: success() && !env.SKIP_JOB
  - name: install sccache
  run: src/ci/scripts/install-sccache.sh
  if: success() && !env.SKIP_JOB
  - name: install clang
  run: src/ci/scripts/install-clang.sh
  if: success() && !env.SKIP_JOB
  - name: install WIX
  run: src/ci/scripts/install-wix.sh
  if: success() && !env.SKIP_JOB
  - name: install InnoSetup
  run: src/ci/scripts/install-innosetup.sh
  if: success() && !env.SKIP_JOB
  - name: ensure the build happens on a partition with enough space
  run: src/ci/scripts/symlink-build-dir.sh
  if: success() && !env.SKIP_JOB
  - name: disable git crlf conversion
  run: src/ci/scripts/disable-git-crlf-conversion.sh
  if: success() && !env.SKIP_JOB
  - name: install MSYS2
  run: src/ci/scripts/install-msys2.sh
  if: success() && !env.SKIP_JOB
  - name: install MinGW
  run: src/ci/scripts/install-mingw.sh
  if: success() && !env.SKIP_JOB
  - name: install ninja
  run: src/ci/scripts/install-ninja.sh
  if: success() && !env.SKIP_JOB
  - name: enable ipv6 on Docker
  run: src/ci/scripts/enable-docker-ipv6.sh
  if: success() && !env.SKIP_JOB
  - name: disable git crlf conversion
  run: src/ci/scripts/disable-git-crlf-conversion.sh
  if: success() && !env.SKIP_JOB
  - name: checkout submodules
  run: src/ci/scripts/checkout-submodules.sh
  if: success() && !env.SKIP_JOB
  - name: ensure line endings are correct
  run: src/ci/scripts/verify-line-endings.sh
  if: success() && !env.SKIP_JOB
  - name: run the build
  run: src/ci/scripts/run-build-from-ci.sh
  env:
  AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
  AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
  TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
  if: success() && !env.SKIP_JOB
  - name: upload artifacts to S3
  run: src/ci/scripts/upload-artifacts.sh
  env:
  AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
  AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
  if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')"
  master:
  name: master
  runs-on: ubuntu-latest

diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
@@ -1206,7 1206,7 @@ impl<'a> Builder<'a> {
  );
  }
 
- // If Control Flow Guard is enabled, pass the `control_flow_guard=checks` flag to rustc
  // If Control Flow Guard is enabled, pass the `control-flow-guard` flag to rustc
  // when compiling the standard library, since this might be linked into the final outputs
  // produced by rustc. Since this mitigation is only available on Windows, only enable it
  // for the standard library in case the compiler is run on a non-Windows platform.
@@ -1217,7 1217,7 @@ impl<'a> Builder<'a> {
  && self.config.control_flow_guard
  && compiler.stage >= 1
  {
- rustflags.arg("-Zcontrol_flow_guard=checks");
  rustflags.arg("-Zcontrol-flow-guard");
  }
 
  // For `cargo doc` invocations, make rustdoc print the Rust version into the docs

diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
@@ -141,6 141,8 @@ def v(*args):
  "rootfs in qemu testing, you probably don't want to use this")
 v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs",
  "rootfs in qemu testing, you probably don't want to use this")
 v("qemu-riscv64-rootfs", "target.riscv64gc-unknown-linux-gnu.qemu-rootfs",
  "rootfs in qemu testing, you probably don't want to use this")
 v("experimental-targets", "llvm.experimental-targets",
  "experimental LLVM targets to build")
 v("release-channel", "rust.channel", "the name of the release channel to build")

diff --git a/src/ci/azure-pipelines/try.yml b/src/ci/azure-pipelines/try.yml
@@ -26,8 26,6 @@ jobs:
  strategy:
  matrix:
  dist-x86_64-linux: {}
- dist-x86_64-linux-alt:
- IMAGE: dist-x86_64-linux
 
 # The macOS and Windows builds here are currently disabled due to them not being
 # overly necessary on `try` builds. We also don't actually have anything that

diff --git a/src/ci/docker/disabled/riscv64gc-linux/0001-Remove-stime-function-calls.patch b/src/ci/docker/disabled/riscv64gc-linux/0001-Remove-stime-function-calls.patch
@@ -0,0 1,96 @@
 From c820da85c65c7f3aa9e9cb3ed71ada69bf9b783e Mon Sep 17 00:00:00 2001
 From: Alistair Francis <[email protected]>
 Date: Tue, 19 Nov 2019 13:06:40 0100
 Subject: [PATCH] Remove stime() function calls
 
 stime() has been deprecated in glibc 2.31 and replaced with
 clock_settime(). Let's replace the stime() function calls with
 clock_settime() in preperation.
 
 function old new delta
 rdate_main 197 224 27
 clock_settime - 27 27
 date_main 926 941 15
 stime 37 - -37
 ------------------------------------------------------------------------------
 (add/remove: 2/2 grow/shrink: 2/0 up/down: 69/-37) Total: 32 bytes
 
 Signed-off-by: Alistair Francis <[email protected]>
 Signed-off-by: Denys Vlasenko <[email protected]>
 
 [Tom Eccles: adjust patch context to apply on top of 1.31.1-stable]
 Signed-off-by: Tom Eccles <[email protected]>
 ---
  coreutils/date.c | 6 -
  libbb/missing_syscalls.c | 8 --------
  util-linux/rdate.c | 8 --
  3 files changed, 11 insertions( ), 11 deletions(-)
 
 diff --git a/coreutils/date.c b/coreutils/date.c
 index 3414d38ae..4ade6abb4 100644
 --- a/coreutils/date.c
  b/coreutils/date.c
 @@ -279,6 279,9 @@ int date_main(int argc UNUSED_PARAM, char **argv)
  time(&ts.tv_sec);
  #endif
  }
  #if !ENABLE_FEATURE_DATE_NANO
  ts.tv_nsec = 0;
  #endif
  localtime_r(&ts.tv_sec, &tm_time);
 
  /* If date string is given, update tm_time, and maybe set date */
 @@ -301,9 304,10 @@ int date_main(int argc UNUSED_PARAM, char **argv)
  if (date_str[0] != '@')
  tm_time.tm_isdst = -1;
  ts.tv_sec = validate_tm_time(date_str, &tm_time);
  ts.tv_nsec = 0;
 
  /* if setting time, set it */
 - if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) {
  if ((opt & OPT_SET) && clock_settime(CLOCK_REALTIME, &ts) < 0) {
  bb_perror_msg("can't set date");
  }
  }
 diff --git a/libbb/missing_syscalls.c b/libbb/missing_syscalls.c
 index 87cf59b3d..dc40d9155 100644
 --- a/libbb/missing_syscalls.c
  b/libbb/missing_syscalls.c
 @@ -15,14 15,6 @@ pid_t getsid(pid_t pid)
  return syscall(__NR_getsid, pid);
  }
 
 -int stime(const time_t *t)
 -{
 - struct timeval tv;
 - tv.tv_sec = *t;
 - tv.tv_usec = 0;
 - return settimeofday(&tv, NULL);
 -}
 -
  int sethostname(const char *name, size_t len)
  {
  return syscall(__NR_sethostname, name, len);
 diff --git a/util-linux/rdate.c b/util-linux/rdate.c
 index 70f829e7f..878375d78 100644
 --- a/util-linux/rdate.c
  b/util-linux/rdate.c
 @@ -95,9 95,13 @@ int rdate_main(int argc UNUSED_PARAM, char **argv)
  if (!(flags & 2)) { /* no -p (-s may be present) */
  if (time(NULL) == remote_time)
  bb_error_msg("current time matches remote time");
 - else
 - if (stime(&remote_time) < 0)
  else {
  struct timespec ts;
  ts.tv_sec = remote_time;
  ts.tv_nsec = 0;
  if (clock_settime(CLOCK_REALTIME, &ts) < 0)
  bb_perror_msg_and_die("can't set time of day");
  }
  }
 
  if (flags != 1) /* not lone -s */
 -- 
 2.25.1