diff --git a/gfx/angle/checkout/out/gen/angle/id/commit.h b/gfx/angle/checkout/out/gen/angle/id/commit.h
index fc207c02e689..82fbea2e5f67 100644
--- a/gfx/angle/checkout/out/gen/angle/id/commit.h
+++ b/gfx/angle/checkout/out/gen/angle/id/commit.h
@@ -1,3 +1,3 @@
-#define ANGLE_COMMIT_HASH "fc96a1a98357"
+#define ANGLE_COMMIT_HASH "ae3b5a6552ee"
 #define ANGLE_COMMIT_HASH_SIZE 12
-#define ANGLE_COMMIT_DATE "2018-06-29 19:06:56 -0700"
+#define ANGLE_COMMIT_DATE "2018-07-24 15:21:15 -0700"
diff --git a/gfx/angle/checkout/src/common/third_party/smhasher/src/PMurHash.cpp b/gfx/angle/checkout/src/common/third_party/smhasher/src/PMurHash.cpp
index 071bc31539c7..93b48713cd08 100644
--- a/gfx/angle/checkout/src/common/third_party/smhasher/src/PMurHash.cpp
+++ b/gfx/angle/checkout/src/common/third_party/smhasher/src/PMurHash.cpp
@@ -49,6 +49,7 @@ on big endian machines, or a byte-by-byte read if the endianess is unknown.
 
 
 #include "PMurHash.h"
+#include <stdint.h>
 
 /* I used ugly type names in the header to avoid potential conflicts with
  * application or system typedefs & defines. Since I'm not including any more
@@ -208,7 +209,7 @@ void PMurHash32_Process(uint32_t *ph1, uint32_t *pcarry, const void *key, int le
   /* This CPU does not handle unaligned word access */
 
   /* Consume enough so that the next data byte is word aligned */
-  int i = -(long)ptr & 3;
+  int i = -(intptr_t)ptr & 3;
   if(i && i <= len) {
       DOBYTES(i, h1, c, n, ptr, len);
   }
diff --git a/gfx/angle/cherry_picks.txt b/gfx/angle/cherry_picks.txt
index 5fafbeeb349b..515d3fffa5c5 100644
--- a/gfx/angle/cherry_picks.txt
+++ b/gfx/angle/cherry_picks.txt
@@ -1,3 +1,17 @@
+commit ae3b5a6552ee26164b9a95ebb6f8e51db9494815
+Author: Jacek Caban <cjacek@gmail.com>
+Date:   Wed Jun 27 17:35:19 2018 +0200
+
+    Fix PMurHash.cpp mingw clang 64-bit compilation.
+    
+    Tested with Firefox build, upstream bug:
+    https://bugzilla.mozilla.org/show_bug.cgi?id=1471632
+    
+    Change-Id: I4b44847dfc69ee26cf2215b0a0b7573becfd369d
+    Reviewed-on: https://chromium-review.googlesource.com/1117187
+    Commit-Queue: Jamie Madill <jmadill@chromium.org>
+    Reviewed-by: Jamie Madill <jmadill@chromium.org>
+
 commit fc96a1a98357cfa17510bcf701e99a59ab474ce0
 Author: Jeff Gilbert <jgilbert@mozilla.com>
 Date:   Fri Jun 29 19:06:56 2018 -0700