From d159899bf2ebd04f7b6620206223d4025cd34c5a Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@mozilla.com>
Date: Mon, 3 Mar 2014 14:09:52 -0800
Subject: Set the natural stack alignment for asm.js to 16 bytes.

---
 lib/Basic/Targets.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'lib/Basic/Targets.cpp')

diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index 43a21f2734..45d313b2ed 100644
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -5102,8 +5102,11 @@ public:
     // the direction suggested here:
     //   https://bugzilla.mozilla.org/show_bug.cgi?id=904913#c21
     // We can still set the preferred alignment to 16 bytes though.
+    //
+    // Set the natural stack alignment to 16 bytes to accomodate 128-bit
+    // aligned vectors.
     DescriptionString = "e-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-"
-                        "f32:32:32-f64:64:64-p:32:32:32-v128:32:128-n32";
+                        "f32:32:32-f64:64:64-p:32:32:32-v128:32:128-n32-S128";
   }
 
   void getDefaultFeatures(llvm::StringMap<bool> &Features) const {
-- 
cgit v1.2.3-18-g5258


From f1e7a40a73073cf492a7411acc049af0c729fe8a Mon Sep 17 00:00:00 2001
From: Alon Zakai <alonzakai@gmail.com>
Date: Wed, 9 Apr 2014 17:19:03 -0700
Subject: set the emscripten backend's atomic widths to 32

---
 lib/Basic/Targets.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/Basic/Targets.cpp')

diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index 45d313b2ed..b56b42c798 100644
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -269,6 +269,7 @@ public:
     // handled outside of clang. TODO: Handling this within clang may be
     // beneficial.
     this->UserLabelPrefix = "";
+    this->MaxAtomicPromoteWidth = this->MaxAtomicInlineWidth = 32;
   }
 };
 
-- 
cgit v1.2.3-18-g5258