Index: head/www/iridium/files/patch-mojo_edk_system_options__validation__unittest.cc
===================================================================
--- head/www/iridium/files/patch-mojo_edk_system_options__validation__unittest.cc	(nonexistent)
+++ head/www/iridium/files/patch-mojo_edk_system_options__validation__unittest.cc	(revision 494708)
@@ -0,0 +1,11 @@
+--- mojo/edk/system/options_validation_unittest.cc.orig	2018-05-09 19:05:53 UTC
++++ mojo/edk/system/options_validation_unittest.cc
+@@ -18,7 +18,7 @@ namespace {
+ 
+ using TestOptionsFlags = uint32_t;
+ 
+-static_assert(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
++static_assert(MOJO_ALIGNOF(int64_t) <= 8, "int64_t has weird alignment");
+ struct MOJO_ALIGNAS(8) TestOptions {
+   uint32_t struct_size;
+   TestOptionsFlags flags;

Property changes on: head/www/iridium/files/patch-mojo_edk_system_options__validation__unittest.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/www/iridium/files/patch-mojo_public_c_system_buffer.h
===================================================================
--- head/www/iridium/files/patch-mojo_public_c_system_buffer.h	(nonexistent)
+++ head/www/iridium/files/patch-mojo_public_c_system_buffer.h	(revision 494708)
@@ -0,0 +1,11 @@
+--- mojo/public/c/system/buffer.h.orig	2018-05-09 19:05:53 UTC
++++ mojo/public/c/system/buffer.h
+@@ -35,7 +35,7 @@ const MojoCreateSharedBufferOptionsFlags
+   ((MojoCreateSharedBufferOptionsFlags)0)
+ #endif
+ 
+-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
++MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) <= 8, "int64_t has weird alignment");
+ struct MOJO_ALIGNAS(8) MojoCreateSharedBufferOptions {
+   uint32_t struct_size;
+   MojoCreateSharedBufferOptionsFlags flags;

Property changes on: head/www/iridium/files/patch-mojo_public_c_system_buffer.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/www/iridium/files/patch-mojo_public_c_system_data__pipe.h
===================================================================
--- head/www/iridium/files/patch-mojo_public_c_system_data__pipe.h	(nonexistent)
+++ head/www/iridium/files/patch-mojo_public_c_system_data__pipe.h	(revision 494708)
@@ -0,0 +1,11 @@
+--- mojo/public/c/system/data_pipe.h.orig	2018-05-09 19:05:53 UTC
++++ mojo/public/c/system/data_pipe.h
+@@ -46,7 +46,7 @@ const MojoCreateDataPipeOptionsFlags MOJO_CREATE_DATA_
+   ((MojoCreateDataPipeOptionsFlags)0)
+ #endif
+ 
+-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
++MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) <= 8, "int64_t has weird alignment");
+ struct MOJO_ALIGNAS(8) MojoCreateDataPipeOptions {
+   MOJO_ALIGNAS(4) uint32_t struct_size;
+   MOJO_ALIGNAS(4) MojoCreateDataPipeOptionsFlags flags;

Property changes on: head/www/iridium/files/patch-mojo_public_c_system_data__pipe.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/www/iridium/files/patch-mojo_public_c_system_message__pipe.h
===================================================================
--- head/www/iridium/files/patch-mojo_public_c_system_message__pipe.h	(nonexistent)
+++ head/www/iridium/files/patch-mojo_public_c_system_message__pipe.h	(revision 494708)
@@ -0,0 +1,11 @@
+--- mojo/public/c/system/message_pipe.h.orig	2018-05-09 19:05:53 UTC
++++ mojo/public/c/system/message_pipe.h
+@@ -44,7 +44,7 @@ const MojoCreateMessagePipeOptionsFlags
+   ((MojoCreateMessagePipeOptionsFlags)0)
+ #endif
+ 
+-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
++MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) <= 8, "int64_t has weird alignment");
+ struct MOJO_ALIGNAS(8) MojoCreateMessagePipeOptions {
+   uint32_t struct_size;
+   MojoCreateMessagePipeOptionsFlags flags;

Property changes on: head/www/iridium/files/patch-mojo_public_c_system_message__pipe.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/www/iridium/files/patch-mojo_public_c_system_tests_macros__unittest.cc
===================================================================
--- head/www/iridium/files/patch-mojo_public_c_system_tests_macros__unittest.cc	(nonexistent)
+++ head/www/iridium/files/patch-mojo_public_c_system_tests_macros__unittest.cc	(revision 494708)
@@ -0,0 +1,16 @@
+--- mojo/public/c/system/tests/macros_unittest.cc.orig	2018-05-09 19:05:53 UTC
++++ mojo/public/c/system/tests/macros_unittest.cc
+@@ -34,8 +34,11 @@ TEST(MacrosTest, Alignof) {
+   // all the platforms we currently support.
+   EXPECT_EQ(1u, MOJO_ALIGNOF(char));
+   EXPECT_EQ(4u, MOJO_ALIGNOF(int32_t));
+-  EXPECT_EQ(8u, MOJO_ALIGNOF(int64_t));
+-  EXPECT_EQ(8u, MOJO_ALIGNOF(double));
++
++  // 'double' and 'int64_t' are usually 8 byte aligned, except some 32-bit x86
++  // platforms, or when -malign-double is passed.
++  EXPECT_TRUE(8u == MOJO_ALIGNOF(int64_t) || 4u == MOJO_ALIGNOF(int64_t));
++  EXPECT_TRUE(8u == MOJO_ALIGNOF(double) || 4u == MOJO_ALIGNOF(double));
+ }
+ 
+ // These structs are used in the Alignas test. Define them globally to avoid

Property changes on: head/www/iridium/files/patch-mojo_public_c_system_tests_macros__unittest.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_edk_system_options__validation__unittest.cc
===================================================================
--- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_edk_system_options__validation__unittest.cc	(nonexistent)
+++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_edk_system_options__validation__unittest.cc	(revision 494708)
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/mojo/edk/system/options_validation_unittest.cc.orig	2018-04-10 14:05:55 UTC
++++ src/3rdparty/chromium/mojo/edk/system/options_validation_unittest.cc
+@@ -18,7 +18,7 @@ namespace {
+ 
+ using TestOptionsFlags = uint32_t;
+ 
+-static_assert(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
++static_assert(MOJO_ALIGNOF(int64_t) <= 8, "int64_t has weird alignment");
+ struct MOJO_ALIGNAS(8) TestOptions {
+   uint32_t struct_size;
+   TestOptionsFlags flags;

Property changes on: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_edk_system_options__validation__unittest.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_buffer.h
===================================================================
--- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_buffer.h	(nonexistent)
+++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_buffer.h	(revision 494708)
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/mojo/public/c/system/buffer.h.orig	2018-04-10 14:05:55 UTC
++++ src/3rdparty/chromium/mojo/public/c/system/buffer.h
+@@ -40,7 +40,7 @@ const MojoCreateSharedBufferOptionsFlags
+   ((MojoCreateSharedBufferOptionsFlags)0)
+ #endif
+ 
+-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
++MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) <= 8, "int64_t has weird alignment");
+ struct MOJO_ALIGNAS(8) MojoCreateSharedBufferOptions {
+   uint32_t struct_size;
+   MojoCreateSharedBufferOptionsFlags flags;

Property changes on: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_buffer.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_data__pipe.h
===================================================================
--- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_data__pipe.h	(nonexistent)
+++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_data__pipe.h	(revision 494708)
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/mojo/public/c/system/data_pipe.h.orig	2018-04-10 14:05:55 UTC
++++ src/3rdparty/chromium/mojo/public/c/system/data_pipe.h
+@@ -41,7 +41,7 @@ const MojoCreateDataPipeOptionsFlags MOJO_CREATE_DATA_
+   ((MojoCreateDataPipeOptionsFlags)0)
+ #endif
+ 
+-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
++MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) <= 8, "int64_t has weird alignment");
+ struct MOJO_ALIGNAS(8) MojoCreateDataPipeOptions {
+   MOJO_ALIGNAS(4) uint32_t struct_size;
+   MOJO_ALIGNAS(4) MojoCreateDataPipeOptionsFlags flags;

Property changes on: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_data__pipe.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_message__pipe.h
===================================================================
--- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_message__pipe.h	(nonexistent)
+++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_message__pipe.h	(revision 494708)
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/mojo/public/c/system/message_pipe.h.orig	2018-04-10 14:05:55 UTC
++++ src/3rdparty/chromium/mojo/public/c/system/message_pipe.h
+@@ -46,7 +46,7 @@ const MojoCreateMessagePipeOptionsFlags
+   ((MojoCreateMessagePipeOptionsFlags)0)
+ #endif
+ 
+-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
++MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) <= 8, "int64_t has weird alignment");
+ struct MOJO_ALIGNAS(8) MojoCreateMessagePipeOptions {
+   uint32_t struct_size;
+   MojoCreateMessagePipeOptionsFlags flags;

Property changes on: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_message__pipe.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property