Index: libraries/source/spidermonkey/FixGCSegfault.diff
===================================================================
--- libraries/source/spidermonkey/FixGCSegfault.diff	(nonexistent)
+++ libraries/source/spidermonkey/FixGCSegfault.diff	(working copy)
@@ -0,0 +1,16 @@
+diff --git a/js/src/configure b/js/src/configure
+--- a/js/src/configure
++++ b/js/src/configure
+@@ -8776,11 +8776,11 @@ if test "$GNU_CC"; then
+     if test -z "$DEVELOPER_OPTIONS"; then
+         CFLAGS="$CFLAGS -ffunction-sections -fdata-sections"
+         CXXFLAGS="$CXXFLAGS -ffunction-sections -fdata-sections"
+     fi
+     CFLAGS="$CFLAGS -fno-math-errno"
+-    CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-math-errno"
++    CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-math-errno -fno-delete-null-pointer-checks"
+ fi
+ 
+ 
+ # Check whether --enable-icf or --disable-icf was given.
+ if test "${enable_icf+set}" = set; then
Index: libraries/source/spidermonkey/patch.sh
===================================================================
--- libraries/source/spidermonkey/patch.sh	(revision 18693)
+++ libraries/source/spidermonkey/patch.sh	(working copy)
@@ -14,15 +14,15 @@ patch -p1 < ../FixZLibMozBuild.diff
 # This patch is a squashed version of several patches that were adapted
 # to fix failing hunks.
 #
 # Applied in the following order, they are:
 # * https://bugzilla.mozilla.org/show_bug.cgi?id=1223767
-#    Assertion failure: i < size_, at js/src/vm/TraceLoggingTypes.h:210 
+#    Assertion failure: i < size_, at js/src/vm/TraceLoggingTypes.h:210
 #    Also fix stop-information to make reduce.py work correctly.
 # * https://bugzilla.mozilla.org/show_bug.cgi?id=1227914
 #    Limit the memory tracelogger can take.
-#    This causes tracelogger to flush data to the disk regularly and prevents out of 
+#    This causes tracelogger to flush data to the disk regularly and prevents out of
 #    memory issues if a lot of data gets logged.
 # * https://bugzilla.mozilla.org/show_bug.cgi?id=1155618
 #    Fix tracelogger destructor that touches possibly uninitialised hash table.
 # * https://bugzilla.mozilla.org/show_bug.cgi?id=1223636
 #    Don't treat extraTextId as containing only extra ids.
@@ -46,5 +46,8 @@ patch -p1 < ../FixZLibMozBuild.diff
 # * https://bugzilla.mozilla.org/show_bug.cgi?id=1259403
 #    Only increase capacity by multiples of 2.
 #    Always make sure there are 3 free slots for events.
 # ===
 patch -p1  < ../FixTracelogger.diff
+
+# Temporary fix for segfault occurring in the GC when built with GCC 6
+patch -p1 < ../FixGCSegfault.diff