From ad6b6626e202b51f7256d7854bba54fa580fab17 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 30 Apr 2012 16:31:09 +0100
Subject: [PATCH] Further developed support for gcc-4.7.0

---
 etc/config/settings.csh         | 7 +++++++
 wmake/rules/linux64Gcc47/c++Opt | 4 +---
 wmake/rules/linux64Gcc47/cOpt   | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/etc/config/settings.csh b/etc/config/settings.csh
index 94e5618bff..8c9ac17c7a 100644
--- a/etc/config/settings.csh
+++ b/etc/config/settings.csh
@@ -213,6 +213,13 @@ case ThirdParty:
         set mpfr_version=mpfr-3.1.0
         set mpc_version=mpc-0.9
         breaksw
+    case Gcc47:
+    case Gcc47++0x:
+        set gcc_version=gcc-4.7.0
+        set gmp_version=gmp-5.0.4
+        set mpfr_version=mpfr-3.1.0
+        set mpc_version=mpc-0.9
+        breaksw
     case Gcc45:
     case Gcc45++0x:
         set gcc_version=gcc-4.5.2
diff --git a/wmake/rules/linux64Gcc47/c++Opt b/wmake/rules/linux64Gcc47/c++Opt
index 3446f7f58c..1c64f5b4b7 100644
--- a/wmake/rules/linux64Gcc47/c++Opt
+++ b/wmake/rules/linux64Gcc47/c++Opt
@@ -1,4 +1,2 @@
 c++DBUG     =
-c++OPT      = -O3
-#c++OPT      = -march=nocona -O3
-# -ftree-vectorize -ftree-vectorizer-verbose=3
+c++OPT      = -O2
diff --git a/wmake/rules/linux64Gcc47/cOpt b/wmake/rules/linux64Gcc47/cOpt
index 17318709f1..6650ffa4a5 100644
--- a/wmake/rules/linux64Gcc47/cOpt
+++ b/wmake/rules/linux64Gcc47/cOpt
@@ -1,2 +1,2 @@
 cDBUG       =
-cOPT        = -O3
+cOPT        = -O2