From dda75249e5fee128f67c5ff9763cb0fc022b7403 Mon Sep 17 00:00:00 2001
From: Amanieu d'Antras <amanieu@gmail.com>
Date: Sun, 8 Jul 2018 18:27:19 +0100
Subject: [PATCH 1/2] Copy libgcc as well after building musl

This is needed for rust-lang/libc#1034.
---
 src/ci/docker/scripts/musl.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/ci/docker/scripts/musl.sh b/src/ci/docker/scripts/musl.sh
index f87ba8fe4e60e..ae908f639872f 100644
--- a/src/ci/docker/scripts/musl.sh
+++ b/src/ci/docker/scripts/musl.sh
@@ -72,3 +72,6 @@ cmake ../libunwind-release_$LLVM \
 hide_output make -j$(nproc)
 cp lib/libunwind.a /musl-$TAG/lib
 cd ../ && rm -rf libunwind-build
+
+# Copy libgcc since musl may depend on symbols defined in it
+cp $($CC $CFLAGS -print-libgcc-file-name) /musl-$TAG/lib

From 3ad6ff584701463809f318275cba6e8b6814cc72 Mon Sep 17 00:00:00 2001
From: Amanieu d'Antras <amanieu@gmail.com>
Date: Mon, 9 Jul 2018 15:37:02 +0100
Subject: [PATCH 2/2] Update the libc submodule

---
 src/liblibc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/liblibc b/src/liblibc
index b6d23ed45d729..bfe0e32d1260d 160000
--- a/src/liblibc
+++ b/src/liblibc
@@ -1 +1 @@
-Subproject commit b6d23ed45d72918239c0bfac11dc547895e59b81
+Subproject commit bfe0e32d1260d5dd317aa144e757c1edbcc08ea3