Skip to content

Rollup of 8 pull requests #128698

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

Closed
wants to merge 27 commits into from
Closed

Rollup of 8 pull requests #128698

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
4d74712
Tweak type inference for `const` operands in inline asm
Amanieu May 25, 2024
575fc72
Work around #96304 by ignoring one test case
Amanieu Jun 11, 2024
97738e1
apply fix suggested by lcnr
folkertdev Jul 21, 2024
c77b569
Apply suggestions from code review
folkertdev Jul 22, 2024
d4ca1ac
rustfmt
Amanieu Jul 23, 2024
be66415
use `ErrorGuaranteed` from emit
folkertdev Jul 25, 2024
b73077e
separate test file for invalid sym operand
folkertdev Aug 1, 2024
47e6db5
separate test file for invalid const operand
folkertdev Aug 1, 2024
eb726a5
add `needs-asm-support` to invalid-sym-operand
folkertdev Aug 2, 2024
de26ad1
Promote riscv64gc-unknown-linux-musl to tier 2
Amanieu Feb 26, 2024
a937a3b
Make riscv64gc-unknown-linux-musl dynamically linked by default
Amanieu Jun 22, 2024
9963a6c
Add platform support document for riscv64gc-unknown-linux-musl
Amanieu Jun 22, 2024
b46237b
Enable msvc for zero-extend-abi-param-passing
ChrisDenton Aug 4, 2024
2e5341a
Enable msvc for no-duplicate-libs
ChrisDenton Aug 4, 2024
d8c2b76
run-make: enable msvc for link-dedup
ChrisDenton Aug 4, 2024
3268b2e
Enable msvc for link-args-order
ChrisDenton Aug 4, 2024
1737845
Enable msvc for run-make/rust-lld
ChrisDenton Aug 4, 2024
212417b
custom MIR: add support for tail calls
RalfJung Aug 5, 2024
8c1b525
Update `compiler-builtins` to 0.1.115
tgross35 Aug 5, 2024
cf0989c
Rollup merge of #122049 - Amanieu:riscv64-musl-tier2, r=Mark-Simulacrum
tgross35 Aug 5, 2024
13b85f8
Rollup merge of #125558 - Amanieu:const-asm-type, r=lcnr
tgross35 Aug 5, 2024
f78d783
Rollup merge of #128638 - ChrisDenton:link-dedup, r=jieyouxu
tgross35 Aug 5, 2024
43633e8
Rollup merge of #128647 - ChrisDenton:link-args-order, r=jieyouxu
tgross35 Aug 5, 2024
e9918f8
Rollup merge of #128649 - ChrisDenton:param-passing, r=jieyouxu
tgross35 Aug 5, 2024
d4d7903
Rollup merge of #128656 - ChrisDenton:rust-lld, r=lqd
tgross35 Aug 5, 2024
bb3157a
Rollup merge of #128688 - RalfJung:custom-mir-tail-calls, r=compiler-…
tgross35 Aug 5, 2024
e6cdde2
Rollup merge of #128691 - tgross35:update-builtins, r=Amanieu
tgross35 Aug 5, 2024
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
Prev Previous commit
Next Next commit
Promote riscv64gc-unknown-linux-musl to tier 2
  • Loading branch information
@Amanieu
Amanieu committed Aug 3, 2024
commit de26ad1a2a30a65d74b9bf433fc805e261c6ed53
14 changes: 12 additions & 2 deletions src/ci/docker/host-x86_64/dist-various-2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ RUN apt-get update && apt-get build-dep -y clang llvm && apt-get install -y --no
# Needed for apt-key to work:
dirmngr \
gpg-agent \
g++-9-arm-linux-gnueabi
g++-9-arm-linux-gnueabi \
g++-11-riscv64-linux-gnu

RUN apt-key adv --batch --yes --keyserver keyserver.ubuntu.com --recv-keys 74DA7924C5513486
RUN add-apt-repository -y 'deb https://apt.dilos.org/dilos dilos2 main'
Expand Down Expand Up @@ -73,6 +74,10 @@ RUN env \
CC=arm-linux-gnueabi-gcc-9 CFLAGS="-march=armv7-a" \
CXX=arm-linux-gnueabi-g++-9 CXXFLAGS="-march=armv7-a" \
bash musl.sh armv7 && \
env \
CC=riscv64-linux-gnu-gcc-11 \
CXX=riscv64-linux-gnu-g++-11 \
bash musl.sh riscv64gc && \
rm -rf /build/*

WORKDIR /tmp
Expand Down Expand Up @@ -125,14 +130,19 @@ ENV TARGETS=$TARGETS,x86_64-unknown-none
ENV TARGETS=$TARGETS,aarch64-unknown-uefi
ENV TARGETS=$TARGETS,i686-unknown-uefi
ENV TARGETS=$TARGETS,x86_64-unknown-uefi
ENV TARGETS=$TARGETS,riscv64gc-unknown-linux-musl

# As per https://bugs.launchpad.net/ubuntu/+source/gcc-defaults/+bug/1300211
# we need asm in the search path for gcc-9 (for gnux32) but not in the search path of the
# cross compilers.
# Luckily one of the folders is /usr/local/include so symlink /usr/include/x86_64-linux-gnu/asm there
RUN ln -s /usr/include/x86_64-linux-gnu/asm /usr/local/include/asm

# musl-gcc can't find libgcc_s.so.1 since it doesn't use the standard search paths.
RUN ln -s /usr/riscv64-linux-gnu/lib/libgcc_s.so.1 /usr/lib/gcc-cross/riscv64-linux-gnu/11/

ENV RUST_CONFIGURE_ARGS --enable-extended --enable-lld --enable-llvm-bitcode-linker --disable-docs \
--musl-root-armv7=/musl-armv7
--musl-root-armv7=/musl-armv7 \
--musl-root-riscv64gc=/musl-riscv64gc

ENV SCRIPT python3 ../x.py dist --host='' --target $TARGETS
1 change: 1 addition & 0 deletions src/tools/build-manifest/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ static TARGETS: &[&str] = &[
"riscv64gc-unknown-hermit",
"riscv64gc-unknown-none-elf",
"riscv64gc-unknown-linux-gnu",
"riscv64gc-unknown-linux-musl",
"s390x-unknown-linux-gnu",
"sparc64-unknown-linux-gnu",
"sparcv9-sun-solaris",
Expand Down