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: [PATCH 1/2] set the emscripten backend's atomic widths to 32

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

diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index 45d313b2edd..b56b42c798e 100644
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -269,6 +269,7 @@ class EmscriptenTargetInfo : public OSTargetInfo<Target> {
     // handled outside of clang. TODO: Handling this within clang may be
     // beneficial.
     this->UserLabelPrefix = "";
+    this->MaxAtomicPromoteWidth = this->MaxAtomicInlineWidth = 32;
   }
 };
 

From 541e58e9579af77a9c7bc6e3d39708caf0ba67d6 Mon Sep 17 00:00:00 2001
From: Alon Zakai <alonzakai@gmail.com>
Date: Thu, 10 Apr 2014 15:55:05 -0700
Subject: [PATCH 2/2] 1.15.0

---
 emscripten-version.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emscripten-version.txt b/emscripten-version.txt
index 3166fbaa77f..226e95b7c3c 100644
--- a/emscripten-version.txt
+++ b/emscripten-version.txt
@@ -1,2 +1,2 @@
-1.14.1
+1.15.0