Remove support for out-of-line asm.

rustix 0.38 removed for most of the out-of-line asm libraries, and #722 removed the out-of-line libraries for 32-bit x86. This PR removes the libraries for mips and power, which will now default to the libc backend, though the linux_raw backend can still be enabled using `RUSTFLAGS=--cfg=rustix_use_experimental_asm`. Closes #720.
bytecodealliance · Jul 6, 2023 · 36930f9 · 36930f9
1 parent 6199eb9
commit 36930f9
Show file tree

Hide file tree

Showing 27 changed files with 22 additions and 927 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -80,12 +80,6 @@ jobs:
  - if: matrix.rust == '1.63'
  run: rustup target add x86_64-fuchsia
 
- - name: Install cross-compilation tools
- run: |
- set -ex
- sudo apt-get update
- sudo apt-get install -y gcc-i686-linux-gnu gcc-aarch64-linux-gnu gcc-riscv64-linux-gnu gcc-arm-linux-gnueabi musl-tools
-
  - run: cargo check --workspace --release -vv --all-targets
  - run: cargo check --workspace --release -vv --features=all-apis --all-targets
  - run: cargo check --workspace --release -vv --features=use-libc,all-apis --all-targets
@@ -233,69 +227,53 @@ jobs:
  os: ubuntu-latest
  rust: nightly-2023-07-03
  target: i686-unknown-linux-gnu
- gcc_package: gcc-i686-linux-gnu
- gcc: i686-linux-gnu-gcc
  libc_package: libc-dev-i386-cross
  - build: aarch64-linux
  os: ubuntu-latest
  rust: nightly-2023-07-03
  target: aarch64-unknown-linux-gnu
- gcc_package: gcc-aarch64-linux-gnu
- gcc: aarch64-linux-gnu-gcc
  qemu: qemu-aarch64
  qemu_args: -L /usr/aarch64-linux-gnu
  qemu_target: aarch64-linux-user
  - build: powerpc64le-linux
  os: ubuntu-latest
  rust: nightly-2023-07-03
  target: powerpc64le-unknown-linux-gnu
- gcc_package: gcc-powerpc64le-linux-gnu
- gcc: powerpc64le-linux-gnu-gcc
  qemu: qemu-ppc64le
  qemu_args: -L /usr/powerpc64le-linux-gnu
  qemu_target: ppc64le-linux-user
  - build: mips64el-linux
  os: ubuntu-latest
  rust: nightly-2023-07-03
  target: mips64el-unknown-linux-gnuabi64
- gcc_package: gcc-mips64el-linux-gnuabi64
- gcc: mips64el-linux-gnuabi64-gcc
  qemu: qemu-mips64el
  qemu_args: -L /usr/mips64el-linux-gnuabi64
  qemu_target: mips64el-linux-user
  - build: mipsel-linux
  os: ubuntu-latest
  rust: nightly-2023-07-03
  target: mipsel-unknown-linux-gnu
- gcc_package: gcc-mipsel-linux-gnu
- gcc: mipsel-linux-gnu-gcc
  qemu: qemu-mipsel
  qemu_args: -L /usr/mipsel-linux-gnu
  qemu_target: mipsel-linux-user
  - build: riscv64-linux
  os: ubuntu-latest
  rust: nightly-2023-07-03
  target: riscv64gc-unknown-linux-gnu
- gcc_package: gcc-riscv64-linux-gnu
- gcc: riscv64-linux-gnu-gcc
  qemu: qemu-riscv64
  qemu_args: -L /usr/riscv64-linux-gnu
  qemu_target: riscv64-linux-user
  - build: s390x-linux
  os: ubuntu-latest
  rust: nightly-2023-07-03
  target: s390x-unknown-linux-gnu
- gcc_package: gcc-s390x-linux-gnu
- gcc: s390x-linux-gnu-gcc
  qemu: qemu-s390x
  qemu_args: -L /usr/s390x-linux-gnu
  qemu_target: s390x-linux-user
  - build: arm-linux
  os: ubuntu-latest
  rust: nightly-2023-07-03
  target: armv5te-unknown-linux-gnueabi
- gcc_package: gcc-arm-linux-gnueabi
- gcc: arm-linux-gnueabi-gcc
  qemu: qemu-arm
  qemu_args: -L /usr/arm-linux-gnueabi
  qemu_target: arm-linux-user
@@ -306,69 +284,53 @@ jobs:
  os: ubuntu-latest
  rust: stable
  target: i686-unknown-linux-gnu
- gcc_package: gcc-i686-linux-gnu
- gcc: i686-linux-gnu-gcc
  libc_package: libc-dev-i386-cross
  - build: aarch64-linux-stable
  os: ubuntu-latest
  rust: stable
  target: aarch64-unknown-linux-gnu
- gcc_package: gcc-aarch64-linux-gnu
- gcc: aarch64-linux-gnu-gcc
  qemu: qemu-aarch64
  qemu_args: -L /usr/aarch64-linux-gnu
  qemu_target: aarch64-linux-user
  - build: riscv64-linux-stable
  os: ubuntu-latest
  rust: stable
  target: riscv64gc-unknown-linux-gnu
- gcc_package: gcc-riscv64-linux-gnu
- gcc: riscv64-linux-gnu-gcc
  qemu: qemu-riscv64
  qemu_args: -L /usr/riscv64-linux-gnu
  qemu_target: riscv64-linux-user
  - build: s390x-linux-stable
  os: ubuntu-latest
  rust: stable
  target: s390x-unknown-linux-gnu
- gcc_package: gcc-s390x-linux-gnu
- gcc: s390x-linux-gnu-gcc
  qemu: qemu-s390x
  qemu_args: -L /usr/s390x-linux-gnu
  qemu_target: s390x-linux-user
  - build: powerpc64le-linux-stable
  os: ubuntu-latest
  rust: stable
  target: powerpc64le-unknown-linux-gnu
- gcc_package: gcc-powerpc64le-linux-gnu
- gcc: powerpc64le-linux-gnu-gcc
  qemu: qemu-ppc64le
  qemu_args: -L /usr/powerpc64le-linux-gnu
  qemu_target: ppc64le-linux-user
  - build: mips64el-linux-stable
  os: ubuntu-latest
  rust: stable
  target: mips64el-unknown-linux-gnuabi64
- gcc_package: gcc-mips64el-linux-gnuabi64
- gcc: mips64el-linux-gnuabi64-gcc
  qemu: qemu-mips64el
  qemu_args: -L /usr/mips64el-linux-gnuabi64
  qemu_target: mips64el-linux-user
  - build: mipsel-linux-stable
  os: ubuntu-latest
  rust: stable
  target: mipsel-unknown-linux-gnu
- gcc_package: gcc-mipsel-linux-gnu
- gcc: mipsel-linux-gnu-gcc
  qemu: qemu-mipsel
  qemu_args: -L /usr/mipsel-linux-gnu
  qemu_target: mipsel-linux-user
  - build: arm-linux-stable
  os: ubuntu-latest
  rust: stable
  target: armv5te-unknown-linux-gnueabi
- gcc_package: gcc-arm-linux-gnueabi
- gcc: arm-linux-gnueabi-gcc
  qemu: qemu-arm
  qemu_args: -L /usr/arm-linux-gnueabi
  qemu_target: arm-linux-user
@@ -379,69 +341,53 @@ jobs:
  os: ubuntu-latest
  rust: 1.63
  target: i686-unknown-linux-gnu
- gcc_package: gcc-i686-linux-gnu
- gcc: i686-linux-gnu-gcc
  libc_package: libc-dev-i386-cross
  - build: aarch64-linux-1.63
  os: ubuntu-latest
  rust: 1.63
  target: aarch64-unknown-linux-gnu
- gcc_package: gcc-aarch64-linux-gnu
- gcc: aarch64-linux-gnu-gcc
  qemu: qemu-aarch64
  qemu_args: -L /usr/aarch64-linux-gnu
  qemu_target: aarch64-linux-user
  - build: riscv64-linux-1.63
  os: ubuntu-latest
  rust: 1.63
  target: riscv64gc-unknown-linux-gnu
- gcc_package: gcc-riscv64-linux-gnu
- gcc: riscv64-linux-gnu-gcc
  qemu: qemu-riscv64
  qemu_args: -L /usr/riscv64-linux-gnu
  qemu_target: riscv64-linux-user
  - build: s390x-linux-1.63
  os: ubuntu-latest
  rust: 1.63
  target: s390x-unknown-linux-gnu
- gcc_package: gcc-s390x-linux-gnu
- gcc: s390x-linux-gnu-gcc
  qemu: qemu-s390x
  qemu_args: -L /usr/s390x-linux-gnu
  qemu_target: s390x-linux-user
  - build: powerpc64le-linux-1.63
  os: ubuntu-latest
  rust: 1.63
  target: powerpc64le-unknown-linux-gnu
- gcc_package: gcc-powerpc64le-linux-gnu
- gcc: powerpc64le-linux-gnu-gcc
  qemu: qemu-ppc64le
  qemu_args: -L /usr/powerpc64le-linux-gnu
  qemu_target: ppc64le-linux-user
  - build: mips64el-linux-1.63
  os: ubuntu-latest
  rust: 1.63
  target: mips64el-unknown-linux-gnuabi64
- gcc_package: gcc-mips64el-linux-gnuabi64
- gcc: mips64el-linux-gnuabi64-gcc
  qemu: qemu-mips64el
  qemu_args: -L /usr/mips64el-linux-gnuabi64
  qemu_target: mips64el-linux-user
  - build: mipsel-linux-1.63
  os: ubuntu-latest
  rust: 1.63
  target: mipsel-unknown-linux-gnu
- gcc_package: gcc-mipsel-linux-gnu
- gcc: mipsel-linux-gnu-gcc
  qemu: qemu-mipsel
  qemu_args: -L /usr/mipsel-linux-gnu
  qemu_target: mipsel-linux-user
  - build: arm-linux-1.63
  os: ubuntu-latest
  rust: 1.63
  target: armv5te-unknown-linux-gnueabi
- gcc_package: gcc-arm-linux-gnueabi
- gcc: arm-linux-gnueabi-gcc
  qemu: qemu-arm
  qemu_args: -L /usr/arm-linux-gnueabi
  qemu_target: arm-linux-user
@@ -477,15 +423,6 @@ jobs:
  key: qemu-${{ matrix.target }}-${{ env.QEMU_BUILD_VERSION }}-patched
  if: matrix.target != '' && matrix.os == 'ubuntu-latest'
 
- - name: Install cross-compilation tools
- run: |
- set -ex
- sudo apt-get update
- sudo apt-get install -y ${{ matrix.gcc_package }} ninja-build
- upcase=$(echo ${{ matrix.target }} | awk '{ print toupper($0) }' | sed 's/-/_/g')
- echo CARGO_TARGET_${upcase}_LINKER=${{ matrix.gcc }} >> $GITHUB_ENV
- if: matrix.gcc_package != '' && matrix.os == 'ubuntu-latest'
-
  - name: Install cross-compilation libraries
  run: |
  set -ex
@@ -549,60 +486,46 @@ jobs:
  os: ubuntu-latest
  rust: stable
  target: i686-unknown-linux-gnu
- gcc_package: gcc-i686-linux-gnu
- gcc: i686-linux-gnu-gcc
  libc_package: libc-dev-i386-cross
  - build: aarch64-linux
  os: ubuntu-latest
  rust: stable
  target: aarch64-unknown-linux-gnu
- gcc_package: gcc-aarch64-linux-gnu
- gcc: aarch64-linux-gnu-gcc
  qemu: qemu-aarch64
  qemu_args: -L /usr/aarch64-linux-gnu
  qemu_target: aarch64-linux-user
  - build: powerpc64le-linux
  os: ubuntu-latest
  rust: stable
  target: powerpc64le-unknown-linux-gnu
- gcc_package: gcc-powerpc64le-linux-gnu
- gcc: powerpc64le-linux-gnu-gcc
  qemu: qemu-ppc64le
  qemu_args: -L /usr/powerpc64le-linux-gnu
  qemu_target: ppc64le-linux-user
  - build: mips64el-linux
  os: ubuntu-latest
  rust: stable
  target: mips64el-unknown-linux-gnuabi64
- gcc_package: gcc-mips64el-linux-gnuabi64
- gcc: mips64el-linux-gnuabi64-gcc
  qemu: qemu-mips64el
  qemu_args: -L /usr/mips64el-linux-gnuabi64
  qemu_target: mips64el-linux-user
  - build: mipsel-linux
  os: ubuntu-latest
  rust: stable
  target: mipsel-unknown-linux-gnu
- gcc_package: gcc-mipsel-linux-gnu
- gcc: mipsel-linux-gnu-gcc
  qemu: qemu-mipsel
  qemu_args: -L /usr/mipsel-linux-gnu
  qemu_target: mipsel-linux-user
  - build: riscv64-linux
  os: ubuntu-latest
  rust: stable
  target: riscv64gc-unknown-linux-gnu
- gcc_package: gcc-riscv64-linux-gnu
- gcc: riscv64-linux-gnu-gcc
  qemu: qemu-riscv64
  qemu_args: -L /usr/riscv64-linux-gnu
  qemu_target: riscv64-linux-user
  - build: arm-linux
  os: ubuntu-latest
  rust: stable
  target: armv7-unknown-linux-gnueabihf
- gcc_package: gcc-arm-linux-gnueabihf
- gcc: arm-linux-gnueabihf-gcc
  qemu: qemu-arm
  qemu_args: -L /usr/arm-linux-gnueabihf
  qemu_target: arm-linux-user
@@ -630,15 +553,6 @@ jobs:
  key: qemu-${{ matrix.target }}-${{ env.QEMU_BUILD_VERSION }}-patched
  if: matrix.target != '' && matrix.os == 'ubuntu-latest'
 
- - name: Install cross-compilation tools
- run: |
- set -ex
- sudo apt-get update
- sudo apt-get install -y ${{ matrix.gcc_package }} ninja-build
- upcase=$(echo ${{ matrix.target }} | awk '{ print toupper($0) }' | sed 's/-/_/g')
- echo CARGO_TARGET_${upcase}_LINKER=${{ matrix.gcc }} >> $GITHUB_ENV
- if: matrix.gcc_package != '' && matrix.os == 'ubuntu-latest'
-
  - name: Install cross-compilation libraries
  run: |
  set -ex
@@ -688,26 +602,20 @@ jobs:
  os: ubuntu-latest
  rust: nightly-2023-07-03
  target: powerpc64le-unknown-linux-gnu
- gcc_package: gcc-powerpc64le-linux-gnu
- gcc: powerpc64le-linux-gnu-gcc
  qemu: qemu-ppc64le
  qemu_args: -L /usr/powerpc64le-linux-gnu
  qemu_target: ppc64le-linux-user
  - build: mips64el-linux
  os: ubuntu-latest
  rust: nightly-2023-07-03
  target: mips64el-unknown-linux-gnuabi64
- gcc_package: gcc-mips64el-linux-gnuabi64
- gcc: mips64el-linux-gnuabi64-gcc
  qemu: qemu-mips64el
  qemu_args: -L /usr/mips64el-linux-gnuabi64
  qemu_target: mips64el-linux-user
  - build: mipsel-linux
  os: ubuntu-latest
  rust: nightly-2023-07-03
  target: mipsel-unknown-linux-gnu
- gcc_package: gcc-mipsel-linux-gnu
- gcc: mipsel-linux-gnu-gcc
  qemu: qemu-mipsel
  qemu_args: -L /usr/mipsel-linux-gnu
  qemu_target: mipsel-linux-user
@@ -739,15 +647,6 @@ jobs:
  key: qemu-${{ matrix.target }}-${{ env.QEMU_BUILD_VERSION }}-patched
  if: matrix.target != '' && matrix.os == 'ubuntu-latest'
 
- - name: Install cross-compilation tools
- run: |
- set -ex
- sudo apt-get update
- sudo apt-get install -y ${{ matrix.gcc_package }} ninja-build
- upcase=$(echo ${{ matrix.target }} | awk '{ print toupper($0) }' | sed 's/-/_/g')
- echo CARGO_TARGET_${upcase}_LINKER=${{ matrix.gcc }} >> $GITHUB_ENV
- if: matrix.gcc_package != '' && matrix.os == 'ubuntu-latest'
-
  - name: Install cross-compilation libraries
  run: |
  set -ex