Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

promote i586-unknown-linux-gnu to Tier2+hosttools #108716

Closed
wants to merge 2 commits into from
Closed

promote i586-unknown-linux-gnu to Tier2+hosttools #108716

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1266e8d
promote i586-unknown-linux-gnu to Tier2+hosttools
goshhhy Mar 3, 2023
bd24e9a
expand yaml anchors to fix CI
goshhhy Mar 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 1 addition & 18 deletions ...4/dist-i586-gnu-i586-i686-musl/Dockerfile → ...ost-x86_64/dist-i586-i686-musl/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
COPY scripts/cross-apt-packages.sh /scripts/
RUN sh /scripts/cross-apt-packages.sh

COPY scripts/crosstool-ng-1.24.sh /scripts/
RUN sh /scripts/crosstool-ng-1.24.sh

COPY scripts/rustbuild-setup.sh /scripts/
RUN sh /scripts/rustbuild-setup.sh
WORKDIR /tmp

COPY host-x86_64/dist-i586-gnu-i586-i686-musl/i586-linux-gnu.config \
host-x86_64/dist-i586-gnu-i586-i686-musl/build-i586-gnu-toolchain.sh \
/tmp/
RUN su rustbuild -c ./build-i586-gnu-toolchain.sh
ENV PATH=$PATH:/x-tools/i586-unknown-linux-gnu/bin
ENV \
CC_i586_unknown_linux_gnu=i586-unknown-linux-gnu-gcc \
AR_i586_unknown_linux_gnu=i586-unknown-linux-gnu-ar

WORKDIR /build/
COPY scripts/musl.sh /build/
RUN CC=gcc CFLAGS="-m32 -Wa,-mrelax-relocations=no" \
Expand Down Expand Up @@ -68,10 +52,9 @@ ENV RUST_CONFIGURE_ARGS \
#
# See: https://github.com/rust-lang/rust/issues/34978
ENV CFLAGS_i686_unknown_linux_musl=-Wa,-mrelax-relocations=no
ENV CFLAGS_i586_unknown_linux_gnu=-Wa,-mrelax-relocations=no
ENV CFLAGS_i586_unknown_linux_musl=-Wa,-mrelax-relocations=no

ENV TARGETS=i586-unknown-linux-gnu,i686-unknown-linux-musl
ENV TARGETS=i686-unknown-linux-musl

ENV SCRIPT \
python3 ../x.py --stage 2 test --host='' --target $TARGETS && \
Expand Down
56 changes: 56 additions & 0 deletions src/ci/docker/host-x86_64/dist-i586-linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
FROM ubuntu:22.04

ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -y --no-install-recommends \
g++-multilib \
make \
ninja-build \
file \
curl \
ca-certificates \
python3 \
git \
cmake \
xz-utils \
sudo \
gdb \
patch \
libssl-dev \
pkg-config

COPY scripts/cross-apt-packages.sh /scripts/
RUN sh /scripts/cross-apt-packages.sh

COPY scripts/crosstool-ng-1.24.sh /scripts/
RUN sh /scripts/crosstool-ng-1.24.sh

COPY scripts/rustbuild-setup.sh /scripts/
RUN sh /scripts/rustbuild-setup.sh
WORKDIR /tmp

COPY host-x86_64/dist-i586-linux/i586-linux-gnu.config \
host-x86_64/dist-i586-linux/build-i586-gnu-toolchain.sh \
/tmp/
RUN su rustbuild -c ./build-i586-gnu-toolchain.sh
ENV PATH=$PATH:/x-tools/i586-unknown-linux-gnu/bin
ENV \
CC_i586_unknown_linux_gnu=i586-unknown-linux-gnu-gcc \
AR_i586_unknown_linux_gnu=i586-unknown-linux-gnu-ar

COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh

ENV RUST_CONFIGURE_ARGS \
--enable-full-tools \
--disable-docs

# Newer binutils broke things on some vms/distros (i.e., linking against
# unknown relocs disabled by the following flag), so we need to go out of our
# way to produce "super compatible" binaries.
#
# See: https://github.com/rust-lang/rust/issues/34978
ENV CFLAGS_i586_unknown_linux_gnu=-Wa,-mrelax-relocations=no

ENV HOSTS=i586-unknown-linux-gnu
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS

0 ...586-i686-musl/build-i586-gnu-toolchain.sh → ...st-i586-linux/build-i586-gnu-toolchain.sh
View file
Open in desktop
File renamed without changes.
0 ...-gnu-i586-i686-musl/i586-linux-gnu.config → ..._64/dist-i586-linux/i586-linux-gnu.config
View file
Open in desktop
File renamed without changes.
5 changes: 4 additions & 1 deletion src/ci/github-actions/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,10 @@ jobs:
- name: dist-armv7-linux
<<: *job-linux-xl

- name: dist-i586-gnu-i586-i686-musl
- name: dist-i586-i686-musl
<<: *job-linux-xl

- name: dist-i586-linux
goshhhy marked this conversation as resolved.
Show resolved Hide resolved
<<: *job-linux-xl

- name: dist-i686-linux
Expand Down
2 changes: 1 addition & 1 deletion src/doc/rustc/src/platform-support.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ target | notes
`arm-unknown-linux-gnueabi` | ARMv6 Linux (kernel 3.2, glibc 2.17)
`arm-unknown-linux-gnueabihf` | ARMv6 Linux, hardfloat (kernel 3.2, glibc 2.17)
`armv7-unknown-linux-gnueabihf` | ARMv7 Linux, hardfloat (kernel 3.2, glibc 2.17)
`i586-unknown-linux-gnu` | 32-bit Linux w/o SSE (kernel 3.2, glibc 2.17)
`mips-unknown-linux-gnu` | MIPS Linux (kernel 4.4, glibc 2.23)
`mips64-unknown-linux-gnuabi64` | MIPS64 Linux, n64 ABI (kernel 4.4, glibc 2.23)
`mips64el-unknown-linux-gnuabi64` | MIPS64 (LE) Linux, n64 ABI (kernel 4.4, glibc 2.23)
Expand Down Expand Up @@ -146,7 +147,6 @@ target | std | notes
`armv7r-none-eabihf` | * | Bare ARMv7-R, hardfloat
`asmjs-unknown-emscripten` | ✓ | asm.js via Emscripten
`i586-pc-windows-msvc` | * | 32-bit Windows w/o SSE
`i586-unknown-linux-gnu` | ✓ | 32-bit Linux w/o SSE (kernel 3.2, glibc 2.17)
`i586-unknown-linux-musl` | ✓ | 32-bit Linux w/o SSE, MUSL
[`i686-linux-android`](platform-support/android.md) | ✓ | 32-bit x86 Android
`i686-unknown-freebsd` | ✓ | 32-bit FreeBSD
Expand Down