diff --git a/emscripten-version.txt b/emscripten-version.txt
index edec5febbb7..6861b8cf317 100644
--- a/emscripten-version.txt
+++ b/emscripten-version.txt
@@ -1,2 +1,2 @@
-1.34.8
+1.34.9
 
diff --git a/lib/Target/JSBackend/CallHandlers.h b/lib/Target/JSBackend/CallHandlers.h
index b321216c098..7e141534a10 100644
--- a/lib/Target/JSBackend/CallHandlers.h
+++ b/lib/Target/JSBackend/CallHandlers.h
@@ -807,12 +807,45 @@ DEF_BUILTIN_HANDLER(emscripten_float64x2_fromInt32x4Bits, SIMD_Float64x2_fromInt
 DEF_BUILTIN_HANDLER(emscripten_float64x2_fromInt32x4, SIMD_Float64x2_fromInt32x4);
 DEF_BUILTIN_HANDLER(emscripten_float64x2_fromFloat32x4Bits, SIMD_Float64x2_fromFloat32x4Bits);
 DEF_BUILTIN_HANDLER(emscripten_float64x2_fromFloat32x4, SIMD_Float64x2_fromFloat32x4);
+
+static std::string castBool64x2ToInt32x4(const std::string &valueStr) {
+  return std::string("SIMD_Int32x4_fromBool64x2Bits(") + valueStr + ')';
+}
+
+DEF_CALL_HANDLER(emscripten_float64x2_equal, {
+  return getAssign(CI) + castBool64x2ToInt32x4("SIMD_Float64x2_equal(" + getValueAsStr(CI->getOperand(0)) + ", " + getValueAsStr(CI->getOperand(1)) + ")");
+})
+
+DEF_CALL_HANDLER(emscripten_float64x2_notEqual, {
+  return getAssign(CI) + castBool64x2ToInt32x4("SIMD_Float64x2_notEqual(" + getValueAsStr(CI->getOperand(0)) + ", " + getValueAsStr(CI->getOperand(1)) + ")");
+})
+
+DEF_CALL_HANDLER(emscripten_float64x2_lessThan, {
+  return getAssign(CI) + castBool64x2ToInt32x4("SIMD_Float64x2_lessThan(" + getValueAsStr(CI->getOperand(0)) + ", " + getValueAsStr(CI->getOperand(1)) + ")");
+})
+
+DEF_CALL_HANDLER(emscripten_float64x2_lessThanOrEqual, {
+  return getAssign(CI) + castBool64x2ToInt32x4("SIMD_Float64x2_lessThanOrEqual(" + getValueAsStr(CI->getOperand(0)) + ", " + getValueAsStr(CI->getOperand(1)) + ")");
+})
+
+DEF_CALL_HANDLER(emscripten_float64x2_greaterThan, {
+  return getAssign(CI) + castBool64x2ToInt32x4("SIMD_Float64x2_greaterThan(" + getValueAsStr(CI->getOperand(0)) + ", " + getValueAsStr(CI->getOperand(1)) + ")");
+})
+
+DEF_CALL_HANDLER(emscripten_float64x2_greaterThanOrEqual, {
+  return getAssign(CI) + castBool64x2ToInt32x4("SIMD_Float64x2_greaterThanOrEqual(" + getValueAsStr(CI->getOperand(0)) + ", " + getValueAsStr(CI->getOperand(1)) + ")");
+})
+
+// The above code to handle Float64x2 comparisons to a booleans is temporary. Once Bool64x2 is in the spec and SpiderMonkey has the type, revert to the code below.
+#if 0
 DEF_BUILTIN_HANDLER(emscripten_float64x2_equal, SIMD_Float64x2_equal);
 DEF_BUILTIN_HANDLER(emscripten_float64x2_notEqual, SIMD_Float64x2_notEqual);
 DEF_BUILTIN_HANDLER(emscripten_float64x2_lessThan, SIMD_Float64x2_lessThan);
 DEF_BUILTIN_HANDLER(emscripten_float64x2_lessThanOrEqual, SIMD_Float64x2_lessThanOrEqual);
 DEF_BUILTIN_HANDLER(emscripten_float64x2_greaterThan, SIMD_Float64x2_greaterThan);
 DEF_BUILTIN_HANDLER(emscripten_float64x2_greaterThanOrEqual, SIMD_Float64x2_greaterThanOrEqual);
+#endif
+
 DEF_BUILTIN_HANDLER(emscripten_float64x2_and, SIMD_Float64x2_and);
 DEF_BUILTIN_HANDLER(emscripten_float64x2_or, SIMD_Float64x2_or);
 DEF_BUILTIN_HANDLER(emscripten_float64x2_xor, SIMD_Float64x2_xor);
diff --git a/lib/Transforms/NaCl/ExpandI64.cpp b/lib/Transforms/NaCl/ExpandI64.cpp
index 39b48b160cd..ca8ea0b082a 100644
--- a/lib/Transforms/NaCl/ExpandI64.cpp
+++ b/lib/Transforms/NaCl/ExpandI64.cpp
@@ -822,15 +822,15 @@ bool ExpandI64::splitInst(Instruction *I) {
         Chunks.push_back(H);
         break;
       } else if (isa<VectorType>(I->getOperand(0)->getType()) && !isa<VectorType>(I->getType())) {
-          unsigned NumElts = getNumChunks(I->getType());
-          VectorType *IVTy = VectorType::get(i32, NumElts);
-          Instruction *B = CopyDebug(new BitCastInst(I->getOperand(0), IVTy, "", I), I);
-          for (unsigned i = 0; i < NumElts; ++i) {
-              Constant *Idx = ConstantInt::get(i32, i);
-              Instruction *Ext = CopyDebug(ExtractElementInst::Create(B, Idx, "", I), I);
-              Chunks.push_back(Ext);
-          }
-          break;
+        unsigned NumElts = getNumChunks(I->getType());
+        VectorType *IVTy = VectorType::get(i32, NumElts);
+        Instruction *B = CopyDebug(new BitCastInst(I->getOperand(0), IVTy, "", I), I);
+        for (unsigned i = 0; i < NumElts; ++i) {
+          Constant *Idx = ConstantInt::get(i32, i);
+          Instruction *Ext = CopyDebug(ExtractElementInst::Create(B, Idx, "", I), I);
+          Chunks.push_back(Ext);
+        }
+        break;
       } else {
         // no-op bitcast
         assert(I->getType() == I->getOperand(0)->getType());