1.1 --- a/config/companion_libs.in Sun May 24 22:02:30 2009 +0000
1.2 +++ b/config/companion_libs.in Sun May 24 22:04:14 2009 +0000
1.3 @@ -49,6 +49,7 @@
1.4
1.5 if PPL_CLOOG
1.6 source config/companion_libs/ppl.in
1.7 +source config/companion_libs/cloog.in
1.8 endif
1.9
1.10 endmenu
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2 +++ b/config/companion_libs/cloog.in Sun May 24 22:04:14 2009 +0000
2.3 @@ -0,0 +1,32 @@
2.4 +# CLooG options
2.5 +
2.6 +choice
2.7 + bool
2.8 + prompt "CLooG/ppl version"
2.9 +
2.10 +config CLOOG_V_0_15_3
2.11 + bool
2.12 + prompt "0.15.3"
2.13 +
2.14 +# CT_INSERT_VERSION_ABOVE
2.15 +# Don't remove above line!
2.16 +endchoice
2.17 +
2.18 +config CLOOG_VERSION
2.19 + string
2.20 + default "0.15.3" if CLOOG_V_0_15_3
2.21 +# CT_INSERT_VERSION_STRING_ABOVE
2.22 +# Don't remove above line!
2.23 +
2.24 +config CLOOG_CHECK
2.25 + bool
2.26 + prompt "Check CLooG (!!! README !!!)"
2.27 + default n
2.28 + help
2.29 + It is highly recommended to check the newly built CLooG library.
2.30 + Unfortunately, this is a very intensive task, and takes a loooong time.
2.31 +
2.32 + Checking CLooG is thus disabled by default.
2.33 +
2.34 + If you suspect that your CLooG library is the cause for incorrectly
2.35 + generated code, you should answer 'Y' here.
3.1 --- a/scripts/addToolVersion.sh Sun May 24 22:02:30 2009 +0000
3.2 +++ b/scripts/addToolVersion.sh Sun May 24 22:04:14 2009 +0000
3.3 @@ -13,7 +13,7 @@
3.4 'tool' in one of:
3.5 --gcc, --binutils, --glibc, --eglibc, --uClibc, --linux,
3.6 --gdb, --dmalloc, --duma, --strace, --ltrace, --libelf
3.7 - --gmp, --mpfr, --ppl
3.8 + --gmp, --mpfr, --ppl, --cloog
3.9
3.10 Valid options for all tools:
3.11 --stable, -s, +x (default)
3.12 @@ -134,6 +134,7 @@
3.13 --gmp) EXP=; OBS=; cat=GMP; tool=gmp; tool_prefix=companion_libs;;
3.14 --mpfr) EXP=; OBS=; cat=MPFR; tool=mpfr; tool_prefix=companion_libs;;
3.15 --ppl) EXP=; OBS=; cat=PPL; tool=ppl; tool_prefix=companion_libs;;
3.16 + --cloog) EXP=; OBS=; cat=CLOOG; tool=cloog; tool_prefix=companion_libs;;
3.17
3.18 # Tools options:
3.19 -x|--experimental|+s) EXP=1;;
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
4.2 +++ b/scripts/build/companion_libs/cloog.sh Sun May 24 22:04:14 2009 +0000
4.3 @@ -0,0 +1,60 @@
4.4 +# This file adds the functions to build the CLooG library
4.5 +# Copyright 2009 Yann E. MORIN
4.6 +# Licensed under the GPL v2. See COPYING in the root of this package
4.7 +
4.8 +do_cloog_get() { :; }
4.9 +do_cloog_extract() { :; }
4.10 +do_cloog() { :; }
4.11 +do_cloog_target() { :; }
4.12 +
4.13 +# Overide functions depending on configuration
4.14 +if [ "${CT_PPL_CLOOG}" = "y" ]; then
4.15 +
4.16 +# Download CLooG
4.17 +do_cloog_get() {
4.18 + CT_GetFile "cloog-ppl-${CT_CLOOG_VERSION}" \
4.19 + ftp://gcc.gnu.org/pub/gcc/infrastructure
4.20 +}
4.21 +
4.22 +# Extract CLooG
4.23 +do_cloog_extract() {
4.24 + CT_Extract "cloog-ppl-${CT_CLOOG_VERSION}"
4.25 + CT_Pushd "${CT_SRC_DIR}/cloog-ppl"
4.26 + CT_Patch "cloog-ppl-${CT_CLOOG_VERSION}" nochdir
4.27 + CT_Popd
4.28 +}
4.29 +
4.30 +do_cloog() {
4.31 + mkdir -p "${CT_BUILD_DIR}/build-cloog-ppl"
4.32 + cd "${CT_BUILD_DIR}/build-cloog-ppl"
4.33 +
4.34 + CT_DoStep INFO "Installing CLooG/ppl"
4.35 +
4.36 + CT_DoLog EXTRA "Configuring CLooG/ppl"
4.37 + CFLAGS="${CT_CFLAGS_FOR_HOST}" \
4.38 + CT_DoExecLog ALL \
4.39 + "${CT_SRC_DIR}/cloog-ppl/configure" \
4.40 + --build=${CT_BUILD} \
4.41 + --host=${CT_HOST} \
4.42 + --prefix="${CT_PREFIX_DIR}" \
4.43 + --with-gmp="${CT_PREFIX_DIR}" \
4.44 + --with-ppl="${CT_PREFIX_DIR}" \
4.45 + --disable-shared \
4.46 + --enable-static \
4.47 + --with-bits=gmp
4.48 +
4.49 + CT_DoLog EXTRA "Building CLooG/ppl"
4.50 + CT_DoExecLog ALL make ${PARALLELMFLAGS}
4.51 +
4.52 + if [ "${CT_CLOOG_CHECK}" = "y" ]; then
4.53 + CT_DoLog EXTRA "Checking CLooG/ppl"
4.54 + CT_DoExecLog ALL make ${PARALLELMFLAGS} -s check
4.55 + fi
4.56 +
4.57 + CT_DoLog EXTRA "Installing CLooG/ppl"
4.58 + CT_DoExecLog ALL make install
4.59 +
4.60 + CT_EndStep
4.61 +}
4.62 +
4.63 +fi # CT_PPL_CLOOG
5.1 --- a/scripts/crosstool-NG.sh.in Sun May 24 22:02:30 2009 +0000
5.2 +++ b/scripts/crosstool-NG.sh.in Sun May 24 22:04:14 2009 +0000
5.3 @@ -91,6 +91,7 @@
5.4 . "${CT_LIB_DIR}/scripts/build/companion_libs/gmp.sh"
5.5 . "${CT_LIB_DIR}/scripts/build/companion_libs/mpfr.sh"
5.6 . "${CT_LIB_DIR}/scripts/build/companion_libs/ppl.sh"
5.7 +. "${CT_LIB_DIR}/scripts/build/companion_libs/cloog.sh"
5.8 . "${CT_LIB_DIR}/scripts/build/binutils/binutils.sh"
5.9 . "${CT_LIB_DIR}/scripts/build/binutils/elf2flt.sh"
5.10 . "${CT_LIB_DIR}/scripts/build/libc/${CT_LIBC}.sh"
5.11 @@ -447,6 +448,7 @@
5.12 do_gmp_get
5.13 do_mpfr_get
5.14 do_ppl_get
5.15 + do_cloog_get
5.16 do_binutils_get
5.17 do_cc_get
5.18 do_libc_get
5.19 @@ -464,6 +466,7 @@
5.20 do_gmp_extract
5.21 do_mpfr_extract
5.22 do_ppl_extract
5.23 + do_cloog_extract
5.24 do_binutils_extract
5.25 do_cc_extract
5.26 do_libc_extract
6.1 --- a/steps.mk Sun May 24 22:02:30 2009 +0000
6.2 +++ b/steps.mk Sun May 24 22:04:14 2009 +0000
6.3 @@ -21,6 +21,7 @@
6.4 gmp \
6.5 mpfr \
6.6 ppl \
6.7 + cloog \
6.8 binutils \
6.9 elf2flt \
6.10 cc_core_pass_1 \