diff options
| author | Pietro Albini <pietro@pietroalbini.org> | 2018-12-15 10:17:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-15 10:17:29 +0100 |
| commit | 63acc9ff2dbeba248c523a50beeefa6adadfbae6 (patch) | |
| tree | ae1061c887c44d91debb40b6d383e0cd1893d063 /src | |
| parent | 9f3151abe6564ba367a1f82b02bea199ce9283b8 (diff) | |
| parent | b17a3f21c239648141e749d5a4b5af4ae0430c2a (diff) | |
| download | rust-63acc9ff2dbeba248c523a50beeefa6adadfbae6.tar.gz rust-63acc9ff2dbeba248c523a50beeefa6adadfbae6.zip | |
Rollup merge of #56725 - piersfinlayson:master, r=alexcrichton
fix rust-lang/rust issue #50583 Rationale for the fix is in #50583. I've verified that before the fix /musl-armhf/lib/libc.a is riddled with the illegal variant of vmov.f64 and after the fix the version built doesn't contain any of these illegal instructions. I originally thought that the arm-linux-gnueabi version also needed fixing - to add a -mfloat-abi-soft but that's unnecessary as it's compiled with the gnueabi (not hf) compiler (I've some a quick check that the libc.a produced doesn't include VFP instructions). r? @alexcrichton
Diffstat (limited to 'src')
| -rw-r--r-- | src/ci/docker/dist-various-1/Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ci/docker/dist-various-1/Dockerfile b/src/ci/docker/dist-various-1/Dockerfile index c7e6af28f9d..4f8a3c0240e 100644 --- a/src/ci/docker/dist-various-1/Dockerfile +++ b/src/ci/docker/dist-various-1/Dockerfile @@ -52,8 +52,8 @@ RUN env \ CXX=arm-linux-gnueabi-g++ CXXFLAGS="-march=armv6 -marm" \ bash musl.sh arm && \ env \ - CC=arm-linux-gnueabihf-gcc CFLAGS="-march=armv6 -marm" \ - CXX=arm-linux-gnueabihf-g++ CXXFLAGS="-march=armv6 -marm" \ + CC=arm-linux-gnueabihf-gcc CFLAGS="-march=armv6 -marm -mfpu=vfp" \ + CXX=arm-linux-gnueabihf-g++ CXXFLAGS="-march=armv6 -marm -mfpu=vfp" \ bash musl.sh armhf && \ env \ CC=arm-linux-gnueabihf-gcc CFLAGS="-march=armv7-a" \ |