Merge.
1.1 --- a/config/companion_libs.in Sun Aug 30 19:58:41 2009 +0200
1.2 +++ b/config/companion_libs.in Sun Aug 30 20:07:39 2009 +0200
1.3 @@ -33,6 +33,7 @@
1.4 config PPL_CLOOG_MPC
1.5 bool
1.6 prompt "PPL, GLooG/PPL and MPC"
1.7 + select GMP_MPFR
1.8 select WRAPPER_NEEDED
1.9 help
1.10 gcc-4.4.0 and above requires PPL and CLooG/PPL to build some parts
2.1 --- a/config/config.in Sun Aug 30 19:58:41 2009 +0200
2.2 +++ b/config/config.in Sun Aug 30 20:07:39 2009 +0200
2.3 @@ -2,9 +2,9 @@
2.4 source config/target.in
2.5 source config/toolchain.in
2.6 source config/kernel.in
2.7 -source config/companion_libs.in
2.8 source config/binutils.in
2.9 source config/cc.in
2.10 source config/libc.in
2.11 +source config/debug.in
2.12 source config/tools.in
2.13 -source config/debug.in
2.14 +source config/companion_libs.in
3.1 --- a/config/kernel.in Sun Aug 30 19:58:41 2009 +0200
3.2 +++ b/config/kernel.in Sun Aug 30 20:07:39 2009 +0200
3.3 @@ -8,6 +8,13 @@
3.4 bool
3.5 default n
3.6
3.7 +# Each target OS (aka kernel) that support shared libraries can select
3.8 +# this, so the user can decide whether or not to build a shared library
3.9 +# enabled toolchain
3.10 +config KERNEL_SUPPORTS_SHARED_LIBS
3.11 + bool
3.12 + default n
3.13 +
3.14 config KERNEL
3.15 string
3.16
3.17 @@ -16,4 +23,17 @@
3.18
3.19 source config.gen/kernel.in
3.20
3.21 +comment "Common kernel options"
3.22 +
3.23 +config SHARED_LIBS
3.24 + bool
3.25 + prompt "Build shared libraries"
3.26 + depends on KERNEL_SUPPORTS_SHARED_LIBS
3.27 + default y
3.28 + help
3.29 + Say 'y' here, unless you don't want shared libraries.
3.30 +
3.31 + You might not want shared libraries if you're building for a target that
3.32 + don't support it (maybe some nommu targets, for example, or bare metal).
3.33 +
3.34 endmenu
4.1 --- a/config/kernel/linux.in Sun Aug 30 19:58:41 2009 +0200
4.2 +++ b/config/kernel/linux.in Sun Aug 30 20:07:39 2009 +0200
4.3 @@ -3,6 +3,7 @@
4.4 # Linux kernel options
4.5
4.6 config KERNEL_linux
4.7 + select KERNEL_SUPPORTS_SHARED_LIBS
4.8 help
4.9 Build a toolchain targeting systems running Linux as a kernel.
4.10
5.1 --- a/config/toolchain.in Sun Aug 30 19:58:41 2009 +0200
5.2 +++ b/config/toolchain.in Sun Aug 30 20:07:39 2009 +0200
5.3 @@ -28,17 +28,6 @@
5.4 In fact, the sysroot path is constructed as:
5.5 ${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_DIR_PREFIX}/sys-root
5.6
5.7 -config SHARED_LIBS
5.8 - bool
5.9 - prompt "Build shared libraries"
5.10 - depends on ! BARE_METAL
5.11 - default y
5.12 - help
5.13 - Say 'y' here, unless you don't want shared libraries.
5.14 -
5.15 - You might not want shared libraries if you're building for a target that
5.16 - don't support it (maybe some nommu targets, for example, or bare metal).
5.17 -
5.18 comment "Tuple completion and aliasing"
5.19
5.20 config TARGET_VENDOR