diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 91241d2b214f9..90296ec32eeda 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -154,6 +154,11 @@ jobs:
strategy:
matrix:
include:
+ - name: aarch64-gnu
+ os:
+ - self-hosted
+ - ARM64
+ - linux
- name: arm-android
os: ubuntu-latest-xl
env: {}
@@ -509,116 +514,6 @@ 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:
- fail-fast: false
- matrix:
- include:
- - name: aarch64-gnu
- os:
- - self-hosted
- - ARM64
- - linux
- timeout-minutes: 600
- runs-on: "${{ matrix.os }}"
- steps:
- - name: disable git crlf conversion
- run: git config --global core.autocrlf false
- - name: checkout the source code
- uses: actions/checkout@v2
- with:
- fetch-depth: 2
- - name: configure the PR in which the error message will be posted
- run: "echo \"[CI_PR_NUMBER=$num]\""
- env:
- num: "${{ github.event.number }}"
- if: "success() && !env.SKIP_JOBS && github.event_name == 'pull_request'"
- - 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: 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: 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: select Xcode
- run: src/ci/scripts/select-xcode.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: 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')"
try:
name: try
env:
diff --git a/src/ci/docker/host-x86_64/dist-aarch64-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-aarch64-linux/Dockerfile
index df65f9df44127..95c54ca1abc06 100644
--- a/src/ci/docker/host-x86_64/dist-aarch64-linux/Dockerfile
+++ b/src/ci/docker/host-x86_64/dist-aarch64-linux/Dockerfile
@@ -35,6 +35,5 @@ ENV HOSTS=aarch64-unknown-linux-gnu
ENV RUST_CONFIGURE_ARGS \
--enable-full-tools \
--enable-profiler \
- --enable-sanitizers \
- --disable-docs
+ --enable-sanitizers
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 0df191f8f7404..1e28b5a253655 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -301,6 +301,9 @@ jobs:
# Linux/Docker builders #
#############################
+ - name: aarch64-gnu
+ <<: *job-aarch64-linux
+
- name: arm-android
<<: *job-linux-xl
@@ -653,23 +656,6 @@ jobs:
SCRIPT: python x.py dist
<<: *job-windows-xl
- auto-fallible:
- <<: *base-ci-job
- name: auto-fallible
- env:
- <<: [*shared-ci-variables, *dummy-variables]
- if: github.event_name == 'push' && github.ref == 'refs/heads/auto' && github.repository == 'rust-lang-ci/rust'
- strategy:
- fail-fast: false
- matrix:
- include:
- #############################
- # Linux/Docker builders #
- #############################
-
- - name: aarch64-gnu
- <<: *job-aarch64-linux
-
try:
<<: *base-ci-job
name: try
diff --git a/src/doc/rustc/src/platform-support.md b/src/doc/rustc/src/platform-support.md
index 85c6f91f08582..8005a5f3563bf 100644
--- a/src/doc/rustc/src/platform-support.md
+++ b/src/doc/rustc/src/platform-support.md
@@ -34,6 +34,7 @@ Specifically they will each satisfy the following requirements:
target | std | host | notes
-------|-----|------|-------
+`aarch64-unknown-linux-gnu` | ✓ | ✓ | ARM64 Linux (kernel 4.2, glibc 2.17+) [^missing-stack-probes]
`i686-pc-windows-gnu` | ✓ | ✓ | 32-bit MinGW (Windows 7+)
`i686-pc-windows-msvc` | ✓ | ✓ | 32-bit MSVC (Windows 7+)
`i686-unknown-linux-gnu` | ✓ | ✓ | 32-bit Linux (kernel 2.6.32+, glibc 2.11+)
@@ -42,6 +43,12 @@ target | std | host | notes
`x86_64-pc-windows-msvc` | ✓ | ✓ | 64-bit MSVC (Windows 7+)
`x86_64-unknown-linux-gnu` | ✓ | ✓ | 64-bit Linux (kernel 2.6.32+, glibc 2.11+)
+[^missing-stack-probes]: Stack probes support is missing on
+ `aarch64-unknown-linux-gnu`, but it's planned to be implemented in the near
+ future. The implementation is tracked on [issue #77071][77071].
+
+[77071]: https://github.com/rust-lang/rust/issues/77071
+
## Tier 2
Tier 2 platforms can be thought of as "guaranteed to build". Automated tests
@@ -62,7 +69,6 @@ target | std | host | notes
`aarch64-fuchsia` | ✓ | | ARM64 Fuchsia
`aarch64-linux-android` | ✓ | | ARM64 Android
`aarch64-pc-windows-msvc` | ✓ | ✓ | ARM64 Windows MSVC
-`aarch64-unknown-linux-gnu` | ✓ | ✓ | ARM64 Linux (kernel 4.2, glibc 2.17)
`aarch64-unknown-linux-musl` | ✓ | ✓ | ARM64 Linux with MUSL
`aarch64-unknown-none` | * | | Bare ARM64, hardfloat
`aarch64-unknown-none-softfloat` | * | | Bare ARM64, softfloat
diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs
index 9a8f2404e4a1a..687354dc6aee2 100644
--- a/src/tools/build-manifest/src/main.rs
+++ b/src/tools/build-manifest/src/main.rs
@@ -155,6 +155,7 @@ static TARGETS: &[&str] = &[
];
static DOCS_TARGETS: &[&str] = &[
+ "aarch64-unknown-linux-gnu",
"i686-apple-darwin",
"i686-pc-windows-gnu",
"i686-pc-windows-msvc",