--- chromium-59.0.3071.86/third_party/swiftshader/src/Reactor/BUILD.gn.gcc-5	2017-06-05 21:04:23.000000000 +0200
+++ chromium-59.0.3071.86/third_party/swiftshader/src/Reactor/BUILD.gn	2017-06-10 18:13:09.946401226 +0200
@@ -92,7 +92,7 @@
         cflags += [ "-Wno-sign-compare" ]
       }
     }
-  } else if (is_linux || is_mac) {
+  } else if (is_clang && (is_linux || is_mac)) {
     cflags += [ "-Wno-macro-redefined" ]
   }
 
--- chromium-59.0.3071.86/third_party/swiftshader/third_party/subzero/src/IceTargetLowering.cpp.gcc-5	2017-06-05 21:04:24.000000000 +0200
+++ chromium-59.0.3071.86/third_party/swiftshader/third_party/subzero/src/IceTargetLowering.cpp	2017-06-10 19:47:02.404476512 +0200
@@ -48,6 +48,7 @@
 //       createTargetHeaderLowering(Ice::GlobalContext *);
 //   void staticInit(::Ice::GlobalContext *);
 // }
+#undef SUBZERO_TARGET
 #define SUBZERO_TARGET(X)                                                      \
   namespace X {                                                                \
   std::unique_ptr<::Ice::TargetLowering>                                       \
--- chromium-59.0.3071.86/third_party/pdfium/xfa/fgas/layout/cfx_txtbreak.cpp.gcc-5	2017-06-05 21:04:22.000000000 +0200
+++ chromium-59.0.3071.86/third_party/pdfium/xfa/fgas/layout/cfx_txtbreak.cpp	2017-06-11 17:25:57.937258540 +0200
@@ -683,7 +683,6 @@
   float fX = rtText.left;
   float fY;
   float fCharWidth;
-  float fCharHeight;
   int32_t iHorScale = pTxtRun->iHorizontalScale;
   int32_t iVerScale = pTxtRun->iVerticalScale;
   bool bSkipSpace = pTxtRun->bSkipSpace;
@@ -856,10 +855,7 @@
           *pWSForms += wForm;
       }
 
-      int32_t iCharHeight = 1000;
-
       fCharWidth = fFontSize * iCharWidth / 1000.0f;
-      fCharHeight = fFontSize * iCharHeight / 1000.0f;
       if (bRTLPiece && chartype != FX_CHARTYPE_Combination)
         fX -= fCharWidth;
 
--- chromium-60.0.3112.40/third_party/angle/src/libANGLE/renderer/vulkan/RendererVk.cpp.gcc-5	2017-06-22 00:04:04.000000000 +0200
+++ chromium-60.0.3112.40/third_party/angle/src/libANGLE/renderer/vulkan/RendererVk.cpp	2017-06-25 19:06:28.341723649 +0200
@@ -578,11 +578,6 @@
 {
     ANGLE_TRY(commandBuffer->end());
 
-    VkFenceCreateInfo fenceInfo;
-    fenceInfo.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO;
-    fenceInfo.pNext = nullptr;
-    fenceInfo.flags = 0;
-
     VkSubmitInfo submitInfo;
     submitInfo.sType                = VK_STRUCTURE_TYPE_SUBMIT_INFO;
     submitInfo.pNext                = nullptr;
--- chromium-60.0.3112.40/third_party/angle/src/libANGLE/renderer/vulkan/SurfaceVk.cpp.gcc-5	2017-06-22 00:04:04.000000000 +0200
+++ chromium-60.0.3112.40/third_party/angle/src/libANGLE/renderer/vulkan/SurfaceVk.cpp	2017-06-25 19:08:03.664996888 +0200
@@ -221,9 +221,6 @@
     gl::Extents windowSize;
     ANGLE_TRY_RESULT(createSurfaceVk(renderer), windowSize);
 
-    uint32_t presentQueue = 0;
-    ANGLE_TRY_RESULT(renderer->selectPresentQueueForSurface(mSurface), presentQueue);
-
     const auto &physicalDevice = renderer->getPhysicalDevice();
 
     VkSurfaceCapabilitiesKHR surfaceCaps;