From 1b00a301bd732441d6bf1ad5d7cc15c0e281b622 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Fri, 20 Jun 2008 15:16:43 +0000 Subject: GMP and MPFR are no longer a sub-component of gcc (config-wise). Build and install GMP and MPFR for the target. Use the target GMP and MPFR to build the native gdb. Have separate extra_config for cross gdb, native gdb and gdbserver. Check native GMP and MPFR in //. /trunk/scripts/build/debug/300-gdb.sh | 27 19 8 0 ++++++++++++++++------- /trunk/scripts/build/gmp.sh | 47 39 8 0 ++++++++++++++++++++++++++++++++------- /trunk/scripts/build/mpfr.sh | 49 40 9 0 +++++++++++++++++++++++++++++++++-------- /trunk/steps.mk | 2 2 0 0 ++ /trunk/config/cc/gcc.in | 18 1 17 0 +-------------- /trunk/config/debug/gdb.in | 6 1 5 0 +---- /trunk/config/config.in | 1 1 0 0 + /trunk/config/gmp_mpfr.in | 34 34 0 0 ++++++++++++++++++++++++++++ 8 files changed, 137 insertions(+), 47 deletions(-) --- config/cc/gcc.in | 18 +----------------- config/config.in | 1 + config/debug/gdb.in | 6 +----- config/gmp_mpfr.in | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 22 deletions(-) create mode 100644 config/gmp_mpfr.in (limited to 'config') diff --git a/config/cc/gcc.in b/config/cc/gcc.in index 33eee4e2..07cdc400 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -120,7 +120,7 @@ config CC_VERSION config CC_GCC_4_3_or_later bool default n - select CC_GCC_GMP_MPFR + select GMP_MPFR config CC_CXA_ATEXIT bool @@ -166,19 +166,3 @@ config CC_BUGURL default "" help Specify the URL that users should visit if they wish to report a bug. - -menuconfig CC_GCC_GMP_MPFR - bool - prompt "GMP and MPFR" - help - Recent gcc needs both GMP and MPFR to build some frontends. - - Say 'Y' here if you want to build those two libraries specifically - for crosstool-NG. - - Saying 'Y' is highly recommended if building gcc-4.3 or higher. - -if CC_GCC_GMP_MPFR -source config/cc/gmp.in -source config/cc/mpfr.in -endif diff --git a/config/config.in b/config/config.in index e7c236c7..cd73a3e6 100644 --- a/config/config.in +++ b/config/config.in @@ -2,6 +2,7 @@ source config/global.in source config/target.in source config/toolchain.in source config/kernel.in +source config/gmp_mpfr.in source config/binutils.in source config/cc.in source config/libc.in diff --git a/config/debug/gdb.in b/config/debug/gdb.in index 643162b6..d2ce15eb 100644 --- a/config/debug/gdb.in +++ b/config/debug/gdb.in @@ -33,6 +33,7 @@ config GDB_NATIVE bool prompt "Native gdb" default n + select GMP_MPFR_TARGET if GMP_MPFR help Build and install a native gdb for the target, to run on the target. @@ -123,10 +124,6 @@ choice bool prompt "ncurses version" -config NCURSES_V_4_2 - bool - prompt "4.2" - config NCURSES_V_5_6 bool prompt "5.6" @@ -135,7 +132,6 @@ endchoice config NCURSES_VERSION string - default "4.2" if NCURSES_V_4_2 default "5.6" if NCURSES_V_5_6 endif # GDB_NATIVE --> ncurses diff --git a/config/gmp_mpfr.in b/config/gmp_mpfr.in new file mode 100644 index 00000000..3ae6a91b --- /dev/null +++ b/config/gmp_mpfr.in @@ -0,0 +1,34 @@ +# GMP and MPFR libraries config options + +menu "GMP and MPFR" + +config GMP_MPFR + bool + prompt "GMP and MPFR" + help + Recent gcc needs both GMP and MPFR to build some frontends. + + Say 'Y' here if you want to build those two libraries specifically + for crosstool-NG. + + The packages that can use GMP and MPFR are: + - binutils + - gcc + - gdb + +config GMP_MPFR_TARGET + bool + prompt "Build libraries for the target" + depends on GMP_MPFR + 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/cc/gmp.in +source config/cc/mpfr.in +endif + +endmenu -- cgit v1.2.3