about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorqtmlabs <qtmlabs@protonmail.com>2019-10-11 16:05:17 +0700
committerqtmlabs <qtmlabs@protonmail.com>2019-10-11 16:05:17 +0700
commite2ce082fd83a13a7cd989906950d618fa3e2b296 (patch)
tree432a8173b7800143517234f8b8ee79bd4a331657 /src
parent4f97e5d41160e256c9d76d26432831ece83ef480 (diff)
downloadrust-e2ce082fd83a13a7cd989906950d618fa3e2b296.tar.gz
rust-e2ce082fd83a13a7cd989906950d618fa3e2b296.zip
Revert "Remove reference to Ubuntu 15.10 ARM toolchain"
This reverts commit 4f97e5d41160e256c9d76d26432831ece83ef480.
Diffstat (limited to 'src')
-rw-r--r--src/ci/docker/README.md8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/ci/docker/README.md b/src/ci/docker/README.md
index 8fbf512af3c..a2d83eca24b 100644
--- a/src/ci/docker/README.md
+++ b/src/ci/docker/README.md
@@ -169,15 +169,17 @@ For targets: `armv7-unknown-linux-gnueabihf`
 - 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
+- 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.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
+      toolchains shipped with Ubuntu 15.10
 (+) These options have been selected to match the gcc flags we use to compile C
     libraries like jemalloc. See the mk/cfg/arm(v7)-uknown-linux-gnueabi{,hf}.mk
     file in Rust's source code.