Skip to content

Commit e2ce082

Browse files
committed
Revert "Remove reference to Ubuntu 15.10 ARM toolchain"
This reverts commit 4f97e5d.
1 parent 4f97e5d commit e2ce082

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/ci/docker/README.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -169,15 +169,17 @@ For targets: `armv7-unknown-linux-gnueabihf`
169169
- Target options > Target Architecture = arm
170170
- Target options > Suffix to the arch-part = v7
171171
- Target options > Architecture level = armv7-a -- (+)
172-
- Target options > Use specific FPU = vfpv3-d16
173-
- Target options > Floating point = hardware (FPU)
174-
- Target options > Default instruction set mode = thumb
172+
- Target options > Use specific FPU = vfpv3-d16 -- (\*)
173+
- Target options > Floating point = hardware (FPU) -- (\*)
174+
- Target options > Default instruction set mode = thumb -- (\*)
175175
- Operating System > Target OS = linux
176176
- Operating System > Linux kernel version = 3.2.101
177177
- C-library > glibc version = 2.17.0
178178
- C compiler > gcc version = 8.3.0
179179
- C compiler > C++ = ENABLE -- to cross compile LLVM
180180
181+
(\*) These options have been selected to match the configuration of the arm
182+
toolchains shipped with Ubuntu 15.10
181183
(+) These options have been selected to match the gcc flags we use to compile C
182184
libraries like jemalloc. See the mk/cfg/arm(v7)-uknown-linux-gnueabi{,hf}.mk
183185
file in Rust's source code.

0 commit comments

Comments
 (0)