From 56cc74c81af4642aaa784effec75e38df9955294 Mon Sep 17 00:00:00 2001
From: Zachary Waldowski <zach@waldowski.me>
Date: Sun, 27 Aug 2017 14:07:33 -0400
Subject: [PATCH 1/2] Also canonicalize armv6l as armv6 to fix build

---
 configure.ac | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configure.ac b/configure.ac
index 8f38f0829..fad99ec23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,6 +190,9 @@ AC_ARG_WITH([swift-toolchain],
 		    armv7l*)
 			target_cpu="armv7"
 			;;
+		    armv6l*)
+			target_cpu="armv6"
+			;;
 			*)
             esac
 	    ;;

From ab72a60c9f69891f0386344cac2de9c0a155234d Mon Sep 17 00:00:00 2001
From: Zachary Waldowski <zach@waldowski.me>
Date: Sun, 27 Aug 2017 16:25:52 -0400
Subject: [PATCH 2/2] Fix dylibs being output to wrong mapped CPU folder

---
 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 8beaf1e85..58dcead4b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -188,7 +188,7 @@ SWIFT_GEN_FILES=	\
 	$(abs_builddir)/swift/Dispatch.swiftdoc \
 	$(SWIFT_OBJ_FILES)
 
-swiftmoddir=${prefix}/lib/swift/${OS_STRING}/${host_cpu}
+swiftmoddir=${prefix}/lib/swift/${OS_STRING}/${target_cpu}
 swiftmod_HEADERS=\
 	$(abs_builddir)/swift/Dispatch.swiftmodule \
 	$(abs_builddir)/swift/Dispatch.swiftdoc