From 7cab98010149c5fe49e601dc0e6cad115aec0cb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nagy=20K=C3=A1roly=20G=C3=A1briel?= Date: Mon, 25 Apr 2016 19:50:21 +0300 Subject: [PATCH] gcc: reimplemented Graphite and *at_exit --- base/gcc/gcc.conf | 24 +++++++++++++++++++++++- base/gcc/gcc.desc | 1 - 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/base/gcc/gcc.conf b/base/gcc/gcc.conf index 8f14fc0e9..b2666b218 100644 --- a/base/gcc/gcc.conf +++ b/base/gcc/gcc.conf @@ -75,7 +75,16 @@ hook_add preconf 5 "mkdir -p objdir; cd objdir" configscript="../configure" -var_append confopt ' ' "--enable-__cxa_atexit" +# See http://gcc.gnu.org/gcc-3.2/c++-abi.html +# and http://www.codesourcery.com/cxx-abi/. +if [ "$SDECFG_CROSSBUILD" = 1 ]; then + # FIXME: stage 1 c++ packages fail if this is enabled + var_append confopt ' ' "--disable-__cxa_atexit" +elif [ "$arch_machine" != "i386" ]; then + var_append confopt ' ' "--enable-__cxa_atexit" +else + var_append confopt ' ' "--disable-__cxa_atexit" +fi # we might build a SVN or prereleases, disable checking var_append confopt ' ' '--disable-checking' @@ -174,6 +183,19 @@ libstdcpp_build() { configscript=../configure } +# Graphite loop optimization +if pkginstalled -f cloog && pkginstalled -f ppl; then + # use the cloog-isl backend + var_append extraconfopt ' ' "--enable-cloog-backend=isl" + var_append extraconfopt ' ' "--with-cloog=$( pkgprefix -r cloog )" + var_append extraconfopt ' ' "--with-cloog-lib=$( pkgprefix -r libdir cloog )" + var_append extraconfopt ' ' "--with-cloog-include=$( pkgprefix -r includedir cloog )" + # even when using the cloog-isl backend ppl is still needed to build gcc + var_append extraconfopt ' ' "--with-ppl=$( pkgprefix -r ppl )" + var_append extraconfopt ' ' "--with-ppl-lib=$( pkgprefix -r libdir ppl )" + var_append extraconfopt ' ' "--with-ppl-include=$( pkgprefix -r includedir ppl )" +fi + if atstage cross; then # for gcc versions 4.3 and upwards we have to explicitely specifiy the # target architecture at cross-compiling stage diff --git a/base/gcc/gcc.desc b/base/gcc/gcc.desc index f0b7cea0d..caf90890b 100644 --- a/base/gcc/gcc.desc +++ b/base/gcc/gcc.desc @@ -39,5 +39,4 @@ [P] X 012--5---9 102.300 [D] 1408594922 gcc-5-20160209.tar.bz2 ftp://gcc.gnu.org/pub/gcc/snapshots/5-20160209/ -[D] 2750021927 isl-0.14.tar.bz2 ftp://gcc.gnu.org/pub/gcc/infrastructure/ [D] 271646925 ecj-4.5.jar ftp://sourceware.org/pub/java/