diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
| commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
| tree | 4140720b20e8d641c11da882010d6130a75fef21 /toolchain/gcc/Config.version | |
| parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
| parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) | |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'toolchain/gcc/Config.version')
| -rw-r--r-- | toolchain/gcc/Config.version | 44 |
1 files changed, 15 insertions, 29 deletions
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version index a47343039..167da7616 100644 --- a/toolchain/gcc/Config.version +++ b/toolchain/gcc/Config.version @@ -1,52 +1,38 @@ -config GCC_DEFAULT_VERSION +config GCC_VERSION_4_4_7 + default y if (!TOOLCHAINOPTS && avr32) bool -config GCC_DEFAULT_VERSION_4_4_7 - select GCC_DEFAULT_VERSION - default y if avr32 +config GCC_VERSION_4_6_3 bool -config GCC_DEFAULT_VERSION_4_6_LINARO - default y if !(GCC_DEFAULT_VERSION) +config GCC_VERSION_4_6_LINARO + default y if (!TOOLCHAINOPTS && !avr32) bool +config GCC_VERSION_4_8_LINARO + bool + +config GCC_VERSION_4_8_0 + bool config GCC_VERSION string default "4.4.7" if GCC_VERSION_4_4_7 - default "4.6.2" if GCC_VERSION_4_6_2 default "4.6.3" if GCC_VERSION_4_6_3 - default "4.7.2" if GCC_VERSION_4_7_2 - default "4.5-linaro" if GCC_VERSION_4_5_LINARO + default "4.8.0" if GCC_VERSION_4_8_0 default "4.6-linaro" if GCC_VERSION_4_6_LINARO - default "4.7-linaro" if GCC_VERSION_4_7_LINARO - default "llvm" if GCC_VERSION_LLVM + default "4.8-linaro" if GCC_VERSION_4_8_LINARO default "4.6-linaro" config GCC_VERSION_4_4 bool default y if GCC_VERSION_4_4_7 -config GCC_VERSION_4_5 - bool - default y if GCC_VERSION_4_5_LINARO - config GCC_VERSION_4_6 bool - default y if (GCC_VERSION_4_6_2 || GCC_VERSION_4_6_3 || GCC_VERSION_4_6_LINARO) + default y if (GCC_VERSION_4_6_3 || GCC_VERSION_4_6_LINARO) -config GCC_VERSION_4_7 +config GCC_VERSION_4_8 bool - default y if (GCC_VERSION_4_7_2 || GCC_VERSION_4_7_LINARO) - -if !TOOLCHAINOPTS - - config GCC_VERSION_4_4_7 - default y if GCC_DEFAULT_VERSION_4_4_7 - bool - - config GCC_VERSION_4_6_LINARO - default y if GCC_DEFAULT_VERSION_4_6_LINARO - bool + default y if (GCC_VERSION_4_8_0 || GCC_VERSION_4_8_LINARO) -endif |