From 4a203db537e1a41cb49196c75f15a75eab113b29 Mon Sep 17 00:00:00 2001
From: Trevor Saunders <trev.saunders@gmail.com>
Date: Thu, 8 Jan 2015 20:21:37 -0500
Subject: [PATCH] Bug 1077549 - Only support gcc 4.6+. r=glandium

---
 b2g/confvars.sh             | 4 ----
 build/autoconf/toolchain.m4 | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/b2g/confvars.sh b/b2g/confvars.sh
index e2a48db7567..4df11d6cb54 100644
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -59,12 +59,8 @@ MOZ_B2G=1
 if test "$OS_TARGET" = "Android"; then
 MOZ_NUWA_PROCESS=1
 MOZ_B2G_LOADER=1
-# Warnings-as-errors cannot be enabled on gcc <= 4.4 due to bug 915555.
-if test "$GCC_MAJOR_VERSION" -gt 4 -o \
-   "$GCC_MAJOR_VERSION" -eq 4 -a "$GCC_MINOR_VERSION" -gt 4; then
 MOZ_ENABLE_WARNINGS_AS_ERRORS=1
 fi
-fi
 
 MOZ_JSDOWNLOADS=1
 
diff --git a/build/autoconf/toolchain.m4 b/build/autoconf/toolchain.m4
index c211b886ed7..f6ffa109b4e 100644
--- a/build/autoconf/toolchain.m4
+++ b/build/autoconf/toolchain.m4
@@ -101,9 +101,9 @@ AC_SUBST(CLANG_CXX)
 AC_SUBST(CLANG_CL)
 
 if test -n "$GNU_CC" -a -z "$CLANG_CC" ; then
-    if test "$GCC_MAJOR_VERSION" -eq 4 -a "$GCC_MINOR_VERSION" -lt 4 ||
+    if test "$GCC_MAJOR_VERSION" -eq 4 -a "$GCC_MINOR_VERSION" -lt 6 ||
        test "$GCC_MAJOR_VERSION" -lt 4; then
-        AC_MSG_ERROR([Only GCC 4.4 or newer supported])
+        AC_MSG_ERROR([Only GCC 4.6 or newer supported])
     fi
 fi
 ])