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

[beta] backport rollup #65708

Merged
merged 26 commits into from
Oct 26, 2019
Merged

[beta] backport rollup #65708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
d45ca22
Add troubleshooting section to PGO chapter in rustc book.
michaelwoerister Oct 14, 2019
edcc7af
Auto merge of #65302 - msizanoen1:fix-armv7-segfault, r=alexcrichton
bors Oct 20, 2019
36ef9d7
Add expanded type cache to OpaqueTypeExpander
tmandry Oct 10, 2019
e9978cf
Only expand types that contain projections
tmandry Oct 10, 2019
cf05730
use precalculated dominators in explain_borrow
tanriol Oct 6, 2019
42c5024
Ensure that associated `async fn`s have unique fresh param names
matthewjasper Oct 5, 2019
2b88722
Account for macro invocation in `let mut $pat` diagnostic.
Centril Oct 5, 2019
8bf21c1
Auto merge of #65020 - pnkfelix:targetted-fix-for-always-marking-rust…
bors Oct 12, 2019
da27cc9
typeck: silence unreachable code from await
davidtwco Sep 30, 2019
3455abb
async/await: improve obligation errors
davidtwco Sep 25, 2019
22694dc
syntax: fix #64682.
Centril Sep 29, 2019
e31afd3
Upgrade async/await to "used" keywords.
ehuss Sep 28, 2019
db3b85c
Filter out stmts made for the redundant_semicolon lint when pretty-pr…
nathanwhit Sep 12, 2019
c2bf2ca
Add test for redundant_semicolon lint interaction with proc macro attrs
nathanwhit Sep 28, 2019
6031a8a
Fix async/await ICE #64964
sinkuu Oct 2, 2019
f7b45be
Do not collect to vec for debug output
sinkuu Oct 2, 2019
de58c33
Pacify tidy
Mark-Simulacrum Oct 24, 2019
336464a
workaround msys2 bug
mati865 Oct 24, 2019
ba9b8be
Revert "Auto merge of #62948 - matklad:failable-file-loading, r=petro…
matklad Oct 10, 2019
6bd9305
Use empty typeck tables when nesting on items without those
Xanewok Oct 4, 2019
f17c36e
Test an assoc. type in struct member def inside fn
Xanewok Oct 12, 2019
6b753f6
Nest typeck tables when processing struct member types
Xanewok Oct 12, 2019
b561cd1
save-analysis: Nest tables when processing impl items
Xanewok Oct 17, 2019
da12236
save-analysis: Add a relevant test case
Xanewok Oct 17, 2019
4377d2e
Avoid ICE when checking `Destination` of `break` inside a closure
estebank Oct 17, 2019
4aa1e7a
Avoid ICE when adjusting bad self ty
estebank Oct 24, 2019
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
23 changes: 23 additions & 0 deletions src/ci/azure-pipelines/steps/install-windows-build-deps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,17 @@ steps:
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'), ne(variables['MINGW_URL'],''))
displayName: Download custom MinGW

# FIXME(#65767): workaround msys bug, step 1
- bash: |
set -e
arch=i686
if [ "$MSYS_BITS" = "64" ]; then
arch=x86_64
fi
curl -O https://ci-mirrors.rust-lang.org/rustc/msys2-repo/mingw/$arch/mingw-w64-$arch-ca-certificates-20180409-1-any.pkg.tar.xz
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
displayName: Download working ca-certificates for msys

# Otherwise install MinGW through `pacman`
- bash: |
set -e
Expand All @@ -96,6 +107,18 @@ steps:
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'), eq(variables['MINGW_URL'],''))
displayName: Download standard MinGW

# FIXME(#65767): workaround msys bug, step 2
- bash: |
set -e
arch=i686
if [ "$MSYS_BITS" = "64" ]; then
arch=x86_64
fi
pacman -U --noconfirm --noprogressbar mingw-w64-$arch-ca-certificates-20180409-1-any.pkg.tar.xz
rm mingw-w64-$arch-ca-certificates-20180409-1-any.pkg.tar.xz
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
displayName: Install working ca-certificates for msys

# Make sure we use the native python interpreter instead of some msys equivalent
# one way or another. The msys interpreters seem to have weird path conversions
# baked in which break LLVM's build system one way or another, so let's use the
Expand Down
9 changes: 4 additions & 5 deletions src/ci/docker/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,18 +165,17 @@ For targets: `arm-unknown-linux-gnueabihf`
For targets: `armv7-unknown-linux-gnueabihf`

- Path and misc options > Prefix directory = /x-tools/${CT\_TARGET}
- Path and misc options > Patches origin = Bundled, then local
- Path and misc options > Local patch directory = /tmp/patches
- Path and misc options > Patches origin = Bundled only
- Target options > Target Architecture = arm
- Target options > Suffix to the arch-part = v7
- Target options > Architecture level = armv7-a -- (+)
- Target options > Use specific FPU = vfpv3-d16 -- (\*)
- Target options > Floating point = hardware (FPU) -- (\*)
- Target options > Default instruction set mode = thumb -- (\*)
- Operating System > Target OS = linux
- Operating System > Linux kernel version = 3.2.72 -- Precise kernel
- C-library > glibc version = 2.16.0
- C compiler > gcc version = 5.2.0
- Operating System > Linux kernel version = 3.2.101
- C-library > glibc version = 2.17.0
- C compiler > gcc version = 8.3.0
- C compiler > C++ = ENABLE -- to cross compile LLVM

(\*) These options have been selected to match the configuration of the arm
Expand Down
8 changes: 1 addition & 7 deletions src/ci/docker/dist-armv7-linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,14 @@ FROM ubuntu:16.04
COPY scripts/cross-apt-packages.sh /scripts/
RUN sh /scripts/cross-apt-packages.sh

# Ubuntu 16.04 (this container) ships with make 4, but something in the
# toolchains we build below chokes on that, so go back to make 3
COPY scripts/make3.sh /scripts/
RUN sh /scripts/make3.sh

COPY scripts/crosstool-ng.sh /scripts/
COPY dist-armv7-linux/crosstool-ng.sh /scripts/
RUN sh /scripts/crosstool-ng.sh

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

COPY dist-armv7-linux/patches/ /tmp/patches/
COPY dist-armv7-linux/build-toolchains.sh dist-armv7-linux/armv7-linux-gnueabihf.config /tmp/
RUN ./build-toolchains.sh

Expand Down
Loading