Merge branch 'master' of https://github.com/MoonchildProductions/UXP into pm_url_1

1 files changed, 5 insertions, 8 deletions

diff --git a/build/autoconf/compiler-opts.m4 b/build/autoconf/compiler-opts.m4
index 57a974435..c47d792f4 100644
--- a/build/autoconf/compiler-opts.m4
+++ b/build/autoconf/compiler-opts.m4
@@ -181,18 +181,15 @@ if test "$GNU_CC"; then
 
     if test -z "$CLANG_CC"; then
         case "$CC_VERSION" in
-        4.*)
+        4.* | 5.*)
             ;;
         *)
             # Lifetime Dead Store Elimination level 2 (default in GCC6+) breaks Gecko.
-            # Ideally, we'd use -flifetime-dse=1, but that means we'd forcefully
-            # enable it on optimization levels where it would otherwise not be enabled.
-            # So we disable it entirely. But since that would mean inconsistency with
-            # GCC5, which has level 1 depending on optimization level, disable it on
-            # GCC5 as well, because better safe than sorry.
+            # Instead of completely disabling this optimization on newer GCC's,
+            # we'll force them to use level 1 optimization with -flifetime-dse=1.
             # Add it first so that a mozconfig can override by setting CFLAGS/CXXFLAGS.
-            CFLAGS="-fno-lifetime-dse $CFLAGS"
-            CXXFLAGS="-fno-lifetime-dse $CXXFLAGS"
+            CFLAGS="-flifetime-dse=1 $CFLAGS"
+            CXXFLAGS="-flifetime-dse=1 $CXXFLAGS"
             ;;
         esac
     fi