From 3a85d55aa871ce85a17c9079ee42697b4546f2b6 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Thu, 21 May 2009 19:07:16 +0000 Subject: /devel/gcc-4.4: - add PPL download mirror at the gcc ftp site. -------- diffstat follows -------- /devel/gcc-4.4/scripts/build/companion_libs/ppl.sh | 3 2 1 0 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- scripts/build/companion_libs/ppl.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scripts/build/companion_libs') diff --git a/scripts/build/companion_libs/ppl.sh b/scripts/build/companion_libs/ppl.sh index d3246f93..b26f1a4e 100644 --- a/scripts/build/companion_libs/ppl.sh +++ b/scripts/build/companion_libs/ppl.sh @@ -14,7 +14,8 @@ if [ "${CT_PPL_CLOOG}" = "y" ]; then do_ppl_get() { CT_GetFile "ppl-${CT_PPL_VERSION}" \ http://www.cs.unipr.it/ppl/Download/ftp/releases/${CT_PPL_VERSION} \ - ftp://ftp.cs.unipr.it/pub/ppl/releases/${CT_PPL_VERSION} + ftp://ftp.cs.unipr.it/pub/ppl/releases/${CT_PPL_VERSION} \ + ftp://gcc.gnu.org/pub/gcc/infrastructure } # Extract PPL -- cgit v1.2.3 From 2614b1eb7b42c49ac4cccf268bdd9b8be7bc652d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 24 May 2009 21:46:30 +0000 Subject: /devel/gcc-4.4: - build a shared gmp, don't build a static gmp -------- diffstat follows -------- /devel/gcc-4.4/scripts/build/companion_libs/gmp.sh | 6 3 3 0 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- scripts/build/companion_libs/gmp.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/build/companion_libs') diff --git a/scripts/build/companion_libs/gmp.sh b/scripts/build/companion_libs/gmp.sh index a3dd4a05..0acd0866 100644 --- a/scripts/build/companion_libs/gmp.sh +++ b/scripts/build/companion_libs/gmp.sh @@ -34,7 +34,7 @@ do_gmp() { if [ "${CT_PPL_CLOOG}" = "y" ]; then opts="--enable-cxx" - cflags="-fexceptions" + cflags="-fexceptions -fPIC" fi CFLAGS="${CT_CFLAGS_FOR_HOST} ${cflags}" \ @@ -43,8 +43,8 @@ do_gmp() { --build=${CT_BUILD} \ --host=${CT_HOST} \ --prefix="${CT_PREFIX_DIR}" \ - --disable-shared \ - --enable-static \ + --enable-shared \ + --disable-static \ --enable-fft \ --enable-mpbsd \ ${opts} -- cgit v1.2.3 From 3b72d01b5218e07bf1c6555da86b65326bc6e1b4 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 24 May 2009 21:48:41 +0000 Subject: /devel/gcc-4.4: - build a shared mpfr, don't build a static mpfr -------- diffstat follows -------- /devel/gcc-4.4/scripts/build/companion_libs/mpfr.sh | 4 2 2 0 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- scripts/build/companion_libs/mpfr.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/build/companion_libs') diff --git a/scripts/build/companion_libs/mpfr.sh b/scripts/build/companion_libs/mpfr.sh index e302ff77..8255591e 100644 --- a/scripts/build/companion_libs/mpfr.sh +++ b/scripts/build/companion_libs/mpfr.sh @@ -77,8 +77,8 @@ do_mpfr() { --host=${CT_HOST} \ --prefix="${CT_PREFIX_DIR}" \ ${mpfr_opt} \ - --disable-shared \ - --enable-static \ + --enable-shared \ + --disable-static \ --with-gmp="${CT_PREFIX_DIR}" CT_DoLog EXTRA "Building MPFR" -- cgit v1.2.3 From 6f04a46339d51b1735a9d147d3c22e20e7d2f5c1 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 24 May 2009 21:49:30 +0000 Subject: /devel/gcc-4.4: - build a shared ppl, don't build a static ppl -------- diffstat follows -------- /devel/gcc-4.4/scripts/build/companion_libs/ppl.sh | 7 4 3 0 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- scripts/build/companion_libs/ppl.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'scripts/build/companion_libs') diff --git a/scripts/build/companion_libs/ppl.sh b/scripts/build/companion_libs/ppl.sh index b26f1a4e..76e6bf5f 100644 --- a/scripts/build/companion_libs/ppl.sh +++ b/scripts/build/companion_libs/ppl.sh @@ -31,7 +31,8 @@ do_ppl() { CT_DoStep INFO "Installing PPL" CT_DoLog EXTRA "Configuring PPL" - CFLAGS="${CT_CFLAGS_FOR_HOST}" \ + CFLAGS="${CT_CFLAGS_FOR_HOST} -fPIC" \ + CXXFLAGS="${CT_CFLAGS_FOR_HOST} -fPIC" \ CT_DoExecLog ALL \ "${CT_SRC_DIR}/ppl-${CT_PPL_VERSION}/configure" \ --build=${CT_BUILD} \ @@ -39,8 +40,8 @@ do_ppl() { --prefix="${CT_PREFIX_DIR}" \ --with-libgmp-prefix="${CT_PREFIX_DIR}" \ --with-libgmpxx-prefix="${CT_PREFIX_DIR}" \ - --disable-shared \ - --enable-static \ + --enable-shared \ + --disable-static \ --disable-debugging \ --disable-assertions \ --disable-ppl_lcdd \ -- cgit v1.2.3 From e03219c3d6545859151440332bd2dee46f918b68 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 24 May 2009 21:59:08 +0000 Subject: /devel/gcc-4.4: - cleanup GMP build -------- diffstat follows -------- /devel/gcc-4.4/scripts/build/companion_libs/gmp.sh | 2 1 1 0 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- scripts/build/companion_libs/gmp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/build/companion_libs') diff --git a/scripts/build/companion_libs/gmp.sh b/scripts/build/companion_libs/gmp.sh index 0acd0866..d5ffedc1 100644 --- a/scripts/build/companion_libs/gmp.sh +++ b/scripts/build/companion_libs/gmp.sh @@ -34,7 +34,7 @@ do_gmp() { if [ "${CT_PPL_CLOOG}" = "y" ]; then opts="--enable-cxx" - cflags="-fexceptions -fPIC" + cflags="-fexceptions" fi CFLAGS="${CT_CFLAGS_FOR_HOST} ${cflags}" \ -- cgit v1.2.3 From 6c5993d03892a8c541ec905426c6aab086fda2aa Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 24 May 2009 22:02:30 +0000 Subject: /devel/gcc-4.4: - cleanup the PPL build -------- diffstat follows -------- /devel/gcc-4.4/scripts/build/companion_libs/ppl.sh | 4 2 2 0 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- scripts/build/companion_libs/ppl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/build/companion_libs') diff --git a/scripts/build/companion_libs/ppl.sh b/scripts/build/companion_libs/ppl.sh index 76e6bf5f..0a48dbaa 100644 --- a/scripts/build/companion_libs/ppl.sh +++ b/scripts/build/companion_libs/ppl.sh @@ -31,8 +31,8 @@ do_ppl() { CT_DoStep INFO "Installing PPL" CT_DoLog EXTRA "Configuring PPL" - CFLAGS="${CT_CFLAGS_FOR_HOST} -fPIC" \ - CXXFLAGS="${CT_CFLAGS_FOR_HOST} -fPIC" \ + CFLAGS="${CT_CFLAGS_FOR_HOST}" \ + CXXFLAGS="${CT_CFLAGS_FOR_HOST}" \ CT_DoExecLog ALL \ "${CT_SRC_DIR}/ppl-${CT_PPL_VERSION}/configure" \ --build=${CT_BUILD} \ -- cgit v1.2.3 From 822fb9415e457383450c96d2432b76c8874ada49 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 24 May 2009 22:04:14 +0000 Subject: /devel/gcc-4.4: - add support for building CLooG -------- diffstat follows -------- /devel/gcc-4.4/scripts/build/companion_libs/cloog.sh | 60 60 0 0 ++++++++++++++++++++++++++++++++++ /devel/gcc-4.4/scripts/addToolVersion.sh | 3 2 1 0 +- /devel/gcc-4.4/scripts/crosstool-NG.sh.in | 3 3 0 0 ++ /devel/gcc-4.4/steps.mk | 1 1 0 0 + /devel/gcc-4.4/config/companion_libs/cloog.in | 32 32 0 0 ++++++++++++++++++ /devel/gcc-4.4/config/companion_libs.in | 1 1 0 0 + 6 files changed, 99 insertions(+), 1 deletion(-) --- config/companion_libs.in | 1 + config/companion_libs/cloog.in | 32 +++++++++++++++++++ scripts/addToolVersion.sh | 3 +- scripts/build/companion_libs/cloog.sh | 60 +++++++++++++++++++++++++++++++++++ scripts/crosstool-NG.sh.in | 3 ++ steps.mk | 1 + 6 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 config/companion_libs/cloog.in create mode 100644 scripts/build/companion_libs/cloog.sh (limited to 'scripts/build/companion_libs') diff --git a/config/companion_libs.in b/config/companion_libs.in index d581d804..c95418ba 100644 --- a/config/companion_libs.in +++ b/config/companion_libs.in @@ -49,6 +49,7 @@ config PPL_CLOOG if PPL_CLOOG source config/companion_libs/ppl.in +source config/companion_libs/cloog.in endif endmenu diff --git a/config/companion_libs/cloog.in b/config/companion_libs/cloog.in new file mode 100644 index 00000000..e67e79fc --- /dev/null +++ b/config/companion_libs/cloog.in @@ -0,0 +1,32 @@ +# CLooG options + +choice + bool + prompt "CLooG/ppl version" + +config CLOOG_V_0_15_3 + bool + prompt "0.15.3" + +# CT_INSERT_VERSION_ABOVE +# Don't remove above line! +endchoice + +config CLOOG_VERSION + string + 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. diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index 8e0446e1..337c6567 100755 --- a/scripts/addToolVersion.sh +++ b/scripts/addToolVersion.sh @@ -13,7 +13,7 @@ Usage: ${myname} <[options] version [...]> ... 'tool' in one of: --gcc, --binutils, --glibc, --eglibc, --uClibc, --linux, --gdb, --dmalloc, --duma, --strace, --ltrace, --libelf - --gmp, --mpfr, --ppl + --gmp, --mpfr, --ppl, --cloog Valid options for all tools: --stable, -s, +x (default) @@ -134,6 +134,7 @@ while [ $# -gt 0 ]; do --gmp) EXP=; OBS=; cat=GMP; tool=gmp; tool_prefix=companion_libs;; --mpfr) EXP=; OBS=; cat=MPFR; tool=mpfr; tool_prefix=companion_libs;; --ppl) EXP=; OBS=; cat=PPL; tool=ppl; tool_prefix=companion_libs;; + --cloog) EXP=; OBS=; cat=CLOOG; tool=cloog; tool_prefix=companion_libs;; # Tools options: -x|--experimental|+s) EXP=1;; diff --git a/scripts/build/companion_libs/cloog.sh b/scripts/build/companion_libs/cloog.sh new file mode 100644 index 00000000..43ef648d --- /dev/null +++ b/scripts/build/companion_libs/cloog.sh @@ -0,0 +1,60 @@ +# This file adds the functions to build the CLooG library +# Copyright 2009 Yann E. MORIN +# Licensed under the GPL v2. See COPYING in the root of this package + +do_cloog_get() { :; } +do_cloog_extract() { :; } +do_cloog() { :; } +do_cloog_target() { :; } + +# Overide functions depending on configuration +if [ "${CT_PPL_CLOOG}" = "y" ]; then + +# Download CLooG +do_cloog_get() { + CT_GetFile "cloog-ppl-${CT_CLOOG_VERSION}" \ + ftp://gcc.gnu.org/pub/gcc/infrastructure +} + +# Extract CLooG +do_cloog_extract() { + CT_Extract "cloog-ppl-${CT_CLOOG_VERSION}" + CT_Pushd "${CT_SRC_DIR}/cloog-ppl" + CT_Patch "cloog-ppl-${CT_CLOOG_VERSION}" nochdir + CT_Popd +} + +do_cloog() { + mkdir -p "${CT_BUILD_DIR}/build-cloog-ppl" + cd "${CT_BUILD_DIR}/build-cloog-ppl" + + CT_DoStep INFO "Installing CLooG/ppl" + + CT_DoLog EXTRA "Configuring CLooG/ppl" + CFLAGS="${CT_CFLAGS_FOR_HOST}" \ + CT_DoExecLog ALL \ + "${CT_SRC_DIR}/cloog-ppl/configure" \ + --build=${CT_BUILD} \ + --host=${CT_HOST} \ + --prefix="${CT_PREFIX_DIR}" \ + --with-gmp="${CT_PREFIX_DIR}" \ + --with-ppl="${CT_PREFIX_DIR}" \ + --disable-shared \ + --enable-static \ + --with-bits=gmp + + CT_DoLog EXTRA "Building CLooG/ppl" + CT_DoExecLog ALL make ${PARALLELMFLAGS} + + if [ "${CT_CLOOG_CHECK}" = "y" ]; then + CT_DoLog EXTRA "Checking CLooG/ppl" + CT_DoExecLog ALL make ${PARALLELMFLAGS} -s check + fi + + CT_DoLog EXTRA "Installing CLooG/ppl" + CT_DoExecLog ALL make install + + CT_EndStep +} + +fi # CT_PPL_CLOOG diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in index a2032bc4..2a9ff5ad 100644 --- a/scripts/crosstool-NG.sh.in +++ b/scripts/crosstool-NG.sh.in @@ -91,6 +91,7 @@ CT_DoLog INFO "Building environment variables" . "${CT_LIB_DIR}/scripts/build/companion_libs/gmp.sh" . "${CT_LIB_DIR}/scripts/build/companion_libs/mpfr.sh" . "${CT_LIB_DIR}/scripts/build/companion_libs/ppl.sh" +. "${CT_LIB_DIR}/scripts/build/companion_libs/cloog.sh" . "${CT_LIB_DIR}/scripts/build/binutils/binutils.sh" . "${CT_LIB_DIR}/scripts/build/binutils/elf2flt.sh" . "${CT_LIB_DIR}/scripts/build/libc/${CT_LIBC}.sh" @@ -447,6 +448,7 @@ if [ -z "${CT_RESTART}" ]; then do_gmp_get do_mpfr_get do_ppl_get + do_cloog_get do_binutils_get do_cc_get do_libc_get @@ -464,6 +466,7 @@ if [ -z "${CT_RESTART}" ]; then do_gmp_extract do_mpfr_extract do_ppl_extract + do_cloog_extract do_binutils_extract do_cc_extract do_libc_extract diff --git a/steps.mk b/steps.mk index bb25061d..33865485 100644 --- a/steps.mk +++ b/steps.mk @@ -21,6 +21,7 @@ CT_STEPS := libc_check_config \ gmp \ mpfr \ ppl \ + cloog \ binutils \ elf2flt \ cc_core_pass_1 \ -- cgit v1.2.3 From 843a16f70c09d9ae1ec5db5282608da39897242e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Mon, 25 May 2009 17:26:21 +0000 Subject: /devel/gcc-4.4: - GMP: unconditionnaly build the C++ wrappers and use exceptions -------- diffstat follows -------- /devel/gcc-4.4/scripts/build/companion_libs/gmp.sh | 11 2 9 0 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) --- scripts/build/companion_libs/gmp.sh | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'scripts/build/companion_libs') diff --git a/scripts/build/companion_libs/gmp.sh b/scripts/build/companion_libs/gmp.sh index d5ffedc1..d89ebb5d 100644 --- a/scripts/build/companion_libs/gmp.sh +++ b/scripts/build/companion_libs/gmp.sh @@ -22,8 +22,6 @@ do_gmp_extract() { } do_gmp() { - local opts - local cflags mkdir -p "${CT_BUILD_DIR}/build-gmp" cd "${CT_BUILD_DIR}/build-gmp" @@ -32,12 +30,7 @@ do_gmp() { CT_DoLog EXTRA "Configuring GMP" - if [ "${CT_PPL_CLOOG}" = "y" ]; then - opts="--enable-cxx" - cflags="-fexceptions" - fi - - CFLAGS="${CT_CFLAGS_FOR_HOST} ${cflags}" \ + CFLAGS="${CT_CFLAGS_FOR_HOST} -fexceptions" \ CT_DoExecLog ALL \ "${CT_SRC_DIR}/gmp-${CT_GMP_VERSION}/configure" \ --build=${CT_BUILD} \ @@ -47,7 +40,7 @@ do_gmp() { --disable-static \ --enable-fft \ --enable-mpbsd \ - ${opts} + --enable-cxx CT_DoLog EXTRA "Building GMP" CT_DoExecLog ALL make ${PARALLELMFLAGS} -- cgit v1.2.3 From 52e72144d782cc3fb1110aa5e6ce305a809841a9 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Mon, 25 May 2009 18:22:26 +0000 Subject: /devel/gcc-4.4: - add support for building the MPC library. -------- diffstat follows -------- /devel/gcc-4.4/scripts/build/companion_libs/ppl.sh | 4 2 2 0 +- /devel/gcc-4.4/scripts/build/companion_libs/mpc.sh | 57 57 0 0 ++++++++++++++++++++++++++++++++++ /devel/gcc-4.4/scripts/build/companion_libs/cloog.sh | 4 2 2 0 +- /devel/gcc-4.4/scripts/crosstool-NG.sh.in | 3 3 0 0 ++ /devel/gcc-4.4/steps.mk | 1 1 0 0 + /devel/gcc-4.4/config/companion_libs/mpc.in | 32 32 0 0 +++++++++++++++++++ /devel/gcc-4.4/config/companion_libs.in | 15 10 5 0 ++++++--- 7 files changed, 107 insertions(+), 9 deletions(-) --- config/companion_libs.in | 15 ++++++--- config/companion_libs/mpc.in | 32 ++++++++++++++++++++ scripts/build/companion_libs/cloog.sh | 4 +-- scripts/build/companion_libs/mpc.sh | 57 +++++++++++++++++++++++++++++++++++ scripts/build/companion_libs/ppl.sh | 4 +-- scripts/crosstool-NG.sh.in | 3 ++ steps.mk | 1 + 7 files changed, 107 insertions(+), 9 deletions(-) create mode 100644 config/companion_libs/mpc.in create mode 100644 scripts/build/companion_libs/mpc.sh (limited to 'scripts/build/companion_libs') diff --git a/config/companion_libs.in b/config/companion_libs.in index c95418ba..46a2eded 100644 --- a/config/companion_libs.in +++ b/config/companion_libs.in @@ -36,20 +36,25 @@ source config/companion_libs/gmp.in source config/companion_libs/mpfr.in endif -config PPL_CLOOG +config PPL_CLOOG_MPC bool - prompt "PPL and GLooG/PPL" + prompt "PPL, GLooG/PPL and MPC" help - gcc-4.4.0 and above requires both 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 and CLooG/PPL to build some parts + of the optimiser (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, + 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 can say 'Y' here, although it is unknown yet if any other component can use them. -if PPL_CLOOG +if PPL_CLOOG_MPC source config/companion_libs/ppl.in source config/companion_libs/cloog.in +source config/companion_libs/mpc.in endif endmenu diff --git a/config/companion_libs/mpc.in b/config/companion_libs/mpc.in new file mode 100644 index 00000000..7ff2c26a --- /dev/null +++ b/config/companion_libs/mpc.in @@ -0,0 +1,32 @@ +# MPC options + +choice + bool + prompt "MPC version" + +config MPC_V_0_6 + bool + prompt "0.6" + +# CT_INSERT_VERSION_ABOVE +# Don't remove above line! +endchoice + +config MPC_VERSION + string + 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. diff --git a/scripts/build/companion_libs/cloog.sh b/scripts/build/companion_libs/cloog.sh index 43ef648d..a98f9992 100644 --- a/scripts/build/companion_libs/cloog.sh +++ b/scripts/build/companion_libs/cloog.sh @@ -8,7 +8,7 @@ do_cloog() { :; } do_cloog_target() { :; } # Overide functions depending on configuration -if [ "${CT_PPL_CLOOG}" = "y" ]; then +if [ "${CT_PPL_CLOOG_MPC}" = "y" ]; then # Download CLooG do_cloog_get() { @@ -57,4 +57,4 @@ do_cloog() { CT_EndStep } -fi # CT_PPL_CLOOG +fi # CT_PPL_CLOOG_MPC diff --git a/scripts/build/companion_libs/mpc.sh b/scripts/build/companion_libs/mpc.sh new file mode 100644 index 00000000..f0f5ecd8 --- /dev/null +++ b/scripts/build/companion_libs/mpc.sh @@ -0,0 +1,57 @@ +# This file adds the functions to build the MPC library +# Copyright 2009 Yann E. MORIN +# Licensed under the GPL v2. See COPYING in the root of this package + +do_mpc_get() { :; } +do_mpc_extract() { :; } +do_mpc() { :; } +do_mpc_target() { :; } + +# Overide functions depending on configuration +if [ "${CT_PPL_CLOOG_MPC}" = "y" ]; then + +# Download MPC +do_mpc_get() { + CT_GetFile "mpc-${CT_MPC_VERSION}" .tar.gz \ + http://www.multiprecision.org/mpc/download +} + +# Extract MPC +do_mpc_extract() { + CT_Extract "mpc-${CT_MPC_VERSION}" + CT_Patch "mpc-${CT_MPC_VERSION}" +} + +do_mpc() { + mkdir -p "${CT_BUILD_DIR}/build-mpc" + cd "${CT_BUILD_DIR}/build-mpc" + + CT_DoStep INFO "Installing MPC" + + CT_DoLog EXTRA "Configuring MPC" + CFLAGS="${CT_CFLAGS_FOR_HOST}" \ + CT_DoExecLog ALL \ + "${CT_SRC_DIR}/mpc-${CT_MPC_VERSION}/configure" \ + --build=${CT_BUILD} \ + --host=${CT_HOST} \ + --prefix="${CT_PREFIX_DIR}" \ + --with-gmp="${CT_PREFIX_DIR}" \ + --with-mpfr="${CT_PREFIX_DIR}" \ + --disable-shared \ + --enable-static \ + + CT_DoLog EXTRA "Building MPC" + CT_DoExecLog ALL make ${PARALLELMFLAGS} + + if [ "${CT_MPC_CHECK}" = "y" ]; then + CT_DoLog EXTRA "Checking MPC" + CT_DoExecLog ALL make ${PARALLELMFLAGS} -s check + fi + + CT_DoLog EXTRA "Installing MPC" + CT_DoExecLog ALL make install + + CT_EndStep +} + +fi # CT_PPL_CLOOG_MPC diff --git a/scripts/build/companion_libs/ppl.sh b/scripts/build/companion_libs/ppl.sh index 0a48dbaa..92d59de7 100644 --- a/scripts/build/companion_libs/ppl.sh +++ b/scripts/build/companion_libs/ppl.sh @@ -8,7 +8,7 @@ do_ppl() { :; } do_ppl_target() { :; } # Overide functions depending on configuration -if [ "${CT_PPL_CLOOG}" = "y" ]; then +if [ "${CT_PPL_CLOOG_MPC}" = "y" ]; then # Download PPL do_ppl_get() { @@ -65,4 +65,4 @@ do_ppl() { CT_EndStep } -fi # CT_PPL_CLOOG +fi # CT_PPL_CLOOG_MPC diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in index 2a9ff5ad..0b9b00da 100644 --- a/scripts/crosstool-NG.sh.in +++ b/scripts/crosstool-NG.sh.in @@ -92,6 +92,7 @@ CT_DoLog INFO "Building environment variables" . "${CT_LIB_DIR}/scripts/build/companion_libs/mpfr.sh" . "${CT_LIB_DIR}/scripts/build/companion_libs/ppl.sh" . "${CT_LIB_DIR}/scripts/build/companion_libs/cloog.sh" +. "${CT_LIB_DIR}/scripts/build/companion_libs/mpc.sh" . "${CT_LIB_DIR}/scripts/build/binutils/binutils.sh" . "${CT_LIB_DIR}/scripts/build/binutils/elf2flt.sh" . "${CT_LIB_DIR}/scripts/build/libc/${CT_LIBC}.sh" @@ -449,6 +450,7 @@ if [ -z "${CT_RESTART}" ]; then do_mpfr_get do_ppl_get do_cloog_get + do_mpc_get do_binutils_get do_cc_get do_libc_get @@ -467,6 +469,7 @@ if [ -z "${CT_RESTART}" ]; then do_mpfr_extract do_ppl_extract do_cloog_extract + do_mpc_extract do_binutils_extract do_cc_extract do_libc_extract diff --git a/steps.mk b/steps.mk index 33865485..ba90f79a 100644 --- a/steps.mk +++ b/steps.mk @@ -22,6 +22,7 @@ CT_STEPS := libc_check_config \ mpfr \ ppl \ cloog \ + mpc \ binutils \ elf2flt \ cc_core_pass_1 \ -- cgit v1.2.3 From 21649be4763884c0000ec61f468ce9d1be10616d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Mon, 25 May 2009 19:46:58 +0000 Subject: /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(-) --- config/companion_libs.in | 46 ++++++++++++++++++++++++++--------- config/companion_libs/cloog.in | 13 ---------- config/companion_libs/gmp.in | 13 ---------- config/companion_libs/mpc.in | 13 ---------- config/companion_libs/mpfr.in | 14 ----------- config/companion_libs/ppl.in | 14 ----------- scripts/build/companion_libs/cloog.sh | 2 +- scripts/build/companion_libs/gmp.sh | 4 +-- scripts/build/companion_libs/mpc.sh | 2 +- scripts/build/companion_libs/mpfr.sh | 4 +-- scripts/build/companion_libs/ppl.sh | 2 +- 11 files changed, 42 insertions(+), 85 deletions(-) (limited to 'scripts/build/companion_libs') diff --git a/config/companion_libs.in b/config/companion_libs.in index 46a2eded..36427133 100644 --- a/config/companion_libs.in +++ b/config/companion_libs.in @@ -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 diff --git a/config/companion_libs/cloog.in b/config/companion_libs/cloog.in index e67e79fc..99779c96 100644 --- a/config/companion_libs/cloog.in +++ b/config/companion_libs/cloog.in @@ -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. diff --git a/config/companion_libs/gmp.in b/config/companion_libs/gmp.in index 3690c97f..c4fc246b 100644 --- a/config/companion_libs/gmp.in +++ b/config/companion_libs/gmp.in @@ -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. diff --git a/config/companion_libs/mpc.in b/config/companion_libs/mpc.in index 7ff2c26a..0aa1369a 100644 --- a/config/companion_libs/mpc.in +++ b/config/companion_libs/mpc.in @@ -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. diff --git a/config/companion_libs/mpfr.in b/config/companion_libs/mpfr.in index 3917c9dd..910ab4e6 100644 --- a/config/companion_libs/mpfr.in +++ b/config/companion_libs/mpfr.in @@ -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. - diff --git a/config/companion_libs/ppl.in b/config/companion_libs/ppl.in index d8f5906f..efdeabfa 100644 --- a/config/companion_libs/ppl.in +++ b/config/companion_libs/ppl.in @@ -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. diff --git a/scripts/build/companion_libs/cloog.sh b/scripts/build/companion_libs/cloog.sh index a98f9992..58226333 100644 --- a/scripts/build/companion_libs/cloog.sh +++ b/scripts/build/companion_libs/cloog.sh @@ -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 diff --git a/scripts/build/companion_libs/gmp.sh b/scripts/build/companion_libs/gmp.sh index d89ebb5d..6371b45d 100644 --- a/scripts/build/companion_libs/gmp.sh +++ b/scripts/build/companion_libs/gmp.sh @@ -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" diff --git a/scripts/build/companion_libs/mpc.sh b/scripts/build/companion_libs/mpc.sh index f0f5ecd8..335609f4 100644 --- a/scripts/build/companion_libs/mpc.sh +++ b/scripts/build/companion_libs/mpc.sh @@ -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 diff --git a/scripts/build/companion_libs/mpfr.sh b/scripts/build/companion_libs/mpfr.sh index 8255591e..85d09428 100644 --- a/scripts/build/companion_libs/mpfr.sh +++ b/scripts/build/companion_libs/mpfr.sh @@ -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" diff --git a/scripts/build/companion_libs/ppl.sh b/scripts/build/companion_libs/ppl.sh index 92d59de7..686622f8 100644 --- a/scripts/build/companion_libs/ppl.sh +++ b/scripts/build/companion_libs/ppl.sh @@ -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 -- cgit v1.2.3 From f05ecb83606c325eb7826a5a58457b5c3d34e9f0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Mon, 1 Jun 2009 15:53:42 +0000 Subject: /devel/gcc-4.4: - PPL, CLooG/PPL: remove uselessly installed files. -------- diffstat follows -------- /devel/gcc-4.4/scripts/build/companion_libs/ppl.sh | 3 3 0 0 +++ /devel/gcc-4.4/scripts/build/companion_libs/cloog.sh | 3 3 0 0 +++ 2 files changed, 6 insertions(+) --- scripts/build/companion_libs/cloog.sh | 3 +++ scripts/build/companion_libs/ppl.sh | 3 +++ 2 files changed, 6 insertions(+) (limited to 'scripts/build/companion_libs') diff --git a/scripts/build/companion_libs/cloog.sh b/scripts/build/companion_libs/cloog.sh index 58226333..93cd55cd 100644 --- a/scripts/build/companion_libs/cloog.sh +++ b/scripts/build/companion_libs/cloog.sh @@ -54,6 +54,9 @@ do_cloog() { CT_DoLog EXTRA "Installing CLooG/ppl" CT_DoExecLog ALL make install + # Remove spuriously installed file + CT_DoExecLog ALL rm -f "${CT_PREFIX_DIR}/bin/cloog" + CT_EndStep } diff --git a/scripts/build/companion_libs/ppl.sh b/scripts/build/companion_libs/ppl.sh index 686622f8..4af080bd 100644 --- a/scripts/build/companion_libs/ppl.sh +++ b/scripts/build/companion_libs/ppl.sh @@ -62,6 +62,9 @@ do_ppl() { CT_DoLog EXTRA "Installing PPL" CT_DoExecLog ALL make install + # Remove spuriously installed file + CT_DoExecLog ALL rm -f "${CT_PREFIX_DIR}/bin/ppl-config" + CT_EndStep } -- cgit v1.2.3 From 1505eb762176e3a42ac41713edf27c8e408e75de Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Mon, 1 Jun 2009 18:03:23 +0000 Subject: /devel/gcc-4.4: - build shared CLooG/ppl and MPC libraries, don't build static ones. -------- diffstat follows -------- /devel/gcc-4.4/scripts/build/companion_libs/mpc.sh | 4 2 2 0 ++-- /devel/gcc-4.4/scripts/build/companion_libs/cloog.sh | 4 2 2 0 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) --- scripts/build/companion_libs/cloog.sh | 4 ++-- scripts/build/companion_libs/mpc.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts/build/companion_libs') diff --git a/scripts/build/companion_libs/cloog.sh b/scripts/build/companion_libs/cloog.sh index 93cd55cd..0e6d74fb 100644 --- a/scripts/build/companion_libs/cloog.sh +++ b/scripts/build/companion_libs/cloog.sh @@ -39,8 +39,8 @@ do_cloog() { --prefix="${CT_PREFIX_DIR}" \ --with-gmp="${CT_PREFIX_DIR}" \ --with-ppl="${CT_PREFIX_DIR}" \ - --disable-shared \ - --enable-static \ + --enable-shared \ + --disable-static \ --with-bits=gmp CT_DoLog EXTRA "Building CLooG/ppl" diff --git a/scripts/build/companion_libs/mpc.sh b/scripts/build/companion_libs/mpc.sh index 335609f4..18144a0e 100644 --- a/scripts/build/companion_libs/mpc.sh +++ b/scripts/build/companion_libs/mpc.sh @@ -37,8 +37,8 @@ do_mpc() { --prefix="${CT_PREFIX_DIR}" \ --with-gmp="${CT_PREFIX_DIR}" \ --with-mpfr="${CT_PREFIX_DIR}" \ - --disable-shared \ - --enable-static \ + --enable-shared \ + --disable-static \ CT_DoLog EXTRA "Building MPC" CT_DoExecLog ALL make ${PARALLELMFLAGS} -- cgit v1.2.3