Skip to content

Commit 6ebf23e

Browse files
authored
Rollup merge of rust-lang#65302 - msizanoen1:fix-armv7-segfault, r=alexcrichton
Upgrade GCC to 8.3.0, glibc to 1.17.0 and crosstool-ng to 1.24.0 for dist-armv7-linux rust-lang#62896 was caused by the usage of the GCC 5.2.0 toolchain, which was released back in 2015 and may have bugs affecting LLVM 9. This PR upgrade GCC to 8.3.0 from 5.2.0, glibc from 1.16.0 to 1.17.0 and crosstool-ng to 1.24.0 only for dist-armv7-linux. Fixes rust-lang#62896 r? @alexcrichton
2 parents d5a5c32 + 870ea52 commit 6ebf23e

File tree

6 files changed

+511
-366
lines changed

6 files changed

+511
-366
lines changed

src/ci/docker/README.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -165,18 +165,17 @@ For targets: `arm-unknown-linux-gnueabihf`
165165
For targets: `armv7-unknown-linux-gnueabihf`
166166
167167
- Path and misc options > Prefix directory = /x-tools/${CT\_TARGET}
168-
- Path and misc options > Patches origin = Bundled, then local
169-
- Path and misc options > Local patch directory = /tmp/patches
168+
- Path and misc options > Patches origin = Bundled only
170169
- Target options > Target Architecture = arm
171170
- Target options > Suffix to the arch-part = v7
172171
- Target options > Architecture level = armv7-a -- (+)
173172
- Target options > Use specific FPU = vfpv3-d16 -- (\*)
174173
- Target options > Floating point = hardware (FPU) -- (\*)
175174
- Target options > Default instruction set mode = thumb -- (\*)
176175
- Operating System > Target OS = linux
177-
- Operating System > Linux kernel version = 3.2.72 -- Precise kernel
178-
- C-library > glibc version = 2.16.0
179-
- C compiler > gcc version = 5.2.0
176+
- Operating System > Linux kernel version = 3.2.101
177+
- C-library > glibc version = 2.17.0
178+
- C compiler > gcc version = 8.3.0
180179
- C compiler > C++ = ENABLE -- to cross compile LLVM
181180
182181
(\*) These options have been selected to match the configuration of the arm

src/ci/docker/dist-armv7-linux/Dockerfile

+1-7
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,14 @@ FROM ubuntu:16.04
33
COPY scripts/cross-apt-packages.sh /scripts/
44
RUN sh /scripts/cross-apt-packages.sh
55

6-
# Ubuntu 16.04 (this container) ships with make 4, but something in the
7-
# toolchains we build below chokes on that, so go back to make 3
8-
COPY scripts/make3.sh /scripts/
9-
RUN sh /scripts/make3.sh
10-
11-
COPY scripts/crosstool-ng.sh /scripts/
6+
COPY dist-armv7-linux/crosstool-ng.sh /scripts/
127
RUN sh /scripts/crosstool-ng.sh
138

149
COPY scripts/rustbuild-setup.sh /scripts/
1510
RUN sh /scripts/rustbuild-setup.sh
1611
USER rustbuild
1712
WORKDIR /tmp
1813

19-
COPY dist-armv7-linux/patches/ /tmp/patches/
2014
COPY dist-armv7-linux/build-toolchains.sh dist-armv7-linux/armv7-linux-gnueabihf.config /tmp/
2115
RUN ./build-toolchains.sh
2216

0 commit comments

Comments
 (0)