From a0cf91e83ba73841a4ad810af8df7bf5c8dc0ab4 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Tue, 5 May 2009 22:04:20 +0000 Subject: Add support for building PPL: - PPL will be needed to correctly build gcc-4.4+ for the GRAPHITE loop optimisation -------- diffstat follows -------- /trunk/scripts/build/companion_libs/ppl.sh | 66 66 0 0 ++++++++++++++++++++++++++++++++++++ /trunk/scripts/build/companion_libs/gmp.sh | 24 19 5 0 ++++++++++--- /trunk/scripts/addToolVersion.sh | 3 2 1 0 +- /trunk/scripts/crosstool-NG.sh.in | 3 3 0 0 ++ /trunk/steps.mk | 1 1 0 0 + /trunk/config/companion_libs/ppl.in | 33 33 0 0 ++++++++++++++++++ /trunk/config/companion_libs.in | 22 19 3 0 ++++++++++-- 7 files changed, 143 insertions(+), 9 deletions(-) --- scripts/build/companion_libs/gmp.sh | 24 +++++++++++--- scripts/build/companion_libs/ppl.sh | 66 +++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 5 deletions(-) create mode 100644 scripts/build/companion_libs/ppl.sh (limited to 'scripts/build/companion_libs') diff --git a/scripts/build/companion_libs/gmp.sh b/scripts/build/companion_libs/gmp.sh index 51134da5..a3dd4a05 100644 --- a/scripts/build/companion_libs/gmp.sh +++ b/scripts/build/companion_libs/gmp.sh @@ -22,20 +22,32 @@ do_gmp_extract() { } do_gmp() { + local opts + local cflags + mkdir -p "${CT_BUILD_DIR}/build-gmp" cd "${CT_BUILD_DIR}/build-gmp" CT_DoStep INFO "Installing GMP" CT_DoLog EXTRA "Configuring GMP" - CFLAGS="${CT_CFLAGS_FOR_HOST}" \ + + if [ "${CT_PPL_CLOOG}" = "y" ]; then + opts="--enable-cxx" + cflags="-fexceptions" + fi + + CFLAGS="${CT_CFLAGS_FOR_HOST} ${cflags}" \ CT_DoExecLog ALL \ "${CT_SRC_DIR}/gmp-${CT_GMP_VERSION}/configure" \ --build=${CT_BUILD} \ --host=${CT_HOST} \ --prefix="${CT_PREFIX_DIR}" \ - --disable-shared --enable-static \ - --enable-fft --enable-mpbsd + --disable-shared \ + --enable-static \ + --enable-fft \ + --enable-mpbsd \ + ${opts} CT_DoLog EXTRA "Building GMP" CT_DoExecLog ALL make ${PARALLELMFLAGS} @@ -66,8 +78,10 @@ do_gmp_target() { --build=${CT_BUILD} \ --host=${CT_TARGET} \ --prefix=/usr \ - --disable-shared --enable-static \ - --enable-fft --enable-mpbsd + --disable-shared \ + --enable-static \ + --enable-fft \ + --enable-mpbsd \ CT_DoLog EXTRA "Building GMP" CT_DoExecLog ALL make ${PARALLELMFLAGS} diff --git a/scripts/build/companion_libs/ppl.sh b/scripts/build/companion_libs/ppl.sh new file mode 100644 index 00000000..d3246f93 --- /dev/null +++ b/scripts/build/companion_libs/ppl.sh @@ -0,0 +1,66 @@ +# This file adds the functions to build the PPL library +# Copyright 2009 Yann E. MORIN +# Licensed under the GPL v2. See COPYING in the root of this package + +do_ppl_get() { :; } +do_ppl_extract() { :; } +do_ppl() { :; } +do_ppl_target() { :; } + +# Overide functions depending on configuration +if [ "${CT_PPL_CLOOG}" = "y" ]; then + +# Download PPL +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} +} + +# Extract PPL +do_ppl_extract() { + CT_Extract "ppl-${CT_PPL_VERSION}" + CT_Patch "ppl-${CT_PPL_VERSION}" +} + +do_ppl() { + mkdir -p "${CT_BUILD_DIR}/build-ppl" + cd "${CT_BUILD_DIR}/build-ppl" + + CT_DoStep INFO "Installing PPL" + + CT_DoLog EXTRA "Configuring PPL" + CFLAGS="${CT_CFLAGS_FOR_HOST}" \ + CT_DoExecLog ALL \ + "${CT_SRC_DIR}/ppl-${CT_PPL_VERSION}/configure" \ + --build=${CT_BUILD} \ + --host=${CT_HOST} \ + --prefix="${CT_PREFIX_DIR}" \ + --with-libgmp-prefix="${CT_PREFIX_DIR}" \ + --with-libgmpxx-prefix="${CT_PREFIX_DIR}" \ + --disable-shared \ + --enable-static \ + --disable-debugging \ + --disable-assertions \ + --disable-ppl_lcdd \ + --disable-ppl_lpsol + + # Maybe-options: + # --enable-interfaces=... + # --enable-optimization=speed or sspeed (yes, with 2 's') + + CT_DoLog EXTRA "Building PPL" + CT_DoExecLog ALL make ${PARALLELMFLAGS} + + if [ "${CT_PPL_CHECK}" = "y" ]; then + CT_DoLog EXTRA "Checking PPL" + CT_DoExecLog ALL make ${PARALLELMFLAGS} -s check + fi + + CT_DoLog EXTRA "Installing PPL" + CT_DoExecLog ALL make install + + CT_EndStep +} + +fi # CT_PPL_CLOOG -- cgit v1.2.3