From 38c549d748e72ecba0dac3215b7a82596229a42f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 3 May 2009 21:10:15 +0000 Subject: Prepare for gcc-4.4: - add 'companion_libs/' to hold all libraries needed to build gcc-4.3+ and gcc-4.4+ - move GMP & MPFR to 'companion_libs/' -------- diffstat follows -------- /trunk/scripts/build/gmp.sh | 85 0 85 0 ---------------------------- /trunk/scripts/build/mpfr.sh | 139 0 139 0 --------------------------------------------- /trunk/scripts/addToolVersion.sh | 4 2 2 0 /trunk/scripts/crosstool-NG.sh.in | 4 2 2 0 /trunk/config/companion_libs.in | 17 10 7 0 +++--- /trunk/config/gmp_mpfr/gmp.in | 32 0 32 0 ---------- /trunk/config/gmp_mpfr/mpfr.in | 42 0 42 0 -------------- /trunk/config/config.in | 2 1 1 0 /trunk/config/gmp_mpfr.in | 35 0 35 0 ----------- 9 files changed, 15 insertions(+), 345 deletions(-) --- config/companion_libs.in | 38 ++++++++++++++++++++++++++++++++++++++ config/companion_libs/gmp.in | 32 ++++++++++++++++++++++++++++++++ config/companion_libs/mpfr.in | 42 ++++++++++++++++++++++++++++++++++++++++++ config/config.in | 2 +- config/gmp_mpfr.in | 35 ----------------------------------- config/gmp_mpfr/gmp.in | 32 -------------------------------- config/gmp_mpfr/mpfr.in | 42 ------------------------------------------ 7 files changed, 113 insertions(+), 110 deletions(-) create mode 100644 config/companion_libs.in create mode 100644 config/companion_libs/gmp.in create mode 100644 config/companion_libs/mpfr.in delete mode 100644 config/gmp_mpfr.in delete mode 100644 config/gmp_mpfr/gmp.in delete mode 100644 config/gmp_mpfr/mpfr.in (limited to 'config') diff --git a/config/companion_libs.in b/config/companion_libs.in new file mode 100644 index 00000000..49dc6629 --- /dev/null +++ b/config/companion_libs.in @@ -0,0 +1,38 @@ +# Companion libraries config options +# Those libraries are required for different versions of gcc, +# and can be used by binutils and gdb (maybe others as well). + +menu "Companion libraries" + +config GMP_MPFR + bool + prompt "GMP and MPFR" + 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 (eg. binutils and gdb). + + 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 + 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 + +endmenu diff --git a/config/companion_libs/gmp.in b/config/companion_libs/gmp.in new file mode 100644 index 00000000..0ac2b2c0 --- /dev/null +++ b/config/companion_libs/gmp.in @@ -0,0 +1,32 @@ +# GMP options + +choice + bool + prompt "GMP version" + +config GMP_V_4_2_2 + bool + prompt "4.2.2" + +config GMP_V_4_2_4 + bool + prompt "4.2.4" + +# CT_INSERT_VERSION_ABOVE +# Don't remove above line! +endchoice + +config GMP_VERSION + string + default "4.2.2" if GMP_V_4_2_2 + 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" + 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/mpfr.in b/config/companion_libs/mpfr.in new file mode 100644 index 00000000..dcea3264 --- /dev/null +++ b/config/companion_libs/mpfr.in @@ -0,0 +1,42 @@ +# GMP options + +choice + bool + prompt "MPFR version" + +config MPFR_V_2_3_1 + bool + prompt "2.3.1" + +config MPFR_V_2_3_2 + bool + prompt "2.3.2" + +config MPFR_V_2_4_0 + bool + prompt "2.4.0" + +config MPFR_V_2_4_1 + bool + prompt "2.4.1" + +# CT_INSERT_VERSION_ABOVE +# Don't remove above line! +endchoice + +config MPFR_VERSION + string + default "2.3.1" if MPFR_V_2_3_1 + default "2.3.2" if MPFR_V_2_3_2 + default "2.4.0" if MPFR_V_2_4_0 + 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/config.in b/config/config.in index 16a62f28..14e1a411 100644 --- a/config/config.in +++ b/config/config.in @@ -2,7 +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/companion_libs.in source config/binutils.in source config/cc.in source config/libc.in diff --git a/config/gmp_mpfr.in b/config/gmp_mpfr.in deleted file mode 100644 index 02afb769..00000000 --- a/config/gmp_mpfr.in +++ /dev/null @@ -1,35 +0,0 @@ -# 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 - 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/gmp_mpfr/gmp.in -source config/gmp_mpfr/mpfr.in -endif - -endmenu diff --git a/config/gmp_mpfr/gmp.in b/config/gmp_mpfr/gmp.in deleted file mode 100644 index 0ac2b2c0..00000000 --- a/config/gmp_mpfr/gmp.in +++ /dev/null @@ -1,32 +0,0 @@ -# GMP options - -choice - bool - prompt "GMP version" - -config GMP_V_4_2_2 - bool - prompt "4.2.2" - -config GMP_V_4_2_4 - bool - prompt "4.2.4" - -# CT_INSERT_VERSION_ABOVE -# Don't remove above line! -endchoice - -config GMP_VERSION - string - default "4.2.2" if GMP_V_4_2_2 - 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" - 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/gmp_mpfr/mpfr.in b/config/gmp_mpfr/mpfr.in deleted file mode 100644 index dcea3264..00000000 --- a/config/gmp_mpfr/mpfr.in +++ /dev/null @@ -1,42 +0,0 @@ -# GMP options - -choice - bool - prompt "MPFR version" - -config MPFR_V_2_3_1 - bool - prompt "2.3.1" - -config MPFR_V_2_3_2 - bool - prompt "2.3.2" - -config MPFR_V_2_4_0 - bool - prompt "2.4.0" - -config MPFR_V_2_4_1 - bool - prompt "2.4.1" - -# CT_INSERT_VERSION_ABOVE -# Don't remove above line! -endchoice - -config MPFR_VERSION - string - default "2.3.1" if MPFR_V_2_3_1 - default "2.3.2" if MPFR_V_2_3_2 - default "2.4.0" if MPFR_V_2_4_0 - 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/ -- cgit v1.2.3