diff options
author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-10-28 23:10:06 (GMT) |
---|---|---|
committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-10-28 23:10:06 (GMT) |
commit | de8f2cea32f14099cf756cbef40d312ffd1894a8 (patch) | |
tree | af4f9ce5798909cfa1eadec07390425937e3886a /config/cc | |
parent | 06cb0b6ddbbb2f9275b3a71eda3f2ffeff929d90 (diff) | |
parent | 5b0242a30c12e4ce1366788126cea866b21abeba (diff) |
Merge.
Diffstat (limited to 'config/cc')
-rw-r--r-- | config/cc/gcc.in | 67 |
1 files changed, 16 insertions, 51 deletions
diff --git a/config/cc/gcc.in b/config/cc/gcc.in index d479272..e935a8b 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -19,6 +19,13 @@ choice # Don't remove next line # CT_INSERT_VERSION_BELOW +config CC_V_4_4_2 + bool + prompt "4.4.2 (EXPERIMENTAL)" + depends on EXPERIMENTAL + select CC_GCC_4_3_or_later + select CC_GCC_4_4_or_later + config CC_V_4_4_1 bool prompt "4.4.1 (EXPERIMENTAL)" @@ -65,7 +72,8 @@ config CC_V_4_2_4 config CC_V_4_2_3 bool - prompt "4.2.3" + prompt "4.2.3 (OBSOLETE)" + depends on OBSOLETE config CC_V_4_2_2 bool @@ -73,48 +81,22 @@ config CC_V_4_2_2 config CC_V_4_2_1 bool - prompt "4.2.1" + prompt "4.2.1 (OBSOLETE)" + depends on OBSOLETE config CC_V_4_2_0 bool - prompt "4.2.0" - -config CC_V_4_1_2 - bool - prompt "4.1.2" - -config CC_V_4_1_1 - bool - prompt "4.1.1 (OBSOLETE)" + prompt "4.2.0 (OBSOLETE)" depends on OBSOLETE -config CC_V_4_1_0 +config CC_V_4_1_2 bool - prompt "4.1.0 (OBSOLETE)" + prompt "4.1.2 (OBSOLETE)" depends on OBSOLETE config CC_V_4_0_4 bool - prompt "4.0.4" - -config CC_V_4_0_3 - bool - prompt "4.0.3 (OBSOLETE)" - depends on OBSOLETE - -config CC_V_4_0_2 - bool - prompt "4.0.2 (OBSOLETE)" - depends on OBSOLETE - -config CC_V_4_0_1 - bool - prompt "4.0.1 (OBSOLETE)" - depends on OBSOLETE - -config CC_V_4_0_0 - bool - prompt "4.0.0 (OBSOLETE)" + prompt "4.0.4 (OBSOLETE)" depends on OBSOLETE config CC_V_3_4_6 @@ -122,16 +104,6 @@ config CC_V_3_4_6 prompt "3.4.6 (OBSOLETE)" depends on OBSOLETE -config CC_V_3_3_6 - bool - prompt "3.3.6 (OBSOLETE)" - depends on OBSOLETE - -config CC_V_3_2_3 - bool - prompt "3.2.3 (OBSOLETE)" - depends on OBSOLETE - endchoice config CC_GCC_4_3_or_later @@ -148,6 +120,7 @@ config CC_VERSION string # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW + default "4.4.2" if CC_V_4_4_2 default "4.4.1" if CC_V_4_4_1 default "4.4.0" if CC_V_4_4_0 default "4.3.4" if CC_V_4_3_4 @@ -161,16 +134,8 @@ config CC_VERSION default "4.2.1" if CC_V_4_2_1 default "4.2.0" if CC_V_4_2_0 default "4.1.2" if CC_V_4_1_2 - default "4.1.1" if CC_V_4_1_1 - default "4.1.0" if CC_V_4_1_0 default "4.0.4" if CC_V_4_0_4 - default "4.0.3" if CC_V_4_0_3 - default "4.0.2" if CC_V_4_0_2 - default "4.0.1" if CC_V_4_0_1 - default "4.0.0" if CC_V_4_0_0 default "3.4.6" if CC_V_3_4_6 - default "3.3.6" if CC_V_3_3_6 - default "3.2.3" if CC_V_3_2_3 config CC_CXA_ATEXIT bool |