commit 26f47aba2d973bc1cc459a63df7bd0eec799f4ff
author Andrew Hsieh <andrewhsieh@google.com> Fri Dec 21 15:43:55 2012 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 21 15:43:56 2012 -0800
tree 1d860300a1412d5e94fc82199adb18924c258a9e
parent 9eedd3abed1d38ac5639a1f47ee80a7dbd0fb207
parent 098a5968fabfa3b5f07f1041a97432a66ecb485a

Merge "Switch to GCC 4.7 for X86 and MIPS"

core/combo/TARGET_linux-mips.mk

diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk
index c549af9..6a29564 100644
--- a/core/combo/TARGET_linux-mips.mk
+++ b/core/combo/TARGET_linux-mips.mk
@@ -35,7 +35,7 @@
 endif
 
 ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)
-TARGET_GCC_VERSION := 4.6
+TARGET_GCC_VERSION := 4.7
 else
 TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
 endif

core/combo/TARGET_linux-x86.mk

diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 01b5d02..9424f81 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -23,7 +23,7 @@
 endif
 
 ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)
-TARGET_GCC_VERSION := 4.6
+TARGET_GCC_VERSION := 4.7
 else
 TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
 endif