From 38c549d748e72ecba0dac3215b7a82596229a42f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 3 May 2009 21:10:15 +0000 Subject: [PATCH] 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/{gmp_mpfr.in => companion_libs.in} | 17 ++++++++++------- config/{gmp_mpfr => companion_libs}/gmp.in | 0 config/{gmp_mpfr => companion_libs}/mpfr.in | 0 config/config.in | 2 +- scripts/addToolVersion.sh | 4 ++-- scripts/build/{ => companion_libs}/gmp.sh | 0 scripts/build/{ => companion_libs}/mpfr.sh | 0 scripts/crosstool-NG.sh.in | 4 ++-- 8 files changed, 15 insertions(+), 12 deletions(-) rename config/{gmp_mpfr.in => companion_libs.in} (59%) rename config/{gmp_mpfr => companion_libs}/gmp.in (100%) rename config/{gmp_mpfr => companion_libs}/mpfr.in (100%) rename scripts/build/{ => companion_libs}/gmp.sh (100%) rename scripts/build/{ => companion_libs}/mpfr.sh (100%) diff --git a/config/gmp_mpfr.in b/config/companion_libs.in similarity index 59% rename from config/gmp_mpfr.in rename to config/companion_libs.in index 02afb769..49dc6629 100644 --- a/config/gmp_mpfr.in +++ b/config/companion_libs.in @@ -1,16 +1,19 @@ -# GMP and MPFR libraries config options +# 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 "GMP and MPFR" +menu "Companion libraries" config GMP_MPFR bool prompt "GMP and MPFR" help - Recent gcc needs both GMP and MPFR to build some frontends. - + 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 @@ -28,8 +31,8 @@ config GMP_MPFR_TARGET to run gdb natively on the target. if GMP_MPFR -source config/gmp_mpfr/gmp.in -source config/gmp_mpfr/mpfr.in +source config/companion_libs/gmp.in +source config/companion_libs/mpfr.in endif endmenu diff --git a/config/gmp_mpfr/gmp.in b/config/companion_libs/gmp.in similarity index 100% rename from config/gmp_mpfr/gmp.in rename to config/companion_libs/gmp.in diff --git a/config/gmp_mpfr/mpfr.in b/config/companion_libs/mpfr.in similarity index 100% rename from config/gmp_mpfr/mpfr.in rename to config/companion_libs/mpfr.in 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/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index 0f6bf034..21f4e9e0 100755 --- a/scripts/addToolVersion.sh +++ b/scripts/addToolVersion.sh @@ -131,8 +131,8 @@ while [ $# -gt 0 ]; do --strace) EXP=; OBS=; cat=STRACE; tool=strace; tool_prefix=debug;; --ltrace) EXP=; OBS=; cat=LTRACE; tool=ltrace; tool_prefix=debug;; --libelf) EXP=; OBS=; cat=LIBELF; tool=libelf; tool_prefix=tools;; - --gmp) EXP=; OBS=; cat=GMP; tool=gmp; tool_prefix=gmp_mpfr;; - --mpfr) EXP=; OBS=; cat=MPFR; tool=mpfr; tool_prefix=gmp_mpfr;; + --gmp) EXP=; OBS=; cat=GMP; tool=gmp; tool_prefix=companion_libs;; + --mpfr) EXP=; OBS=; cat=MPFR; tool=mpfr; tool_prefix=companion_libs;; # Tools options: -x|--experimental|+s) EXP=1;; diff --git a/scripts/build/gmp.sh b/scripts/build/companion_libs/gmp.sh similarity index 100% rename from scripts/build/gmp.sh rename to scripts/build/companion_libs/gmp.sh diff --git a/scripts/build/mpfr.sh b/scripts/build/companion_libs/mpfr.sh similarity index 100% rename from scripts/build/mpfr.sh rename to scripts/build/companion_libs/mpfr.sh diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in index 04b39768..8b8ac4be 100644 --- a/scripts/crosstool-NG.sh.in +++ b/scripts/crosstool-NG.sh.in @@ -88,8 +88,8 @@ CT_DoLog INFO "Building environment variables" . "${CT_LIB_DIR}/scripts/build/internals.sh" . "${CT_LIB_DIR}/scripts/build/arch/${CT_ARCH}.sh" . "${CT_LIB_DIR}/scripts/build/kernel/${CT_KERNEL}.sh" -. "${CT_LIB_DIR}/scripts/build/gmp.sh" -. "${CT_LIB_DIR}/scripts/build/mpfr.sh" +. "${CT_LIB_DIR}/scripts/build/companion_libs/gmp.sh" +. "${CT_LIB_DIR}/scripts/build/companion_libs/mpfr.sh" . "${CT_LIB_DIR}/scripts/build/binutils.sh" . "${CT_LIB_DIR}/scripts/build/libc/${CT_LIBC}.sh" . "${CT_LIB_DIR}/scripts/build/cc/${CT_CC}.sh"