Index: lib/MC/MachObjectWriter.cpp
===================================================================
--- lib/MC/MachObjectWriter.cpp	(revision 126552)
+++ lib/MC/MachObjectWriter.cpp	(working copy)
@@ -274,8 +274,8 @@
     if (is64Bit())
       Write32(0); // reserved3
 
-    assert(OS.tell() - Start == is64Bit() ? macho::Section64Size :
-           macho::Section32Size);
+    assert(OS.tell() - Start == (is64Bit() ? macho::Section64Size :
+           macho::Section32Size));
   }
 
   void WriteSymtabLoadCommand(uint32_t SymbolOffset, uint32_t NumSymbols,
Index: unittests/Support/MathExtrasTest.cpp
===================================================================
--- unittests/Support/MathExtrasTest.cpp	(revision 126552)
+++ unittests/Support/MathExtrasTest.cpp	(working copy)
@@ -73,7 +73,7 @@
 }
 
 TEST(MathExtras, FloatBits) {
-  static const float kValue = 5632.34;
+  static const float kValue = 5632.34f;
   EXPECT_FLOAT_EQ(kValue, BitsToFloat(FloatToBits(kValue)));
 }
 
Index: utils/unittest/googletest/include/gtest/gtest.h
===================================================================
--- utils/unittest/googletest/include/gtest/gtest.h	(revision 126552)
+++ utils/unittest/googletest/include/gtest/gtest.h	(working copy)
@@ -1258,6 +1258,8 @@
 #pragma warning(push)          // Saves the current warning state.
 #pragma warning(disable:4389)  // Temporarily disables warning on
                                // signed/unsigned mismatch.
+#pragma warning(disable:4805)  // Temporarily disables warning on
+                               // unsafe mix of types
 #endif
 
   if (expected == actual) {