Be more forward-looking in the choice of compiler.

Rubber-stamped by Jon Honeycutt.

Source/JavaScriptCore:

* Configurations/CompilerVersion.xcconfig:

Source/JavaScriptGlue:

* Configurations/CompilerVersion.xcconfig:

Source/ThirdParty/ANGLE:

* Configurations/CompilerVersion.xcconfig:

Source/WebCore:

* Configurations/CompilerVersion.xcconfig:

Source/WebKit/mac:

* Configurations/CompilerVersion.xcconfig:

Source/WebKit2:

* Configurations/CompilerVersion.xcconfig:

Tools:

* DumpRenderTree/mac/Configurations/CompilerVersion.xcconfig:
* MiniBrowser/Configurations/CompilerVersion.xcconfig:
* TestWebKitAPI/Configurations/CompilerVersion.xcconfig:
* WebKitTestRunner/Configurations/CompilerVersion.xcconfig:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@93005 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 65343a0c115551362a6eda17d2dcd7800ae93973..03012b919aef4eef911cab0e14efc3952397e90c 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-12  Mark Rowe  <mrowe@apple.com>
+
+        Be more forward-looking in the choice of compiler.
+
+        Rubber-stamped by Jon Honeycutt.
+
+        * Configurations/CompilerVersion.xcconfig:
+
 2011-08-12  Kalev Lember  <kalevlember@gmail.com>
 
         [GTK] Fix non-pthreads build after r91906.

diff --git a/Source/JavaScriptCore/Configurations/CompilerVersion.xcconfig b/Source/JavaScriptCore/Configurations/CompilerVersion.xcconfig
index 664d2f3041a783fe2a308e03d5ec5857ab3e48aa..c7106ddc098ea0c3e688aa26e966600bbcf15e41 100644 (file)
--- a/Source/JavaScriptCore/Configurations/CompilerVersion.xcconfig
+++ b/Source/JavaScriptCore/Configurations/CompilerVersion.xcconfig
@@ -47,12 +47,13 @@ TARGET_GCC_VERSION_macosx_1060_Debug_0400_1 = GCC_42;
 TARGET_GCC_VERSION_macosx_1060_Release = GCC_42;
 TARGET_GCC_VERSION_macosx_1060_Production = GCC_42;
 
-TARGET_GCC_VERSION_macosx_1070 = $(TARGET_GCC_VERSION_macosx_1070_AND_LATER_$(CONFIGURATION));
-TARGET_GCC_VERSION_macosx_1080 = $(TARGET_GCC_VERSION_macosx_1070_AND_LATER_$(CONFIGURATION));
-TARGET_GCC_VERSION_macosx_1090 = $(TARGET_GCC_VERSION_macosx_1070_AND_LATER_$(CONFIGURATION));
-TARGET_GCC_VERSION_macosx_1070_AND_LATER_Debug = LLVM_COMPILER;
-TARGET_GCC_VERSION_macosx_1070_AND_LATER_Release = GCC_42;
-TARGET_GCC_VERSION_macosx_1070_AND_LATER_Production = GCC_42;
+TARGET_GCC_VERSION_macosx_1070 = $(TARGET_GCC_VERSION_macosx_1070_$(CONFIGURATION));
+TARGET_GCC_VERSION_macosx_1070_Debug = LLVM_COMPILER;
+TARGET_GCC_VERSION_macosx_1070_Release = GCC_42;
+TARGET_GCC_VERSION_macosx_1070_Production = GCC_42;
+
+TARGET_GCC_VERSION_macosx_1080 = LLVM_COMPILER;
+TARGET_GCC_VERSION_macosx_1090 = LLVM_COMPILER;
 
 GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
 GCC_VERSION_GCC_40 = 4.0;

diff --git a/Source/JavaScriptGlue/ChangeLog b/Source/JavaScriptGlue/ChangeLog
index 4c7db96db7b3907ee9eeaf12ccbaa287a7676085..e3a704afe53b7276d0fe1e1aa80909bee3637fbf 100644 (file)
--- a/Source/JavaScriptGlue/ChangeLog
+++ b/Source/JavaScriptGlue/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-12  Mark Rowe  <mrowe@apple.com>
+
+        Be more forward-looking in the choice of compiler.
+
+        Rubber-stamped by Jon Honeycutt.
+
+        * Configurations/CompilerVersion.xcconfig:
+
 2011-08-12  Sam Weinig  <sam@webkit.org>
 
         Move compiler specific macros to their own header

diff --git a/Source/JavaScriptGlue/Configurations/CompilerVersion.xcconfig b/Source/JavaScriptGlue/Configurations/CompilerVersion.xcconfig
index 8beb5b1da80a2180216c2d9919182b28c14c419e..c02a1e37e77aa48dff9b83b895512864206bdfd2 100644 (file)
--- a/Source/JavaScriptGlue/Configurations/CompilerVersion.xcconfig
+++ b/Source/JavaScriptGlue/Configurations/CompilerVersion.xcconfig
@@ -44,12 +44,13 @@ TARGET_GCC_VERSION_1060_Debug_0400_1 = GCC_42;
 TARGET_GCC_VERSION_1060_Release = GCC_42;
 TARGET_GCC_VERSION_1060_Production = GCC_42;
 
-TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
-TARGET_GCC_VERSION_1080 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
-TARGET_GCC_VERSION_1090 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
-TARGET_GCC_VERSION_1070_AND_LATER_Debug = LLVM_COMPILER;
-TARGET_GCC_VERSION_1070_AND_LATER_Release = LLVM_GCC_42;
-TARGET_GCC_VERSION_1070_AND_LATER_Production = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_$(CONFIGURATION));
+TARGET_GCC_VERSION_1070_Debug = LLVM_COMPILER;
+TARGET_GCC_VERSION_1070_Release = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070_Production = LLVM_GCC_42;
+
+TARGET_GCC_VERSION_1080 = LLVM_COMPILER;
+TARGET_GCC_VERSION_1090 = LLVM_COMPILER;
 
 GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
 GCC_VERSION_GCC_40 = 4.0;

diff --git a/Source/ThirdParty/ANGLE/ChangeLog b/Source/ThirdParty/ANGLE/ChangeLog
index a12cc68834029a98344cc3829b892370d2e10303..f5f4d5c697fc1de9ba8ae683398fd3cf10c558de 100644 (file)
--- a/Source/ThirdParty/ANGLE/ChangeLog
+++ b/Source/ThirdParty/ANGLE/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-12  Mark Rowe  <mrowe@apple.com>
+
+        Be more forward-looking in the choice of compiler.
+
+        Rubber-stamped by Jon Honeycutt.
+
+        * Configurations/CompilerVersion.xcconfig:
+
 2011-08-11  Renata Hodovan  <reni@webkit.org>
 
         [Qt]Fix warnings after r92805.

diff --git a/Source/ThirdParty/ANGLE/Configurations/CompilerVersion.xcconfig b/Source/ThirdParty/ANGLE/Configurations/CompilerVersion.xcconfig
index 8beb5b1da80a2180216c2d9919182b28c14c419e..c02a1e37e77aa48dff9b83b895512864206bdfd2 100644 (file)
--- a/Source/ThirdParty/ANGLE/Configurations/CompilerVersion.xcconfig
+++ b/Source/ThirdParty/ANGLE/Configurations/CompilerVersion.xcconfig
@@ -44,12 +44,13 @@ TARGET_GCC_VERSION_1060_Debug_0400_1 = GCC_42;
 TARGET_GCC_VERSION_1060_Release = GCC_42;
 TARGET_GCC_VERSION_1060_Production = GCC_42;
 
-TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
-TARGET_GCC_VERSION_1080 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
-TARGET_GCC_VERSION_1090 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
-TARGET_GCC_VERSION_1070_AND_LATER_Debug = LLVM_COMPILER;
-TARGET_GCC_VERSION_1070_AND_LATER_Release = LLVM_GCC_42;
-TARGET_GCC_VERSION_1070_AND_LATER_Production = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_$(CONFIGURATION));
+TARGET_GCC_VERSION_1070_Debug = LLVM_COMPILER;
+TARGET_GCC_VERSION_1070_Release = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070_Production = LLVM_GCC_42;
+
+TARGET_GCC_VERSION_1080 = LLVM_COMPILER;
+TARGET_GCC_VERSION_1090 = LLVM_COMPILER;
 
 GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
 GCC_VERSION_GCC_40 = 4.0;

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index c5397212393240169adbbcfd07b32391f3600259..5e73e431682a356a550afd8e0eac767d71c3531d 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-12  Mark Rowe  <mrowe@apple.com>
+
+        Be more forward-looking in the choice of compiler.
+
+        Rubber-stamped by Jon Honeycutt.
+
+        * Configurations/CompilerVersion.xcconfig:
+
 2011-08-12  Nat Duca  <nduca@chromium.org>
 
         [chromium] Fix comile warning on CCLayerTreeHost

diff --git a/Source/WebCore/Configurations/CompilerVersion.xcconfig b/Source/WebCore/Configurations/CompilerVersion.xcconfig
index 31ec9b63324e5db5bcdb1d7b232cf13645b8fe29..dfc71f7dcd08a69fea64adc14407fdec92ed9041 100644 (file)
--- a/Source/WebCore/Configurations/CompilerVersion.xcconfig
+++ b/Source/WebCore/Configurations/CompilerVersion.xcconfig
@@ -52,6 +52,9 @@ TARGET_GCC_VERSION_macosx_1070_Debug = LLVM_COMPILER;
 TARGET_GCC_VERSION_macosx_1070_Release = LLVM_GCC_42;
 TARGET_GCC_VERSION_macosx_1070_Production = LLVM_GCC_42;
 
+TARGET_GCC_VERSION_macosx_1080 = LLVM_COMPILER;
+TARGET_GCC_VERSION_macosx_1090 = LLVM_COMPILER;
+
 GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
 GCC_VERSION_GCC_40 = 4.0;
 GCC_VERSION_GCC_42 = 4.2;

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index 790ba40e6ac3231a5c436121552ade983d6d2e3c..8f2c2165164be2ea330b5753b1247307af827b6b 100644 (file)
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-12  Mark Rowe  <mrowe@apple.com>
+
+        Be more forward-looking in the choice of compiler.
+
+        Rubber-stamped by Jon Honeycutt.
+
+        * Configurations/CompilerVersion.xcconfig:
+
 2011-08-10  David Hyatt  <hyatt@apple.com>
 
         https://bugs.webkit.org/show_bug.cgi?id=66004

diff --git a/Source/WebKit/mac/Configurations/CompilerVersion.xcconfig b/Source/WebKit/mac/Configurations/CompilerVersion.xcconfig
index 31ec9b63324e5db5bcdb1d7b232cf13645b8fe29..dfc71f7dcd08a69fea64adc14407fdec92ed9041 100644 (file)
--- a/Source/WebKit/mac/Configurations/CompilerVersion.xcconfig
+++ b/Source/WebKit/mac/Configurations/CompilerVersion.xcconfig
@@ -52,6 +52,9 @@ TARGET_GCC_VERSION_macosx_1070_Debug = LLVM_COMPILER;
 TARGET_GCC_VERSION_macosx_1070_Release = LLVM_GCC_42;
 TARGET_GCC_VERSION_macosx_1070_Production = LLVM_GCC_42;
 
+TARGET_GCC_VERSION_macosx_1080 = LLVM_COMPILER;
+TARGET_GCC_VERSION_macosx_1090 = LLVM_COMPILER;
+
 GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
 GCC_VERSION_GCC_40 = 4.0;
 GCC_VERSION_GCC_42 = 4.2;

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 3154735c60b76683aec5d72d1ea534a4d8d6446e..4ac6b40495df67a1ef880127f64e90a5ce597cb5 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-12  Mark Rowe  <mrowe@apple.com>
+
+        Be more forward-looking in the choice of compiler.
+
+        Rubber-stamped by Jon Honeycutt.
+
+        * Configurations/CompilerVersion.xcconfig:
+
 2011-08-11  Viatcheslav Ostapenko  <ostapenko.viatcheslav@nokia.com>
 
         VectorArgumentCoder doesn't encode/decode enough data for more than one byte vector elements

diff --git a/Source/WebKit2/Configurations/CompilerVersion.xcconfig b/Source/WebKit2/Configurations/CompilerVersion.xcconfig
index 8beb5b1da80a2180216c2d9919182b28c14c419e..c02a1e37e77aa48dff9b83b895512864206bdfd2 100644 (file)
--- a/Source/WebKit2/Configurations/CompilerVersion.xcconfig
+++ b/Source/WebKit2/Configurations/CompilerVersion.xcconfig
@@ -44,12 +44,13 @@ TARGET_GCC_VERSION_1060_Debug_0400_1 = GCC_42;
 TARGET_GCC_VERSION_1060_Release = GCC_42;
 TARGET_GCC_VERSION_1060_Production = GCC_42;
 
-TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
-TARGET_GCC_VERSION_1080 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
-TARGET_GCC_VERSION_1090 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
-TARGET_GCC_VERSION_1070_AND_LATER_Debug = LLVM_COMPILER;
-TARGET_GCC_VERSION_1070_AND_LATER_Release = LLVM_GCC_42;
-TARGET_GCC_VERSION_1070_AND_LATER_Production = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_$(CONFIGURATION));
+TARGET_GCC_VERSION_1070_Debug = LLVM_COMPILER;
+TARGET_GCC_VERSION_1070_Release = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070_Production = LLVM_GCC_42;
+
+TARGET_GCC_VERSION_1080 = LLVM_COMPILER;
+TARGET_GCC_VERSION_1090 = LLVM_COMPILER;
 
 GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
 GCC_VERSION_GCC_40 = 4.0;

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index da6364b06b626efe9af188e9cc68cbf08f07b239..f838aa17f0fc5e480495388947a749dad77ec8ab 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2011-08-12  Mark Rowe  <mrowe@apple.com>
+
+        Be more forward-looking in the choice of compiler.
+
+        Rubber-stamped by Jon Honeycutt.
+
+        * DumpRenderTree/mac/Configurations/CompilerVersion.xcconfig:
+        * MiniBrowser/Configurations/CompilerVersion.xcconfig:
+        * TestWebKitAPI/Configurations/CompilerVersion.xcconfig:
+        * WebKitTestRunner/Configurations/CompilerVersion.xcconfig:
+
 2011-08-12  Sadrul Habib Chowdhury  <sadrul@chromium.org>
 
         DRT: Add support for gesture events.

diff --git a/Tools/DumpRenderTree/mac/Configurations/CompilerVersion.xcconfig b/Tools/DumpRenderTree/mac/Configurations/CompilerVersion.xcconfig
index 5146bb6cf13dcb208f7d452740b7273b64866640..de134b98786d92d836a07fab971b0045681ccae2 100644 (file)
--- a/Tools/DumpRenderTree/mac/Configurations/CompilerVersion.xcconfig
+++ b/Tools/DumpRenderTree/mac/Configurations/CompilerVersion.xcconfig
@@ -45,12 +45,13 @@ TARGET_GCC_VERSION_1060_Debug_0400_1 = GCC_42;
 TARGET_GCC_VERSION_1060_Release = GCC_42;
 TARGET_GCC_VERSION_1060_Production = GCC_42;
 
-TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
-TARGET_GCC_VERSION_1080 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
-TARGET_GCC_VERSION_1090 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
-TARGET_GCC_VERSION_1070_AND_LATER_Debug = LLVM_COMPILER;
-TARGET_GCC_VERSION_1070_AND_LATER_Release = LLVM_GCC_42;
-TARGET_GCC_VERSION_1070_AND_LATER_Production = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_$(CONFIGURATION));
+TARGET_GCC_VERSION_1070_Debug = LLVM_COMPILER;
+TARGET_GCC_VERSION_1070_Release = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070_Production = LLVM_GCC_42;
+
+TARGET_GCC_VERSION_1080 = LLVM_COMPILER;
+TARGET_GCC_VERSION_1090 = LLVM_COMPILER;
 
 GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
 GCC_VERSION_GCC_40 = 4.0;

diff --git a/Tools/MiniBrowser/Configurations/CompilerVersion.xcconfig b/Tools/MiniBrowser/Configurations/CompilerVersion.xcconfig
index 8beb5b1da80a2180216c2d9919182b28c14c419e..c02a1e37e77aa48dff9b83b895512864206bdfd2 100644 (file)
--- a/Tools/MiniBrowser/Configurations/CompilerVersion.xcconfig
+++ b/Tools/MiniBrowser/Configurations/CompilerVersion.xcconfig
@@ -44,12 +44,13 @@ TARGET_GCC_VERSION_1060_Debug_0400_1 = GCC_42;
 TARGET_GCC_VERSION_1060_Release = GCC_42;
 TARGET_GCC_VERSION_1060_Production = GCC_42;
 
-TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
-TARGET_GCC_VERSION_1080 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
-TARGET_GCC_VERSION_1090 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
-TARGET_GCC_VERSION_1070_AND_LATER_Debug = LLVM_COMPILER;
-TARGET_GCC_VERSION_1070_AND_LATER_Release = LLVM_GCC_42;
-TARGET_GCC_VERSION_1070_AND_LATER_Production = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_$(CONFIGURATION));
+TARGET_GCC_VERSION_1070_Debug = LLVM_COMPILER;
+TARGET_GCC_VERSION_1070_Release = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070_Production = LLVM_GCC_42;
+
+TARGET_GCC_VERSION_1080 = LLVM_COMPILER;
+TARGET_GCC_VERSION_1090 = LLVM_COMPILER;
 
 GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
 GCC_VERSION_GCC_40 = 4.0;

diff --git a/Tools/TestWebKitAPI/Configurations/CompilerVersion.xcconfig b/Tools/TestWebKitAPI/Configurations/CompilerVersion.xcconfig
index 5146bb6cf13dcb208f7d452740b7273b64866640..de134b98786d92d836a07fab971b0045681ccae2 100644 (file)
--- a/Tools/TestWebKitAPI/Configurations/CompilerVersion.xcconfig
+++ b/Tools/TestWebKitAPI/Configurations/CompilerVersion.xcconfig
@@ -45,12 +45,13 @@ TARGET_GCC_VERSION_1060_Debug_0400_1 = GCC_42;
 TARGET_GCC_VERSION_1060_Release = GCC_42;
 TARGET_GCC_VERSION_1060_Production = GCC_42;
 
-TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
-TARGET_GCC_VERSION_1080 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
-TARGET_GCC_VERSION_1090 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
-TARGET_GCC_VERSION_1070_AND_LATER_Debug = LLVM_COMPILER;
-TARGET_GCC_VERSION_1070_AND_LATER_Release = LLVM_GCC_42;
-TARGET_GCC_VERSION_1070_AND_LATER_Production = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_$(CONFIGURATION));
+TARGET_GCC_VERSION_1070_Debug = LLVM_COMPILER;
+TARGET_GCC_VERSION_1070_Release = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070_Production = LLVM_GCC_42;
+
+TARGET_GCC_VERSION_1080 = LLVM_COMPILER;
+TARGET_GCC_VERSION_1090 = LLVM_COMPILER;
 
 GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
 GCC_VERSION_GCC_40 = 4.0;

diff --git a/Tools/WebKitTestRunner/Configurations/CompilerVersion.xcconfig b/Tools/WebKitTestRunner/Configurations/CompilerVersion.xcconfig
index 8beb5b1da80a2180216c2d9919182b28c14c419e..c02a1e37e77aa48dff9b83b895512864206bdfd2 100644 (file)
--- a/Tools/WebKitTestRunner/Configurations/CompilerVersion.xcconfig
+++ b/Tools/WebKitTestRunner/Configurations/CompilerVersion.xcconfig
@@ -44,12 +44,13 @@ TARGET_GCC_VERSION_1060_Debug_0400_1 = GCC_42;
 TARGET_GCC_VERSION_1060_Release = GCC_42;
 TARGET_GCC_VERSION_1060_Production = GCC_42;
 
-TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
-TARGET_GCC_VERSION_1080 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
-TARGET_GCC_VERSION_1090 = $(TARGET_GCC_VERSION_1070_AND_LATER_$(CONFIGURATION));
-TARGET_GCC_VERSION_1070_AND_LATER_Debug = LLVM_COMPILER;
-TARGET_GCC_VERSION_1070_AND_LATER_Release = LLVM_GCC_42;
-TARGET_GCC_VERSION_1070_AND_LATER_Production = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_$(CONFIGURATION));
+TARGET_GCC_VERSION_1070_Debug = LLVM_COMPILER;
+TARGET_GCC_VERSION_1070_Release = LLVM_GCC_42;
+TARGET_GCC_VERSION_1070_Production = LLVM_GCC_42;
+
+TARGET_GCC_VERSION_1080 = LLVM_COMPILER;
+TARGET_GCC_VERSION_1090 = LLVM_COMPILER;
 
 GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
 GCC_VERSION_GCC_40 = 4.0;