summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Franzmann2014-06-14 22:48:54 +0200
committerRemko van der Vossen2019-05-17 23:32:57 +0200
commit8f7d05b9c6c6bf9f51f3e9f006d8d082d63b1b63 (patch)
treef64f8a9ad3469e1ca96bedf8212dda92868caf7c
parent699250f4b0819a98b60a7793956170fe5602b02e (diff)
gnu/gcc: add option for compiling in the cloog-isl optimizer
-rwxr-xr-xgnu/gcc/BUILD39
-rwxr-xr-xgnu/gcc/CONFIGURE4
-rwxr-xr-xgnu/gcc/DEPENDS9
-rwxr-xr-xgnu/gcc/DETAILS12
-rw-r--r--gnu/gcc/HISTORY2
-rwxr-xr-xgnu/gcc/PRE_BUILD9
6 files changed, 54 insertions, 21 deletions
diff --git a/gnu/gcc/BUILD b/gnu/gcc/BUILD
index e71494292d..25e48ef760 100755
--- a/gnu/gcc/BUILD
+++ b/gnu/gcc/BUILD
@@ -69,19 +69,36 @@ if list_find "$GCC_COMPILER" "ada" ; then
fi &&
-OPTS="--without-ppl --without-cloog $GCJ_HOME $OPTS" &&
+OPTS="$GCJ_HOME $OPTS" &&
+OPTS="--prefix=${INSTALL_ROOT}/usr $OPTS" &&
+OPTS="--libdir=${INSTALL_ROOT}/usr/lib $OPTS" &&
+OPTS="--libexecdir=${INSTALL_ROOT}/usr/lib $OPTS" &&
+OPTS="--mandir=${INSTALL_ROOT}/usr/share/man $OPTS" &&
+OPTS="--infodir=${INSTALL_ROOT}/usr/share/info $OPTS" &&
+OPTS="--with-bugurl=http://bugs.sourcemage.org $OPTS" &&
+OPTS="--enable-languages=$(echo ${GCC_COMPILER} | tr " " ","),lto $OPTS" &&
+OPTS="--enable-shared $OPTS" &&
+OPTS="--enable-threads=posix $OPTS" &&
+OPTS="--enable-__cxa_atexit $OPTS" &&
+OPTS="--enable-clocale=gnu $OPTS" &&
+OPTS="--disable-libstdcxx-pch $OPTS" &&
+OPTS="--enable-bootstrap $OPTS" &&
+OPTS="--enable-gnu-unique-object $OPTS" &&
+OPTS="--enable-linker-build-id $OPTS" &&
+if [[ "$GCC_CLOOG" == "y" ]]; then
+ OPTS="--enable-cloog-backend=isl $OPTS" &&
+ OPTS="--disable-isl-version-check $OPTS"
+else
+ OPTS="--without-cloog $OPTS"
+fi &&
+OPTS="--enable-lto $OPTS" &&
+OPTS="--with-linker-hash-style=gnu $OPTS" &&
+OPTS="--disable-werror $OPTS" &&
+OPTS="--enable-checking=release $OPTS" &&
+OPTS="$GCC_MULTILIB" &&
cd $SOURCE_DIRECTORY.bld &&
-$SOURCE_DIRECTORY/configure \
- --prefix=${INSTALL_ROOT}/usr \
- --infodir=${INSTALL_ROOT}/usr/share/info \
- --mandir=${INSTALL_ROOT}/usr/share/man \
- --enable-threads=posix \
- --enable-languages=$(echo ${GCC_COMPILER} | tr " " ",") \
- --with-bugurl=http://bugs.sourcemage.org \
- --enable-bootstrap \
- --enable-checking=release \
- $GCC_MULTILIB $OPTS &&
+$SOURCE_DIRECTORY/configure $OPTS &&
if [[ "$GCC_TARGET" == "profiledbootstrap" ]] ||
[[ "$GCC_TARGET" == "profiledbootstrap-lean" ]] ; then
diff --git a/gnu/gcc/CONFIGURE b/gnu/gcc/CONFIGURE
index 687f348a8c..24460d16b4 100755
--- a/gnu/gcc/CONFIGURE
+++ b/gnu/gcc/CONFIGURE
@@ -11,4 +11,6 @@ config_query_list GCC_TARGET "Select what build to use" \
if list_find "$GCC_COMPILER" "java" ; then
config_query GCJ_AWT "Do you want support for AWT (requires gtk+2 and libart_lgpl)?" n &&
config_query_option GCJ_HOME "Add JDK Tree emulation?" n "--enable-java-home" ""
-fi
+fi &&
+
+config_query GCC_CLOOG "Use cloog loop vectorizer?" y
diff --git a/gnu/gcc/DEPENDS b/gnu/gcc/DEPENDS
index e91a490e56..b7a944f132 100755
--- a/gnu/gcc/DEPENDS
+++ b/gnu/gcc/DEPENDS
@@ -20,15 +20,6 @@ depends smgl-fhs &&
depends smgl-archspecs &&
depends zlib "--with-system-zlib" &&
-#optional_depends cloog-ppl \
-# "--with-cloog --disable-cloog-version-check" \
-# "--without-cloog" \
-# "use Graphite high-level memory optimizations?" &&
-#if is_depends_enabled $SPELL cloog-ppl ; then
-# depends ppl "--with-ppl --enable-cloog-backend=ppl"
-#fi &&
-
-
optional_depends gettext \
"--enable-nls" \
"--disable-nls" \
diff --git a/gnu/gcc/DETAILS b/gnu/gcc/DETAILS
index 4ef0261cf9..62e3ac5e92 100755
--- a/gnu/gcc/DETAILS
+++ b/gnu/gcc/DETAILS
@@ -11,6 +11,18 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
SOURCE2_IGNORE=signature
+if [[ "$GCC_CLOOG" == "y" ]]; then
+ CLOOG_VERSION=0.18.1
+ SOURCE3=cloog-${CLOOG_VERSION}.tar.gz
+ SOURCE3_URL[0]=ftp://gcc.gnu.org/pub/gcc/infrastructure/${SOURCE3}
+ SOURCE3_HASH=sha512:0b12d9f3c39a2425e28e1d7c0a2b3787287fe3e6e3052f094d2ab6cffeb205ce19044100cbfd805659b3e6b3d21ac2f5a3c92848f476de54edfe6b1cbd2172e9
+
+ ISL_VERSION=0.12.2
+ SOURCE4=isl-${ISL_VERSION}.tar.bz2
+ SOURCE4_URL[0]=ftp://gcc.gnu.org/pub/gcc/infrastructure/${SOURCE4}
+ SOURCE4_HASH=sha512:b5dea4d6b504fac22f2d8cd9c47d6896994d3966635a514d45010243db44cfbc009574b808f3587f35d91de629110bc11b52941d4075e21f8646c59656e62aea
+fi
+
if list_find "$GCC_COMPILER" "java"; then
SOURCE5=ecj-$(echo $VERSION|cut -f1,2 -d.).jar
SOURCE5_URL[0]=ftp://sourceware.org/pub/java/${SOURCE5}
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 841e92502c..409f0c935c 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -12,6 +12,8 @@
gcc-4.9-tree-ssa-threadedge.patch: add bugfixes from upstream
* DETAILS: use gcc 4.9 based ada bootstrapper for x86_64
* BUILD, DETAILS, PRE_BUILD: download and use ecj.jar
+ * BUILD, CONFIGURE, DEPENDS, DETAILS, PRE_BUILD:
+ add option for building the cloog-isl optimizer
2014-04-29 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: version 4.9.0
diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD
index f0b8c31107..fee0ffa8b0 100755
--- a/gnu/gcc/PRE_BUILD
+++ b/gnu/gcc/PRE_BUILD
@@ -22,6 +22,15 @@ if list_find "$GCC_COMPILER" "ada" ; then
#
fi &&
+cd ${SOURCE_DIRECTORY} &&
+
+if [[ "$GCC_CLOOG" == "y" ]]; then
+ unpack_file 3 &&
+ mv cloog-${CLOOG_VERSION} cloog &&
+ unpack_file 4 &&
+ mv isl-${ISL_VERSION} isl
+fi
+
if list_find "$GCC_COMPILER" "java"; then
cp ${SOURCE_CACHE}/${SOURCE5} ${SOURCE_DIRECTORY}/ecj.jar
fi &&