Skip to content

Commit 5a549d3

Browse files
committed
Auto merge of #79068 - DevJPM:ci-llvm-9-fix, r=pietroalbini
Remove Hacks and Fixmes from PR CI's LLVM-9 Container Now with LLVM 9 being the minimum supported version (thanks to #78848 ), we can finally remove the hacks in the dockerfile. This wasn't in the main PR bumping the version as I didn't quite understand what's going on and needed here. Relevant issues and PRs: - Issue #69823 - PR #70989 I hope I actually adressed things correctly here?
2 parents bf469eb + b8f682b commit 5a549d3

File tree

1 file changed

+4
-13
lines changed
  • src/ci/docker/host-x86_64/x86_64-gnu-llvm-9

1 file changed

+4
-13
lines changed

src/ci/docker/host-x86_64/x86_64-gnu-llvm-9/Dockerfile

+4-13
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM ubuntu:18.04
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++ \
5-
g++-arm-linux-gnueabi \
5+
gcc-multilib \
66
make \
77
ninja-build \
88
file \
@@ -39,22 +39,13 @@ ENV SCRIPT python2.7 ../x.py --stage 2 test --exclude src/tools/tidy && \
3939
# the PR is approved and tested for merging.
4040
# It will also detect tests lacking `// EMIT_MIR_FOR_EACH_BIT_WIDTH`,
4141
# despite having different output on 32-bit vs 64-bit targets.
42-
#
43-
# HACK(eddyb) `armv5te` is used (not `i686`) to support older LLVM than LLVM 9:
44-
# https://github.com/rust-lang/compiler-builtins/pull/311#issuecomment-612270089.
45-
# This also requires `--pass=build` because we can't execute the tests
46-
# on the `x86_64` host when they're built as `armv5te` binaries.
47-
# (we're only interested in the MIR output, so this doesn't matter)
48-
python2.7 ../x.py --stage 2 test src/test/mir-opt --pass=build \
49-
--host='' --target=armv5te-unknown-linux-gnueabi && \
42+
python2.7 ../x.py --stage 2 test src/test/mir-opt \
43+
--host='' --target=i686-unknown-linux-gnu && \
5044
# Run the UI test suite again, but in `--pass=check` mode
5145
#
5246
# This is intended to make sure that both `--pass=check` continues to
5347
# work.
5448
#
55-
# FIXME: We ideally want to test this in 32-bit mode, but currently
56-
# (due to the LLVM problems mentioned above) that isn't readily
57-
# possible.
58-
python2.7 ../x.py --stage 2 test src/test/ui --pass=check && \
49+
python2.7 ../x.py --stage 2 test src/test/ui --pass=check --target=i686-unknown-linux-gnu && \
5950
# Run tidy at the very end, after all the other tests.
6051
python2.7 ../x.py --stage 2 test src/tools/tidy

0 commit comments

Comments
 (0)