Update rustflags. Fix openssl armv5 compilation.

Author: brocaar

.cargo/config.toml

@@ -1,16 +1,57 @@
 [target.aarch64-unknown-linux-musl]
-rustflags = ["-C", "target-feature=+crt-static", "-C", "link-arg=-s", "-C", "link-arg=-lc", "-C", "link-arg=-lgcc", "-L", "native=/usr/local/aarch64-linux-musl-target/lib", "-l", "static=stdc++"]
+  rustflags = [
+    "-C", "target-feature=+crt-static",
+    "-C", "link-arg=-s",
+    "-C", "link-arg=-lc",
+    "-C", "link-arg=-lgcc",
+    "-L", "native=/usr/local/aarch64-linux-musl-target/lib",
+    "-l", "static=stdc++",
+  ]
 
 [target.armv7-unknown-linux-musleabihf]
-rustflags = ["-C", "target-feature=+crt-static", "-C", "link-arg=-s", "-C", "link-arg=-lc", "-C", "link-arg=-lgcc", "-L", "native=/usr/local/arm-linux-musleabihf-target/lib", "-l", "static=stdc++"]
+  rustflags = [
+    "-C", "target-feature=+crt-static",
+    "-C", "link-arg=-s",
+    "-C", "link-arg=-lc",
+    "-C", "link-arg=-lgcc",
+    "-L", "native=/usr/local/arm-linux-musleabihf-target/lib",
+    "-l", "static=stdc++",
+  ]
 
 [target.mips-unknown-linux-musl]
-rustflags = ["-C", "target-feature=+crt-static", "-C", "link-arg=-s", "-C", "link-arg=-lc", "-C", "link-arg=-lgcc", "-L", "native=/usr/local/mips-linux-muslsf-target/lib", "-l", "static=stdc++"]
+  rustflags = [
+    "-C", "link-arg=-Wl,--allow-multiple-definition",
+    "-C", "target-feature=+crt-static",
+    "-C", "link-arg=-s",
+    "-C", "link-arg=-lc",
+    "-C", "link-arg=-lgcc",
+    "-C", "link-arg=-latomic",
+    "-L", "native=/usr/local/mips-linux-muslsf-target/lib",
+    "-l", "static=stdc++",
+  ]
 
 [target.mipsel-unknown-linux-musl]
-rustflags = ["-C", "target-feature=+crt-static", "-C", "link-arg=-s", "-C", "link-arg=-lc", "-C", "link-arg=-lgcc", "-L", "native=/usr/local/mipsel-linux-muslsf-target/lib", "-l", "static=stdc++"]
+  rustflags = [
+    "-C", "link-arg=-Wl,--allow-multiple-definition",
+    "-C", "target-feature=+crt-static",
+    "-C", "link-arg=-s",
+    "-C", "link-arg=-lc",
+    "-C", "link-arg=-lgcc",
+    "-C", "link-arg=-latomic",
+    "-L", "native=/usr/local/mipsel-linux-muslsf-target/lib",
+    "-l", "static=stdc++",
+  ]
 
 [target.armv5te-unknown-linux-musleabi]
-# Workaround for:
-# https://github.com/rust-lang/compiler-builtins/issues/420
-rustflags = ["-C", "link-arg=-Wl,--allow-multiple-definition", "-C", "target-feature=+crt-static", "-C", "link-arg=-s", "-C", "link-arg=-lc", "-C", "link-arg=-lgcc", "-L", "native=/usr/local/arm-linux-musleabi-target/lib", "-l", "static=stdc++"]
+  # Workaround for:
+  # https://github.com/rust-lang/compiler-builtins/issues/420
+  rustflags = [
+    "-C", "link-arg=-Wl,--allow-multiple-definition",
+    "-C", "target-feature=+crt-static",
+    "-C", "link-arg=-s",
+    "-C", "link-arg=-lc",
+    "-C", "link-arg=-lgcc",
+    "-C", "link-arg=-latomic",
+    "-L", "native=/usr/local/arm-linux-musleabi-target/lib",
+    "-l", "static=stdc++",
+  ]

cross/Dockerfile.armv5te-unknown-linux-musleabi

@@ -13,7 +13,7 @@ RUN echo "Building OpenSSL" && \
     cd /tmp && \
     curl -fLO "https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz" && \
     tar xvzf "openssl-$OPENSSL_VERSION.tar.gz" && cd "openssl-$OPENSSL_VERSION" && \
-    env CC=$MUSL_PREFIX-gcc ./Configure no-shared no-zlib -fPIC --prefix=/usr/local/$MUSL_PREFIX-target -DOPENSSL_NO_SECURE_MEMORY $OPENSSL_TARGET && \
+    env CC=$MUSL_PREFIX-gcc ./Configure no-shared no-zlib -fPIC -latomic --prefix=/usr/local/$MUSL_PREFIX-target -DOPENSSL_NO_SECURE_MEMORY $OPENSSL_TARGET && \
     env C_INCLUDE_PATH=/usr/local/$MUSL_PREFIX/include/ make depend && \
     env C_INCLUDE_PATH=/usr/local/$MUSL_PREFIX/include/ make && \
     make install_sw && \