summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/binutils/binutils.in3
-rw-r--r--config/cc/gcc.in7
-rw-r--r--config/companion_libs.in100
-rw-r--r--config/debug/gdb.in3
4 files changed, 86 insertions, 27 deletions
diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in
index ce728f1..23063b0 100644
--- a/config/binutils/binutils.in
+++ b/config/binutils/binutils.in
@@ -79,7 +79,8 @@ config BINUTILS_TARGET_USE_GMP_MPFR
bool
prompt "Use GMP and MPFR"
default n
- select GMP_MPFR
+ select GMP
+ select MPFR
select COMP_LIBS_TARGET
help
binutils can be configured to use GMP and MPFR.
diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index cbb16ab..3f336df 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -102,13 +102,16 @@ endchoice
config CC_GCC_4_3_or_later
bool
default n
- select GMP_MPFR
+ select GMP
+ select MPFR
config CC_GCC_4_4_or_later
bool
default n
select CC_GCC_4_3_or_later
- select PPL_CLOOG_MPC
+ select PPL
+ select CLOOG
+ select MPC
config CC_VERSION
string
diff --git a/config/companion_libs.in b/config/companion_libs.in
index 7437d1f..3bc019b 100644
--- a/config/companion_libs.in
+++ b/config/companion_libs.in
@@ -4,20 +4,22 @@
menu "Companion libraries"
+comment "FIXME: check real dependencies!!!"
+
config WRAPPER_NEEDED
bool
default n
-config GMP_MPFR
+config GMP
bool
- prompt "GMP and MPFR"
+ prompt "GMP"
select WRAPPER_NEEDED
help
- gcc 4.3.0 and above requires both GMP and MPFR to build some frontends,
- and some other components can use them as well.
+ gcc 4.3.0 and above requires GMP to build some frontends, and some
+ other components can use them as well.
- These will be automatically selected if you choose gcc>=4.3.0, but you
- can say 'Y' here if you want to build those two libraries for the other
+ This will be automatically selected if you choose gcc>=4.3.0, but you
+ can say 'Y' here if you want to build this library for the other
components (that don't select them by default).
The packages that can use GMP and MPFR are:
@@ -25,31 +27,83 @@ config GMP_MPFR
- gcc
- gdb
-if GMP_MPFR
-source config/companion_libs/gmp.in
-source config/companion_libs/mpfr.in
-endif
+config MPFR
+ bool
+ prompt "MPFR"
+ select GMP
+ select WRAPPER_NEEDED
+ help
+ gcc 4.3.0 and above requires MPFR to build some frontends, and some
+ other components can use them as well.
+
+ This will be automatically selected if you choose gcc>=4.3.0, but you
+ can say 'Y' here if you want to build this library for the other
+ components (that don't select them by default).
+
+ The packages that can use GMP and MPFR are:
+ - binutils
+ - gcc
+ - gdb
-config PPL_CLOOG_MPC
+config PPL
bool
- prompt "PPL, GLooG/PPL and MPC"
- select GMP_MPFR
+ prompt "PPL"
+ select GMP
+ select MPFR
select WRAPPER_NEEDED
help
- gcc-4.4.0 and above requires 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 to build some parts of the optimiser
+ (the 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,
+ This 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 it.
+
+config CLOOG
+ bool
+ prompt "GLooG/PPL"
+ select GMP
+ select MPFR
+ select PPL
+ select WRAPPER_NEEDED
+ help
+ gcc-4.4.0 and above requires CLooG/PPL to build some parts of the
+ optimiser (the GRAPHITE loop optimisation, to be precise).
+
+ This 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 it.
+
+config MPC
+ bool
+ prompt "MPC"
+ select GMP
+ select MPFR
+ select PPL
+ select CLOOG
+ select WRAPPER_NEEDED
+ help
+ gcc-4.4.0 and above can also optionally use 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
+ This 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.
+ can use it.
-if PPL_CLOOG_MPC
+if GMP
+source config/companion_libs/gmp.in
+endif
+if MPFR
+source config/companion_libs/mpfr.in
+endif
+if PPL
source config/companion_libs/ppl.in
+endif
+if CLOOG
source config/companion_libs/cloog.in
+endif
+if MPC
source config/companion_libs/mpc.in
endif
@@ -57,12 +111,12 @@ config FOO
bool
comment "Companion libraries common options"
- depends on GMP_MPFR || PPL_CLOOG_MPC
+ 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
+ depends on GMP || MPFR || PPL || CLOOG || MPC
default n
help
It is highly recommended to check the newly built companion libraries.
@@ -81,7 +135,7 @@ config COMP_LIBS_CHECK
config COMP_LIBS_TARGET
bool
prompt "| Build companion libraries for the target"
- depends on GMP_MPFR || PPL_CLOOG_MPC
+ depends on GMP || MPFR || PPL || CLOOG || MPC
depends on ! BARE_METAL
default n
help
diff --git a/config/debug/gdb.in b/config/debug/gdb.in
index 04b8f39..db40dbb 100644
--- a/config/debug/gdb.in
+++ b/config/debug/gdb.in
@@ -58,7 +58,8 @@ config GDB_NATIVE_USE_GMP_MPFR
prompt "Use GMP and MPFR"
default n
depends on GDB_NATIVE
- select GMP_MPFR
+ select GMP
+ select MPFR
select COMP_LIBS_TARGET
help
gdb can make use of the GMP and MPFR libraries.