Skip to content

Commit 2de710e

Browse files
authored
Rollup merge of rust-lang#56725 - piersfinlayson:master, r=alexcrichton
fix rust-lang/rust issue rust-lang#50583 Rationale for the fix is in rust-lang#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
2 parents 514ef65 + b17a3f2 commit 2de710e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/ci/docker/dist-various-1/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ RUN env \
5252
CXX=arm-linux-gnueabi-g++ CXXFLAGS="-march=armv6 -marm" \
5353
bash musl.sh arm && \
5454
env \
55-
CC=arm-linux-gnueabihf-gcc CFLAGS="-march=armv6 -marm" \
56-
CXX=arm-linux-gnueabihf-g++ CXXFLAGS="-march=armv6 -marm" \
55+
CC=arm-linux-gnueabihf-gcc CFLAGS="-march=armv6 -marm -mfpu=vfp" \
56+
CXX=arm-linux-gnueabihf-g++ CXXFLAGS="-march=armv6 -marm -mfpu=vfp" \
5757
bash musl.sh armhf && \
5858
env \
5959
CC=arm-linux-gnueabihf-gcc CFLAGS="-march=armv7-a" \

0 commit comments

Comments
 (0)