From 51c484d755eec70ebb2c4592cef61131e00bcb44 Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@mozilla.com>
Date: Wed, 26 Feb 2014 18:41:24 -0800
Subject: [PATCH 1/3] Check in the version of this test which is actually
 updated for asmjs-unknown-emscripten.

---
 test/Driver/asmjs-unknown-emscripten.cpp | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/test/Driver/asmjs-unknown-emscripten.cpp b/test/Driver/asmjs-unknown-emscripten.cpp
index fb94f0ecf92..bf37734af4a 100644
--- a/test/Driver/asmjs-unknown-emscripten.cpp
+++ b/test/Driver/asmjs-unknown-emscripten.cpp
@@ -45,19 +45,14 @@ int align_vl = __alignof(va_list);
 void __LITTLE_ENDIAN__defined() {}
 #endif
 
-// CHECK: __native_client__defined
-#ifdef __native_client__
-void __native_client__defined() {}
+// CHECK: __asmjs__defined
+#ifdef __asmjs__
+void __asmjs__defined() {}
 #endif
 
-// CHECK: __le32__defined
-#ifdef __le32__
-void __le32__defined() {}
-#endif
-
-// CHECK: __pnacl__defined
-#ifdef __pnacl__
-void __pnacl__defined() {}
+// CHECK: __EMSCRIPTEN__defined
+#ifdef __EMSCRIPTEN__
+void __EMSCRIPTEN__defined() {}
 #endif
 
 // CHECK: unixdefined
@@ -65,11 +60,6 @@ void __pnacl__defined() {}
 void unixdefined() {}
 #endif
 
-// CHECK: __ELF__defined
-#ifdef __ELF__
-void __ELF__defined() {}
-#endif
-
 // CHECK: _GNU_SOURCEdefined
 #ifdef _GNU_SOURCE
 void _GNU_SOURCEdefined() {}

From 88198a1fe0d27db3ba0e1773c5f11ef074ba782d Mon Sep 17 00:00:00 2001
From: Jukka Jylanki <jujjyl@gmail.com>
Date: Thu, 10 Apr 2014 11:46:42 +0300
Subject: [PATCH 2/3] Allow setting CLANG_INCLUDE_TESTS=OFF to avoid having to
 build long-running tests with cmake. This change is already in upstream LLVM
 3.4 repository.

---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5d05a4cdb55..bcd5c525788 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -290,10 +290,10 @@ option(CLANG_INCLUDE_TESTS
        "Generate build targets for the Clang unit tests."
        ${LLVM_INCLUDE_TESTS})
 
-# TODO: docs.
-add_subdirectory(test)
-
 if( CLANG_INCLUDE_TESTS )
+  # TODO: docs.
+  add_subdirectory(test) # XXX Emscripten: Backport fix from upstream LLVM 3.4 to actually skip tests if CLANG_INCLUDE_TESTS = OFF
+
   add_subdirectory(unittests)
 endif()
 

From 926efa5d923dfd9555270a2bbb156bc30ce35fc9 Mon Sep 17 00:00:00 2001
From: Alon Zakai <alonzakai@gmail.com>
Date: Tue, 15 Apr 2014 17:46:10 -0700
Subject: [PATCH 3/3] 1.16.0

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

diff --git a/emscripten-version.txt b/emscripten-version.txt
index db39b14cd04..f488f67e2a2 100644
--- a/emscripten-version.txt
+++ b/emscripten-version.txt
@@ -1,2 +1,2 @@
-1.15.1
+1.16.0