diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/cc/gcc.in | 15 | ||||
| -rw-r--r-- | config/companion_libs.in | 65 | ||||
| -rw-r--r-- | config/companion_libs/cloog.in | 19 | ||||
| -rw-r--r-- | config/companion_libs/gmp.in | 18 | ||||
| -rw-r--r-- | config/companion_libs/mpc.in | 19 | ||||
| -rw-r--r-- | config/companion_libs/mpfr.in | 8 | ||||
| -rw-r--r-- | config/companion_libs/ppl.in | 14 | ||||
| -rw-r--r-- | config/debug/duma.in | 5 | ||||
| -rw-r--r-- | config/debug/gdb.in | 8 | ||||
| -rw-r--r-- | config/debug/ltrace.in | 5 | ||||
| -rw-r--r-- | config/global/build-behave.in | 72 | ||||
| -rw-r--r-- | config/kernel/linux.in | 82 | ||||
| -rw-r--r-- | config/libc/eglibc.in | 5 | ||||
| -rw-r--r-- | config/toolchain.in | 2 | ||||
| -rw-r--r-- | config/tools/libelf.in | 5 |
15 files changed, 239 insertions, 103 deletions
diff --git a/config/cc/gcc.in b/config/cc/gcc.in index f601c0d..b21b3dc 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -111,6 +111,11 @@ config CC_V_4_3_3 prompt "4.3.3" select CC_GCC_4_3_or_later +config CC_V_4_3_4 + bool + prompt "4.3.4" + select CC_GCC_4_3_or_later + config CC_V_4_4_0 bool prompt "4.4.0 (EXPERIMENTAL)" @@ -118,6 +123,13 @@ config CC_V_4_4_0 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)" + depends on EXPERIMENTAL + select CC_GCC_4_3_or_later + select CC_GCC_4_4_or_later + # CT_INSERT_VERSION_ABOVE # Don't remove above line! endchoice @@ -130,6 +142,7 @@ config CC_GCC_4_3_or_later config CC_GCC_4_4_or_later bool default n + select PPL_CLOOG_MPC config CC_VERSION string @@ -153,7 +166,9 @@ config CC_VERSION default "4.3.1" if CC_V_4_3_1 default "4.3.2" if CC_V_4_3_2 default "4.3.3" if CC_V_4_3_3 + default "4.3.4" if CC_V_4_3_4 default "4.4.0" if CC_V_4_4_0 + default "4.4.1" if CC_V_4_4_1 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! diff --git a/config/companion_libs.in b/config/companion_libs.in index d581d80..9b059f0 100644 --- a/config/companion_libs.in +++ b/config/companion_libs.in @@ -20,35 +20,68 @@ config GMP_MPFR - gcc - gdb -config GMP_MPFR_TARGET - bool - prompt "Build libraries for the target" - depends on GMP_MPFR - depends on ! BARE_METAL - default n - help - Also build libraries for the target. This can be usefull if you want - to later build a compiler that will run on the target, or if you want - to run gdb natively on the target. - if GMP_MPFR source config/companion_libs/gmp.in source config/companion_libs/mpfr.in endif -config PPL_CLOOG +config PPL_CLOOG_MPC bool - prompt "PPL and GLooG/PPL" + prompt "PPL, GLooG/PPL and MPC" help - gcc-4.4.0 and above requires both PPL and CLooG/PPL to build some - parts of the optimiser (GRAPHITE loop optimisation, to be precise). + gcc-4.4.0 and above requires PPL and CLooG/PPL to build some parts + of the optimiser (GRAPHITE loop optimisation, to be precise). + + In addition to those, gcc-4.4 also optionally uses MPC to enable + additional optimisations on complex numbers. Although MPC is optional, + crosstool-NG requires it and uses it to build gcc >= 4.4.0. These will be automatically selected if you choose gcc>=4.4.0, but you can say 'Y' here, although it is unknown yet if any other component can use them. -if PPL_CLOOG +if PPL_CLOOG_MPC source config/companion_libs/ppl.in +source config/companion_libs/cloog.in +source config/companion_libs/mpc.in endif +config FOO + bool + +comment "Companion libraries common options" + depends on GMP_MPFR || PPL_CLOOG_MPC + +config COMP_LIBS_CHECK + bool + prompt "| Check the companion libraries builds (!!! READ HELP!!!)" + depends on GMP_MPFR || PPL_CLOOG_MPC + default n + help + It is highly recommended to check the newly built companion libraries. + Unfortunately, this is a very intensive task, and takes a loooong time. + + Checking the newly built companion libraries is thus disabled by default, + but it is suggested that you check them at least once on your machine, + and if they work, disable the check on subsequent builds. + + If you suspect that one (or more) of your companion libraries is the + cause for incorrectly generated code, you should answer 'Y' here. + Note however that this will take a really long time. For example, + building PPL on my machine takes roughly 1'40", while checking it takes + about 1h40'... + +config COMP_LIBS_TARGET + bool + prompt "| Build companion libraries for the target" + depends on GMP_MPFR || PPL_CLOOG_MPC + depends on ! BARE_METAL + default n + help + Also build companion libraries for the target. This can be usefull if + you want to later build a compiler that will run on the target, or if + you want to run gdb natively on the target. + + Please note that for now, crosstool-NG can only build GMP and MPFR so. + endmenu diff --git a/config/companion_libs/cloog.in b/config/companion_libs/cloog.in new file mode 100644 index 0000000..99779c9 --- /dev/null +++ b/config/companion_libs/cloog.in @@ -0,0 +1,19 @@ +# CLooG options + +choice + bool + prompt "CLooG/ppl version" + +config CLOOG_V_0_15_3 + bool + prompt "0.15.3" + +# CT_INSERT_VERSION_ABOVE +# Don't remove above line! +endchoice + +config CLOOG_VERSION + string + default "0.15.3" if CLOOG_V_0_15_3 +# CT_INSERT_VERSION_STRING_ABOVE +# Don't remove above line! diff --git a/config/companion_libs/gmp.in b/config/companion_libs/gmp.in index 0ac2b2c..a87f417 100644 --- a/config/companion_libs/gmp.in +++ b/config/companion_libs/gmp.in @@ -12,6 +12,14 @@ config GMP_V_4_2_4 bool prompt "4.2.4" +config GMP_V_4_3_0 + bool + prompt "4.3.0" + +config GMP_V_4_3_1 + bool + prompt "4.3.1" + # CT_INSERT_VERSION_ABOVE # Don't remove above line! endchoice @@ -20,13 +28,7 @@ config GMP_VERSION string default "4.2.2" if GMP_V_4_2_2 default "4.2.4" if GMP_V_4_2_4 + default "4.3.0" if GMP_V_4_3_0 + default "4.3.1" if GMP_V_4_3_1 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! - -config GMP_CHECK - bool - prompt "Check GMP" - default y - help - It is highly recommended that 'make check' is run against the newly built - GMP library. See http://gmplib.org/ diff --git a/config/companion_libs/mpc.in b/config/companion_libs/mpc.in new file mode 100644 index 0000000..0aa1369 --- /dev/null +++ b/config/companion_libs/mpc.in @@ -0,0 +1,19 @@ +# MPC options + +choice + bool + prompt "MPC version" + +config MPC_V_0_6 + bool + prompt "0.6" + +# CT_INSERT_VERSION_ABOVE +# Don't remove above line! +endchoice + +config MPC_VERSION + string + default "0.6" if MPC_V_0_6 +# CT_INSERT_VERSION_STRING_ABOVE +# Don't remove above line! diff --git a/config/companion_libs/mpfr.in b/config/companion_libs/mpfr.in index dcea326..910ab4e 100644 --- a/config/companion_libs/mpfr.in +++ b/config/companion_libs/mpfr.in @@ -32,11 +32,3 @@ config MPFR_VERSION default "2.4.1" if MPFR_V_2_4_1 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! - -config MPFR_CHECK - bool - prompt "Check MPFR" - default y - help - It is highly recommended that 'make check' is run against the newly built - MPFR library. See http://gmplib.org/ diff --git a/config/companion_libs/ppl.in b/config/companion_libs/ppl.in index d8f5906..efdeabf 100644 --- a/config/companion_libs/ppl.in +++ b/config/companion_libs/ppl.in @@ -17,17 +17,3 @@ config PPL_VERSION default "0.10.2" if PPL_V_0_10_2 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! - -config PPL_CHECK - bool - prompt "Check PPL (!!! README !!!)" - default n - help - Checking PPL is very intensive and takes a loooong time. - The PPL folks do not recommend checking the library, but they do - not recommend not checking it, either. - - Checking PPL is thus disabled by default. - - If you suspect that your PPL library is the cause for incorrectly - generated code, you should answer 'Y' here. diff --git a/config/debug/duma.in b/config/debug/duma.in index eebb621..8c8caa4 100644 --- a/config/debug/duma.in +++ b/config/debug/duma.in @@ -37,6 +37,10 @@ config DUMA_V_2_5_14 bool prompt "2_5_14" +config DUMA_V_2_5_15 + bool + prompt "2.5.15" + # CT_INSERT_VERSION_ABOVE # Don't remove above line! endchoice @@ -47,5 +51,6 @@ config DUMA_VERSION default "2_5_8" if DUMA_V_2_5_8 default "2_5_12" if DUMA_V_2_5_12 default "2_5_14" if DUMA_V_2_5_14 + default "2.5.15" if DUMA_V_2_5_15 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! diff --git a/config/debug/gdb.in b/config/debug/gdb.in index 865a5f8..f21123d 100644 --- a/config/debug/gdb.in +++ b/config/debug/gdb.in @@ -20,7 +20,7 @@ config GDB_CROSS_STATIC help A static cross gdb can be usefull if you debug on a machine that is not the one that is used to compile the toolchain. - + That way, you can share the cross-gdb without installing a toolchain on every machine that will be used to debug target programs. @@ -59,14 +59,14 @@ config GDB_NATIVE_USE_GMP_MPFR default n depends on GDB_NATIVE select GMP_MPFR - select GMP_MPFR_TARGET + select COMP_LIBS_TARGET help gdb can make use of the GMP and MPFR libraries. - + While the cross-gdb (above) can use the libraries compiled for the host, the native gdb needs the libraries for the target (where it will eventually run). - + Setting this option will force building the GMP and MPFR libraries for the target, and configure the native gdb to use them. diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in index 6b7c029..4b141e0 100644 --- a/config/debug/ltrace.in +++ b/config/debug/ltrace.in @@ -25,6 +25,10 @@ config LTRACE_V_0_5_1 prompt "0.5.1 (EXPERIMENTAL)" depends on EXPERIMENTAL +config LTRACE_V_0_5_2 + bool + prompt "0.5.2" + # CT_INSERT_VERSION_ABOVE # Don't remove above line! endchoice @@ -34,5 +38,6 @@ config LTRACE_VERSION default "0.4" if LTRACE_V_0_4 default "0.5" if LTRACE_V_0_5 default "0.5.1" if LTRACE_V_0_5_1 + default "0.5.2" if LTRACE_V_0_5_2 # CT_INSERT_VERSION_STRING_ABOVE # # Don't remove above line! diff --git a/config/global/build-behave.in b/config/global/build-behave.in index 7f8a854..b0a1040 100644 --- a/config/global/build-behave.in +++ b/config/global/build-behave.in @@ -44,16 +44,72 @@ config USE_PIPES Use gcc's option -pipe to use pipes rather than temp files when building the toolchain. +choice + bool + prompt "Shell to use as CONFIG_SHELL" + default CONFIG_SHELL_BASH + +config CONFIG_SHELL_SH + bool + prompt "sh (the system shell)" + help + Use 'sh' as CONFIG_SHELL. + + ./configure scripts and Makefiles make intensive use of calling + sub-shells. This is usually done by calling /bin/sh. /bin/sh ought + to be an at-least-POSIX-conformant shell (that is, able to interpret + POSIX shell scripts). + + On many (most?) systems, /bin/sh is a symlink to bash. On some other + systems (eg. Ubuntu, latest Debian), /bin/sh points to dash (or ash). + bash is a full-featured shell, with many extension to POSIX, but is + quite slow (see ection BUGS in the bash man page), while dash is + faster, with very few extensions to POSIX. On the other hand, some + ./configure scripts, although written to use /bin/sh, may really + require to be run by bash. + + The default is to use bash, as some components (eg. GMP) will fail + to build with anything else than bash. + config CONFIG_SHELL_ASH bool - prompt "Use 'ash' as CONFIG_SHELL" - default n + prompt "ash (READ HELP!)" help - Use /bin/ash as the shell used by ./configure scripts. + Use 'ash' as CONFIG_SHELL. - ./configure scripts make intensive use of calling a sub-shell, and the - traditional bash is slow, whereas ash is faster. + See help for CONFIG_SHELL_SH, above, for more explanations. - Saying 'y' here should be safe enough, but some components may not - accept using a shell other than bash (this is most probably true for - old versions). If you have trouble, say 'n' here and see if it fixes it. + NOTE: It is advised that you do NOT use ash as CONFIG_SHELL, as some + components are broken. If you decide to use ash, and the build breaks, + don't come moaning and set the CONFIG_SHELL to bash, below. + +config CONFIG_SHELL_BASH + bool + prompt "bash" + help + Use 'bash' as CONFIG_SHELL. + + See help for CONFIG_SHELL_SH, above, for more explanations. + +config CONFIG_SHELL_CUSTOM + bool + prompt "custom shell" + help + Enter full path to the custom shell below. + + See help for CONFIG_SHELL_SH, above, for more explanations. + +config CONFIG_SHELL_CUSTOM_PATH + string + prompt "Path to custom shell" + depends on CONFIG_SHELL_CUSTOM + default "/bin/sh" + +endchoice + +config CONFIG_SHELL + string + default "sh" if CONFIG_SHELL_SH + default "ash" if CONFIG_SHELL_ASH + default "bash" if CONFIG_SHELL_BASH + default "custom" if CONFIG_SHELL_CUSTOM diff --git a/config/kernel/linux.in b/config/kernel/linux.in index f08076d..5f69e3e 100644 --- a/config/kernel/linux.in +++ b/config/kernel/linux.in @@ -76,66 +76,61 @@ config KERNEL_V_2_6_26_8 prompt "2.6.26.8 (OBSOLETE)" depends on OBSOLETE -config KERNEL_V_2_6_27_22 +config KERNEL_V_2_6_27_29 bool - prompt "2.6.27.22 (OBSOLETE)" - depends on OBSOLETE - -config KERNEL_V_2_6_28 - bool - prompt "2.6.28" + prompt "2.6.27.29 (long-term stable)" -config KERNEL_V_2_6_28_1 +config KERNEL_V_2_6_28_10 bool - prompt "2.6.28.1" + prompt "2.6.28.10" -config KERNEL_V_2_6_28_2 +config KERNEL_V_2_6_29 bool - prompt "2.6.28.2" + prompt "2.6.29" -config KERNEL_V_2_6_28_3 +config KERNEL_V_2_6_29_1 bool - prompt "2.6.28.3" + prompt "2.6.29.1" -config KERNEL_V_2_6_28_4 +config KERNEL_V_2_6_29_2 bool - prompt "2.6.28.4" + prompt "2.6.29.2" -config KERNEL_V_2_6_28_5 +config KERNEL_V_2_6_29_3 bool - prompt "2.6.28.5" + prompt "2.6.29.3" -config KERNEL_V_2_6_28_6 +config KERNEL_V_2_6_29_4 bool - prompt "2.6.28.6" + prompt "2.6.29.4" -config KERNEL_V_2_6_28_7 +config KERNEL_V_2_6_29_5 bool - prompt "2.6.28.7" + prompt "2.6.29.5" -config KERNEL_V_2_6_28_8 +config KERNEL_V_2_6_29_6 bool - prompt "2.6.28.8" + prompt "2.6.29.6" -config KERNEL_V_2_6_28_9 +config KERNEL_V_2_6_30 bool - prompt "2.6.28.9" + prompt "2.6.30" -config KERNEL_V_2_6_28_10 +config KERNEL_V_2_6_30_1 bool - prompt "2.6.28.10" + prompt "2.6.30.1" -config KERNEL_V_2_6_29 +config KERNEL_V_2_6_30_2 bool - prompt "2.6.29" + prompt "2.6.30.2" -config KERNEL_V_2_6_29_1 +config KERNEL_V_2_6_30_3 bool - prompt "2.6.29.1" + prompt "2.6.30.3" -config KERNEL_V_2_6_29_2 +config KERNEL_V_2_6_30_4 bool - prompt "2.6.29.2" + prompt "2.6.30.4" # CT_INSERT_VERSION_ABOVE # Don't remove above line! @@ -159,21 +154,20 @@ config KERNEL_VERSION default "2.6.24.7" if KERNEL_V_2_6_24_7 default "2.6.25.20" if KERNEL_V_2_6_25_20 default "2.6.26.8" if KERNEL_V_2_6_26_8 - default "2.6.27.22" if KERNEL_V_2_6_27_22 - default "2.6.28" if KERNEL_V_2_6_28 - default "2.6.28.1" if KERNEL_V_2_6_28_1 - default "2.6.28.2" if KERNEL_V_2_6_28_2 - default "2.6.28.3" if KERNEL_V_2_6_28_3 - default "2.6.28.4" if KERNEL_V_2_6_28_4 - default "2.6.28.5" if KERNEL_V_2_6_28_5 - default "2.6.28.6" if KERNEL_V_2_6_28_6 - default "2.6.28.7" if KERNEL_V_2_6_28_7 - default "2.6.28.8" if KERNEL_V_2_6_28_8 - default "2.6.28.9" if KERNEL_V_2_6_28_9 + default "2.6.27.29" if KERNEL_V_2_6_27_29 default "2.6.28.10" if KERNEL_V_2_6_28_10 default "2.6.29" if KERNEL_V_2_6_29 default "2.6.29.1" if KERNEL_V_2_6_29_1 default "2.6.29.2" if KERNEL_V_2_6_29_2 + default "2.6.29.3" if KERNEL_V_2_6_29_3 + default "2.6.29.4" if KERNEL_V_2_6_29_4 + default "2.6.29.5" if KERNEL_V_2_6_29_5 + default "2.6.29.6" if KERNEL_V_2_6_29_6 + default "2.6.30" if KERNEL_V_2_6_30 + default "2.6.30.1" if KERNEL_V_2_6_30_1 + default "2.6.30.2" if KERNEL_V_2_6_30_2 + default "2.6.30.3" if KERNEL_V_2_6_30_3 + default "2.6.30.4" if KERNEL_V_2_6_30_4 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! help diff --git a/config/libc/eglibc.in b/config/libc/eglibc.in index 81cdb1d..ced8d95 100644 --- a/config/libc/eglibc.in +++ b/config/libc/eglibc.in @@ -36,6 +36,10 @@ config EGLIBC_V_2_9 bool prompt "2_9" +config LIBC_V_2_10 + bool + prompt "2_10" + # CT_INSERT_VERSION_ABOVE # Don't remove above line! @@ -55,6 +59,7 @@ config LIBC_VERSION default "2_7" if EGLIBC_V_2_7 default "2_8" if EGLIBC_V_2_8 default "2_9" if EGLIBC_V_2_9 + default "2_10" if LIBC_V_2_10 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! diff --git a/config/toolchain.in b/config/toolchain.in index 6cec94b..ffa4f3e 100644 --- a/config/toolchain.in +++ b/config/toolchain.in @@ -123,7 +123,7 @@ config CROSS_NATIVE config CANADIAN bool - prompt "Canadian (NO CODE!) (EXPERIMENTAL)" + prompt "Canadian (EXPERIMENTAL)" depends on EXPERIMENTAL help Build a canadian-toolchain. diff --git a/config/tools/libelf.in b/config/tools/libelf.in index f8df6a7..3002a15 100644 --- a/config/tools/libelf.in +++ b/config/tools/libelf.in @@ -13,6 +13,10 @@ config LIBELF_V_0_8_10 bool prompt "0.8.10" +config LIBELF_V_0_8_11 + bool + prompt "0.8.11" + # CT_INSERT_VERSION_ABOVE # Don't remove above line! endchoice @@ -20,5 +24,6 @@ endchoice config LIBELF_VERSION string default "0.8.10" if LIBELF_V_0_8_10 + default "0.8.11" if LIBELF_V_0_8_11 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! |