/devel/gcc-4.4:

- commonalise the config-knobs that:
  - enable checking the newly built companion libraries
  - enable building the companion libraries for the target

 -------- diffstat follows --------
 /devel/gcc-4.4/scripts/build/companion_libs/ppl.sh   |    2     1     1     0
 /devel/gcc-4.4/scripts/build/companion_libs/mpc.sh   |    2     1     1     0
 /devel/gcc-4.4/scripts/build/companion_libs/gmp.sh   |    4     2     2     0 +-
 /devel/gcc-4.4/scripts/build/companion_libs/cloog.sh |    2     1     1     0
 /devel/gcc-4.4/scripts/build/companion_libs/mpfr.sh  |    4     2     2     0 +-
 /devel/gcc-4.4/config/companion_libs/ppl.in          |   14     0    14     0 ----------
 /devel/gcc-4.4/config/companion_libs/mpc.in          |   13     0    13     0 ----------
 /devel/gcc-4.4/config/companion_libs/gmp.in          |   13     0    13     0 ----------
 /devel/gcc-4.4/config/companion_libs/cloog.in        |   13     0    13     0 ----------
 /devel/gcc-4.4/config/companion_libs/mpfr.in         |   14     0    14     0 ----------
 /devel/gcc-4.4/config/companion_libs.in              |   46    35    11     0 ++++++++++++++++++++++++++--------
 11 files changed, 42 insertions(+), 85 deletions(-)
This commit is contained in:
Yann E. MORIN" 2009-05-25 19:46:58 +00:00
parent 87cf57e3ba
commit 21649be476
11 changed files with 42 additions and 85 deletions

View File

@ -20,17 +20,6 @@ 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
@ -57,4 +46,39 @@ source config/companion_libs/cloog.in
source config/companion_libs/mpc.in
endif
comment "Common companion libraries 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 or 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 1h30"...
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

View File

@ -17,16 +17,3 @@ config CLOOG_VERSION
default "0.15.3" if CLOOG_V_0_15_3
# CT_INSERT_VERSION_STRING_ABOVE
# Don't remove above line!
config CLOOG_CHECK
bool
prompt "Check CLooG (!!! README !!!)"
default n
help
It is highly recommended to check the newly built CLooG library.
Unfortunately, this is a very intensive task, and takes a loooong time.
Checking CLooG is thus disabled by default.
If you suspect that your CLooG library is the cause for incorrectly
generated code, you should answer 'Y' here.

View File

@ -22,16 +22,3 @@ config GMP_VERSION
default "4.2.4" if GMP_V_4_2_4
# CT_INSERT_VERSION_STRING_ABOVE
# Don't remove above line!
config GMP_CHECK
bool
prompt "Check GMP (!!! README !!!)"
default n
help
It is highly recommended to check the newly built GMP library.
Unfortunately, this is a very intensive task, and takes a loooong time.
Checking GMP is thus disabled by default.
If you suspect that your GMP library is the cause for incorrectly
generated code, you should answer 'Y' here.

View File

@ -17,16 +17,3 @@ config MPC_VERSION
default "0.6" if MPC_V_0_6
# CT_INSERT_VERSION_STRING_ABOVE
# Don't remove above line!
config MPC_CHECK
bool
prompt "Check MPC (!!! README !!!)"
default n
help
It is highly recommended to check the newly built MPC library.
Unfortunately, this is a very intensive task, and takes a loooong time.
Checking MPC is thus disabled by default.
If you suspect that your MPC library is the cause for incorrectly
generated code, you should answer 'Y' here.

View File

@ -32,17 +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 (!!! README !!!)"
default n
help
It is highly recommended to check the newly built MPFR library.
Unfortunately, this is a very intensive task, and takes a loooong time.
Checking MPFR is thus disabled by default.
If you suspect that your MPFR library is the cause for incorrectly
generated code, you should answer 'Y' here.

View File

@ -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.

View File

@ -46,7 +46,7 @@ do_cloog() {
CT_DoLog EXTRA "Building CLooG/ppl"
CT_DoExecLog ALL make ${PARALLELMFLAGS}
if [ "${CT_CLOOG_CHECK}" = "y" ]; then
if [ "${CT_COMP_LIBS_CHECK}" = "y" ]; then
CT_DoLog EXTRA "Checking CLooG/ppl"
CT_DoExecLog ALL make ${PARALLELMFLAGS} -s check
fi

View File

@ -45,7 +45,7 @@ do_gmp() {
CT_DoLog EXTRA "Building GMP"
CT_DoExecLog ALL make ${PARALLELMFLAGS}
if [ "${CT_GMP_CHECK}" = "y" ]; then
if [ "${CT_COMP_LIBS_CHECK}" = "y" ]; then
CT_DoLog EXTRA "Checking GMP"
CT_DoExecLog ALL make ${PARALLELMFLAGS} -s check
fi
@ -56,7 +56,7 @@ do_gmp() {
CT_EndStep
}
if [ "${CT_GMP_MPFR_TARGET}" = "y" ]; then
if [ "${CT_COMP_LIBS_TARGET}" = "y" ]; then
do_gmp_target() {
mkdir -p "${CT_BUILD_DIR}/build-gmp-target"

View File

@ -43,7 +43,7 @@ do_mpc() {
CT_DoLog EXTRA "Building MPC"
CT_DoExecLog ALL make ${PARALLELMFLAGS}
if [ "${CT_MPC_CHECK}" = "y" ]; then
if [ "${CT_COMP_LIBS_CHECK}" = "y" ]; then
CT_DoLog EXTRA "Checking MPC"
CT_DoExecLog ALL make ${PARALLELMFLAGS} -s check
fi

View File

@ -84,7 +84,7 @@ do_mpfr() {
CT_DoLog EXTRA "Building MPFR"
CT_DoExecLog ALL make ${PARALLELMFLAGS}
if [ "${CT_MPFR_CHECK}" = "y" ]; then
if [ "${CT_COMP_LIBS_CHECK}" = "y" ]; then
CT_DoLog EXTRA "Checking MPFR"
CT_DoExecLog ALL make ${PARALLELMFLAGS} -s check
fi
@ -95,7 +95,7 @@ do_mpfr() {
CT_EndStep
}
if [ "${CT_GMP_MPFR_TARGET}" = "y" ]; then
if [ "${CT_COMP_LIBS_TARGET}" = "y" ]; then
do_mpfr_target() {
mkdir -p "${CT_BUILD_DIR}/build-mpfr-target"

View File

@ -54,7 +54,7 @@ do_ppl() {
CT_DoLog EXTRA "Building PPL"
CT_DoExecLog ALL make ${PARALLELMFLAGS}
if [ "${CT_PPL_CHECK}" = "y" ]; then
if [ "${CT_COMP_LIBS_CHECK}" = "y" ]; then
CT_DoLog EXTRA "Checking PPL"
CT_DoExecLog ALL make ${PARALLELMFLAGS} -s check
fi