commit dc6aff6f30262ffcd06c75ce3c10f7c7aa90e23e
author swift-ci <swift-ci@users.noreply.github.com> Thu Sep 28 03:08:03 2017 -0700
committer swift-ci <swift-ci@users.noreply.github.com> Thu Sep 28 03:08:03 2017 -0700
tree 142374a133d1bbbb6be6a5addb8ad8ea7cc4ac89
parent 46dbb0bfe49f1ce5fc19d5148a5f67668c8cb3c1
parent 6ab59ad6ffa3ea375443482b19c34a0e0365bdcd

Merge remote-tracking branch 'origin/swift-4.1-branch' into stable

lib/Basic/Targets.cpp

diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index 5d75aa5..915c161 100644
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -9350,8 +9350,7 @@
     WIntType = SignedInt;
     Char32Type = UnsignedLong;
     SigAtomicType = SignedChar;
-    resetDataLayout("e-p:16:16:16-i8:8:8-i16:16:16-i32:32:32-i64:64:64"
-		    "-f32:32:32-f64:64:64-n8");
+    resetDataLayout("e-p:16:8-i8:8-i16:8-i32:8-i64:8-f32:8-f64:8-n8-a:8");
   }
 
   void getTargetDefines(const LangOptions &Opts,