[gentoo-commits] proj/mozilla:master commit in: eclass/

[Jory Pratt]

commit:     96e3a035a6d0c39b3816a750eb2282fd60dff3e4
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Wed May 31 20:19:07 2017 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Wed May 31 20:19:07 2017 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=96e3a035

eclass/mozcoreconf-v5: Work around broken optimization level of -Os

 eclass/mozcoreconf-v5.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/mozcoreconf-v5.eclass b/eclass/mozcoreconf-v5.eclass
index 4ecfbd8..854b3cb 100644
--- a/eclass/mozcoreconf-v5.eclass
+++ b/eclass/mozcoreconf-v5.eclass
@@ -158,8 +158,8 @@ mozconfig_init() {
        # Set optimization level
        if [[ ${ARCH} == hppa ]]; then
                mozconfig_annotate "more than -O0 causes a segfault on hppa" 
--enable-optimize=-O0
-       elif [[ ${ARCH} == x86 ]]; then
-               mozconfig_annotate "less then -O2 causes a segfault on x86" 
--enable-optimize=-O2
+       elif [[ ${ARCH} =~ (x86|amd64) ]]; then
+               mozconfig_annotate "Work around broken gcc optimization level" 
--enable-optimize=-O2
        elif use custom-optimization || [[ ${ARCH} =~ (alpha|ia64) ]]; then
                # Set optimization level based on CFLAGS
                if is-flag -O0; then