diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-04-20 20:16:18 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-04-20 20:16:18 -0400 |
| commit | 94a484dd7e224ef6f4fc5994fa50478d41f72638 (patch) | |
| tree | 5d91fbb0d1ebeeb1cf0a9ab266effb29ce4c1764 /build | |
| parent | 754ad610489603f80ea38bbd2cf18b28f0d8bf1d (diff) | |
| parent | b3bf60f4264b9acfbd2cb34fed4a66915012803c (diff) | |
| download | UXP-94a484dd7e224ef6f4fc5994fa50478d41f72638.tar UXP-94a484dd7e224ef6f4fc5994fa50478d41f72638.tar.gz UXP-94a484dd7e224ef6f4fc5994fa50478d41f72638.tar.lz UXP-94a484dd7e224ef6f4fc5994fa50478d41f72638.tar.xz UXP-94a484dd7e224ef6f4fc5994fa50478d41f72638.zip | |
Merge branch 'master' into xulrunner
Diffstat (limited to 'build')
| -rw-r--r-- | build/autoconf/compiler-opts.m4 | 13 |
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 |