From owner-svn-ports-all@FreeBSD.ORG Wed Jul 9 20:38:07 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7880674D; Wed, 9 Jul 2014 20:38:07 +0000 (UTC) Received: from mouf.net (mouf.net [IPv6:2607:fc50:0:4400:216:3eff:fe69:33b3]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mouf.net", Issuer "mouf.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 22CC1272C; Wed, 9 Jul 2014 20:38:07 +0000 (UTC) Received: from mouf.net (swills@mouf [199.48.129.64]) by mouf.net (8.14.5/8.14.5) with ESMTP id s69KbuF1059923 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 9 Jul 2014 20:38:02 GMT (envelope-from swills@mouf.net) Received: (from swills@localhost) by mouf.net (8.14.5/8.14.5/Submit) id s69Kbu3e059922; Wed, 9 Jul 2014 20:37:56 GMT (envelope-from swills) Date: Wed, 9 Jul 2014 20:37:56 +0000 From: Steve Wills To: "Lev A. Serebryakov" Subject: Re: svn commit: r361360 - in head/devel/gcc-arm-embedded: . files Message-ID: <20140709203752.GA59796@mouf.net> References: <201407091229.s69CT9K8071306@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="82I3+IH0IqGh5yIs" Content-Disposition: inline In-Reply-To: <201407091229.s69CT9K8071306@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (mouf.net [199.48.129.64]); Wed, 09 Jul 2014 20:38:02 +0000 (UTC) X-Spam-Status: No, score=0.0 required=4.5 tests=none autolearn=unavailable version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mouf.net X-Virus-Scanned: clamav-milter 0.98.1 at mouf.net X-Virus-Status: Clean Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jul 2014 20:38:07 -0000 --82I3+IH0IqGh5yIs Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, FYI: https://jenkins.freebsd.org/pci/head-amd64/poudriere/data/headamd64-default= /628/logs/errors/gcc-arm-embedded-4.8.20140609_1.log Looks like it's building, but not outputing anything because it's logging it all, and poudriere's timeout is kicking in. Is there a way to change that? Thanks, Steve On Wed, Jul 09, 2014 at 12:29:09PM +0000, Lev A. Serebryakov wrote: > Author: lev > Date: Wed Jul 9 12:29:08 2014 > New Revision: 361360 > URL: http://svnweb.freebsd.org/changeset/ports/361360 > QAT: https://qat.redports.org/buildarchive/r361360/ >=20 > Log: > (1) Add fix to build with devel/isl 0.13 > (2) Add option PURE (default OFF) to build with all provided libraries= and > skip any external dependencies, to make complete repeatable build. >=20 > Added: > head/devel/gcc-arm-embedded/files/extra-patch-gcc-isl-0.13-compatibilit= y (contents, props changed) > Modified: > head/devel/gcc-arm-embedded/Makefile > head/devel/gcc-arm-embedded/files/Makefile >=20 > Modified: head/devel/gcc-arm-embedded/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/devel/gcc-arm-embedded/Makefile Wed Jul 9 12:12:44 2014 (r36135= 9) > +++ head/devel/gcc-arm-embedded/Makefile Wed Jul 9 12:29:08 2014 (r36136= 0) > @@ -13,17 +13,22 @@ COMMENT=3D Complete gcc-based toolcahin fo > LICENSE=3D GPLv2 LGPL20 LGPL21 GPLv3 LGPL3 > LICENSE_COMB=3D multi > =20 > -LIB_DEPENDS=3D libgmp.so:${PORTSDIR}/math/gmp \ > - libmpfr.so:${PORTSDIR}/math/mpfr \ > - libmpc.so:${PORTSDIR}/math/mpc \ > - libcloog-isl.so:${PORTSDIR}/math/cloog \ > - libelf.so:${PORTSDIR}/devel/libelf > - > -OPTIONS_DEFINE=3D EXAMPLES HTML PDF > +OPTIONS_DEFINE=3D PURE EXAMPLES HTML PDF > OPTIONS_DEFAULT=3DEXAMPLES > +PURE_DESC=3D Use all libraries from bundle, do not depend on anything > HTML_DESC=3D Install HTML documentation > PDF_DESC=3D Install PDF documentation (requires TeX, it is huge) > =20 > +PURE_EXTRA_PATCHES_OFF=3D ${PATCHDIR}/extra-patch-gcc-isl-0.13-compatibi= lity > +PURE_LIB_DEPENDS_OFF=3D \ > + libexpat.so:${PORTSDIR}/textproc/expat2 \ > + libgmp.so:${PORTSDIR}/math/gmp \ > + libmpfr.so:${PORTSDIR}/math/mpfr \ > + libmpc.so:${PORTSDIR}/math/mpc \ > + libisl.so:${PORTSDIR}/devel/isl \ > + libcloog-isl.so:${PORTSDIR}/math/cloog \ > + libelf.so:${PORTSDIR}/devel/libelf > + > PDF_USE=3D TEX=3Dbase:build,tex:build > PDF_BUILD_DEPENDS=3D texi2dvi:${PORTSDIR}/print/texinfo > OPTIONS_SUB=3D yes > @@ -31,6 +36,8 @@ OPTIONS_SUB=3D yes > USES=3D bison compiler gmake iconv makeinfo tar:bzip2 > GNU_CONFIGURE=3D yes > =20 > +PATCH_WRKSRC=3D ${WRKDIR}/${ORIGINAL_PACKAGE_NAME} > + > BUILD_WRKSRC=3D ${WRKDIR} > =20 > FULL_VERSION=3D 4_8-2014q2-20140609 > @@ -50,21 +57,41 @@ PLIST_SUB+=3D TARGET=3D${TARGET} FULL_VERSIO > DOCS_SUFFIX=3D share/doc/gcc-${TARGET} > SRC_DIR=3D ${WRKDIR}/${ORIGINAL_PACKAGE_NAME}/src > BUILD_DIR=3D ${WRKDIR}/build > -INTERIM_PREFIX=3D ${WRKDIR}/install/${PORTNAME}-${FULL_VERSION} > +INTERIM_WORLD=3D ${WRKDIR}/install > +INTERIM_PREFIX=3D ${INTERIM_WORLD}/${PORTNAME}-${FULL_VERSION} > + > +BUNDLED_LIBS=3D EXPAT:gz ZLIB:bz2 LIBELF:gz \ > + GMP:bz2 MPFR:bz2 MPC:gz ISL:bz2 CLOOG:gz > +BUNDLED_VERSION_EXPAT=3D 2.0.1 > +BUNDLED_VERSION_ZLIB=3D 1.2.5 > +BUNDLED_VERSION_LIBELF=3D 0.8.13 > +BUNDLED_VERSION_GMP=3D 4.3.2 > +BUNDLED_VERSION_MPFR=3D 2.4.2 > +BUNDLED_VERSION_MPC=3D 0.8.1 > +BUNDLED_VERSION_ISL=3D 0.11.1 > +BUNDLED_VERSION_CLOOG=3D 0.18.0 > + > =20 > VAR_TO_SUBMAKE=3D BUILD_DIR CC CFLAGS CHOSEN_COMPILER_TYPE CONFIG_SITE \ > CONFIGURE_MAX_CMD_LEN CP CPP CPPFLAGS CXX CXXFLAGS \ > DOCS_SUFFIX ECHO_MSG EXAMPLESDIR FILE FIND GMAKE GREP \ > - MAKE_CMD \ > - INSTALL_MACROS INTERIM_PREFIX LD LDFLAGS LIBDIR LN LOCALBASE \ > - MAKE_JOBS_NUMBER MKDIR ORIGINAL_PACKAGE_NAME PORT_OPTIONS \ > - PREFIX RM SED SH SRC_DIR STRIP_CMD TAR TARGET WRKDIR > + MAKE_CMD PATCH \ > + INSTALL_MACROS INTERIM_PREFIX INTERIM_WORLD LD LDFLAGS LIBDIR \ > + LN LOCALBASE MAKE_JOBS_NUMBER MKDIR ORIGINAL_PACKAGE_NAME \ > + PORT_OPTIONS PREFIX RM SED SH SRC_DIR STRIP_CMD TAR TARGET \ > + WRKDIR > =20 > VAR_TO_SUBMAKE_NOEXPAND=3D CONFIGURE_ENV MAKE_ENV > =20 > .include > =20 > post-extract: > +.if ${PORT_OPTIONS:MPURE} > +.for L in ${BUNDLED_LIBS} > + @${ECHO_MSG} "=3D=3D=3D=3D> Extracting bundled ${L:C/[:].+//:tl}" > + @${TAR} -xf ${SRC_DIR}/${L:C/[:].+//:tl}-${BUNDLED_VERSION_${L:C/[:].+/= /}}.tar.${L:C/.+[:]//} -C ${SRC_DIR} > +.endfor > +.endif > @${ECHO_MSG} "=3D=3D=3D=3D> Extracting bundled binutils" > @${TAR} -xf ${SRC_DIR}/binutils.tar.bz2 -C ${SRC_DIR} > @${ECHO_MSG} "=3D=3D=3D=3D> Extracting bundled gcc" > @@ -88,6 +115,10 @@ do-configure: > .for VAR in ${VAR_TO_SUBMAKE} > @${ECHO} '${VAR}=3D${${VAR}}' >> ${WRKDIR}/Makefile.inc > .endfor > +.for L in ${BUNDLED_LIBS} > + @${ECHO} -n 'BUNDLED_VERSION_${L:C/[:].+//}=3D' >> ${WRKDIR}/Makefile= =2Einc > + @${ECHO} '${BUNDLED_VERSION_${L:C/[:].+//}}' >> ${WRKDIR}/Makefile.i= nc > +.endfor > .for VAR in ${VAR_TO_SUBMAKE_NOEXPAND} > @${ECHO} -n '${VAR}=3D' >> ${WRKDIR}/Makefile.= inc > @${MAKE} .MAKE.EXPAND_VARIABLES=3D0 -X -V ${VAR} >> ${WRKDIR}/Makefile.= inc >=20 > Modified: head/devel/gcc-arm-embedded/files/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/devel/gcc-arm-embedded/files/Makefile Wed Jul 9 12:12:44 2014 (= r361359) > +++ head/devel/gcc-arm-embedded/files/Makefile Wed Jul 9 12:29:08 2014 (= r361360) > @@ -8,7 +8,13 @@ PKGVERSION=3D GNU Tools for ARM Embedded P > BUILD_PREFIX=3D ${WRKDIR}/build > DOC_PREFIX=3D ${INTERIM_PREFIX}/${DOCS_SUFFIX} > =20 > -LDFLAGS+=3D -L${LOCALBASE}/lib > +.if ${PORT_OPTIONS:MPURE} > +WORLD_LIB=3D${INTERIM_WORLD} > +.else > +WORLD_LIB=3D${LOCALBASE} > +.endif > + > +LDFLAGS+=3D -L${WORLD_LIB}/lib > =20 > .if ${CHOSEN_COMPILER_TYPE} =3D=3D clang > CFLAGS+=3D -Wno-error > @@ -17,6 +23,21 @@ CXXFLAGS+=3D -Wno-error > =20 > MISC_DOCS=3D license.txt readme.txt release.txt > =20 > +.if ${PORT_OPTIONS:MPURE} > +PREREQUISITES=3D expat \ > + zlib \ > + libelf \ > + gmp \ > + mpfr \ > + mpc \ > + isl \ > + cloog > +ISL_CHECK_VERSION=3D > +.else > +PREREQUISITES=3D > +ISL_CHECK_VERSION=3D --disable-isl-version-check > +.endif > + > ALL_BUILD=3D build-binutils \ > build-gcc-first \ > build-newlib \ > @@ -30,9 +51,141 @@ ALL_BUILD=3D build-binutils \ > strip-binaries \ > strip-target-libraries > =20 > -.PHONY: ${ALL_BUILD} > +.PHONY: ${PREREQUISITES} ${ALL_BUILD} > + > +all: ${PREREQUISITES} ${ALL_BUILD} > + > +expat: > + @${ECHO_MSG} "=3D=3D=3D=3D> Build expat (log file: ${WRKDIR}/expat.log= )" > + @${RM} -rf ${BUILD_PREFIX}/expat > ${WRKDIR}/expat.log 2>&1 > + @${MKDIR} ${BUILD_PREFIX}/expat >> ${WRKDIR}/expat.log 2>&1 > + @${ECHO_MSG} "=3D=3D=3D=3D=3D> Configure" > + @cd ${BUILD_PREFIX}/expat && \ > + ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/expat-${BUNDLED_VERSION_EXPAT}= /configure \ > + --prefix=3D${INTERIM_WORLD} \ > + --disable-shared \ > + --disable-nls >> ${WRKDIR}/expat.log 2>&1 > + @${ECHO_MSG} "=3D=3D=3D=3D=3D> Build" > + @${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/expat= all >> ${WRKDIR}/expat.log 2>&1 > + @${ECHO_MSG} "=3D=3D=3D=3D=3D> Install into intermediate directory" > + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/expat install >> ${WRKDIR}/= expat.log 2>&1 > =20 > -all: ${ALL_BUILD} > +zlib: > + @${ECHO_MSG} "=3D=3D=3D=3D> Build zlib (log file: ${WRKDIR}/zlib.log)" > + @${RM} -rf ${BUILD_PREFIX}/zlib > ${WRKDIR}/zlib.log 2>&1 > + @${MKDIR} ${BUILD_PREFIX}/zlib >> ${WRKDIR}/zlib.log 2>&1 > + @${ECHO_MSG} "=3D=3D=3D=3D=3D> Copy to build dir" > + @${TAR} -cf - -C ${SRC_DIR}/zlib-${BUNDLED_VERSION_ZLIB} . | ${TAR} -xf= - -C ${BUILD_PREFIX}/zlib >> ${WRKDIR}/zlib.log 2>&1 > + @${ECHO_MSG} "=3D=3D=3D=3D=3D> Patch" > + @cd ${BUILD_PREFIX}/zlib && \ > + ${PATCH} -p1 < ${SRC_DIR}/zlib-${BUNDLED_VERSION_ZLIB}.patch >> ${WRKD= IR}/zlib.log 2>&1 > + @${ECHO_MSG} "=3D=3D=3D=3D=3D> Configure" > + @cd ${BUILD_PREFIX}/zlib && \ > + ${MAKE_ENV} ${CONFIGURE_ENV} ./configure \ > + --static \ > + --prefix=3D${INTERIM_WORLD} >> ${WRKDIR}/zlib.log 2>&1 > + @${ECHO_MSG} "=3D=3D=3D=3D=3D> Build" > + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/zlib >> ${WRKDIR}/zlib.log = 2>&1 > + @${ECHO_MSG} "=3D=3D=3D=3D=3D> Install into intermediate directory" > + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/zlib install >> ${WRKDIR}/z= lib.log 2>&1 > + > +libelf: > + @${ECHO_MSG} "=3D=3D=3D=3D> Build libelf (log file: ${WRKDIR}/libelf.l= og)" > + @${RM} -rf ${BUILD_PREFIX}/libelf > ${WRKDIR}/libelf.log 2>&1 > + @${MKDIR} ${BUILD_PREFIX}/libelf >> ${WRKDIR}/libelf.log 2>&1 > + @${ECHO_MSG} "=3D=3D=3D=3D=3D> Configure" > + @cd ${BUILD_PREFIX}/libelf && \ > + ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/libelf-${BUNDLED_VERSION_LIBEL= F}/configure \ > + --prefix=3D${INTERIM_WORLD} \ > + --disable-shared \ > + --disable-nls >> ${WRKDIR}/libelf.log 2>&1 > + @${ECHO_MSG} "=3D=3D=3D=3D=3D> Build" > + @${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/libel= f all >> ${WRKDIR}/libelf.log 2>&1 > + @${ECHO_MSG} "=3D=3D=3D=3D=3D> Install into intermediate directory" > + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/libelf install >> ${WRKDIR}= /libelf.log 2>&1 > + > +gmp: > + @${ECHO_MSG} "=3D=3D=3D=3D> Build gmp (log file: ${WRKDIR}/gmp.log)" > + @${RM} -rf ${BUILD_PREFIX}/gmp > ${WRKDIR}/gmp.log 2>&1 > + @${MKDIR} ${BUILD_PREFIX}/gmp >> ${WRKDIR}/gmp.log 2>&1 > + @${ECHO_MSG} "=3D=3D=3D=3D=3D> Configure" > + @cd ${BUILD_PREFIX}/gmp && \ > + ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/gmp-${BUNDLED_VERSION_GMP}/con= figure \ > + --prefix=3D${INTERIM_WORLD} \ > + --enable-cxx \ > + --disable-shared \ > + --disable-nls >> ${WRKDIR}/gmp.log 2>&1 > + @${ECHO_MSG} "=3D=3D=3D=3D=3D> Build" > + @${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/gmp a= ll >> ${WRKDIR}/gmp.log 2>&1 > + @${ECHO_MSG} "=3D=3D=3D=3D=3D> Install into intermediate directory" > + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/gmp install >> ${WRKDIR}/gm= p.log 2>&1 > + > +mpfr: > + @${ECHO_MSG} "=3D=3D=3D=3D> Build mpfr (log file: ${WRKDIR}/mpfr.log)" > + @${RM} -rf ${BUILD_PREFIX}/mpfr > ${WRKDIR}/mpfr.log 2>&1 > + @${MKDIR} ${BUILD_PREFIX}/mpfr >> ${WRKDIR}/mpfr.log 2>&1 > + @${ECHO_MSG} "=3D=3D=3D=3D=3D> Configure" > + @cd ${BUILD_PREFIX}/mpfr && \ > + ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/mpfr-${BUNDLED_VERSION_MPFR}/c= onfigure \ > + --prefix=3D${INTERIM_WORLD} \ > + --with-gmp=3D${INTERIM_WORLD} \ > + --disable-shared \ > + --disable-nls >> ${WRKDIR}/mpfr.log 2>&1 > + @${ECHO_MSG} "=3D=3D=3D=3D=3D> Build" > + @${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/mpfr = all >> ${WRKDIR}/mpfr.log 2>&1 > + @${ECHO_MSG} "=3D=3D=3D=3D=3D> Install into intermediate directory" > + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/mpfr install >> ${WRKDIR}/m= pfr.log 2>&1 > + > +mpc: > + @${ECHO_MSG} "=3D=3D=3D=3D> Build mpc (log file: ${WRKDIR}/mpc.log)" > + @${RM} -rf ${BUILD_PREFIX}/mpc > ${WRKDIR}/mpc.log 2>&1 > + @${MKDIR} ${BUILD_PREFIX}/mpc >> ${WRKDIR}/mpc.log 2>&1 > + @${ECHO_MSG} "=3D=3D=3D=3D=3D> Configure" > + @cd ${BUILD_PREFIX}/mpc && \ > + ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/mpc-${BUNDLED_VERSION_MPC}/con= figure \ > + --prefix=3D${INTERIM_WORLD} \ > + --with-gmp=3D${INTERIM_WORLD} \ > + --with-mpfr=3D${INTERIM_WORLD} \ > + --disable-shared \ > + --disable-nls >> ${WRKDIR}/mpc.log 2>&1 > + @${ECHO_MSG} "=3D=3D=3D=3D=3D> Build" > + @${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/mpc a= ll >> ${WRKDIR}/mpc.log 2>&1 > + @${ECHO_MSG} "=3D=3D=3D=3D=3D> Install into intermediate directory" > + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/mpc install >> ${WRKDIR}/mp= c.log 2>&1 > + > +isl: > + @${ECHO_MSG} "=3D=3D=3D=3D> Build isl (log file: ${WRKDIR}/isl.log)" > + @${RM} -rf ${BUILD_PREFIX}/isl > ${WRKDIR}/isl.log 2>&1 > + @${MKDIR} ${BUILD_PREFIX}/isl >> ${WRKDIR}/isl.log 2>&1 > + @${ECHO_MSG} "=3D=3D=3D=3D=3D> Configure" > + @cd ${BUILD_PREFIX}/isl && \ > + ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/isl-${BUNDLED_VERSION_ISL}/con= figure \ > + --prefix=3D${INTERIM_WORLD} \ > + --with-gmp-prefix=3D${INTERIM_WORLD} \ > + --disable-shared \ > + --disable-nls >> ${WRKDIR}/isl.log 2>&1 > + @${ECHO_MSG} "=3D=3D=3D=3D=3D> Build" > + @${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/isl a= ll >> ${WRKDIR}/isl.log 2>&1 > + @${ECHO_MSG} "=3D=3D=3D=3D=3D> Install into intermediate directory" > + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/isl install >> ${WRKDIR}/is= l.log 2>&1 > + > +cloog: > + @${ECHO_MSG} "=3D=3D=3D=3D> Build cloog (log file: ${WRKDIR}/cloog.log= )" > + @${RM} -rf ${BUILD_PREFIX}/cloog > ${WRKDIR}/cloog.log 2>&1 > + @${MKDIR} ${BUILD_PREFIX}/cloog >> ${WRKDIR}/cloog.log 2>&1 > + @${ECHO_MSG} "=3D=3D=3D=3D=3D> Configure" > + @cd ${BUILD_PREFIX}/cloog && \ > + ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/cloog-${BUNDLED_VERSION_CLOOG}= /configure \ > + --prefix=3D${INTERIM_WORLD} \ > + --with-bits=3Dgmp \ > + --with-gmp-prefix=3D${INTERIM_WORLD} \ > + --with-isl-prefix=3D${INTERIM_WORLD} \ > + --disable-shared \ > + --disable-nls >> ${WRKDIR}/cloog.log 2>&1 > + @${ECHO_MSG} "=3D=3D=3D=3D=3D> Build" > + @${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/cloog= all >> ${WRKDIR}/cloog.log 2>&1 > + @${ECHO_MSG} "=3D=3D=3D=3D=3D> Install into intermediate directory" > + @${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/cloog install >> ${WRKDIR}/= cloog.log 2>&1 > =20 > build-binutils: > @${ECHO_MSG} "=3D=3D=3D=3D> Build binutils (log file: ${WRKDIR}/binuti= ls.log)" > @@ -87,13 +240,13 @@ build-gcc-first: > --htmldir=3D${DOC_PREFIX}/html \ > --pdfdir=3D${DOC_PREFIX}/pdf \ > --libexecdir=3D${INTERIM_PREFIX}/lib \ > - --with-gmp=3D${LOCALBASE} \ > - --with-mpfr=3D${LOCALBASE} \ > - --with-mpc=3D${LOCALBASE} \ > - --with-isl=3D${LOCALBASE} \ > - --disable-isl-version-check \ > - --with-cloog=3D${LOCALBASE} \ > - --with-libelf=3D${LOCALBASE} \ > + --with-gmp=3D${WORLD_LIB} \ > + --with-mpfr=3D${WORLD_LIB} \ > + --with-mpc=3D${WORLD_LIB} \ > + --with-isl=3D${WORLD_LIB} \ > + ${ISL_CHECK_VERSION} \ > + --with-cloog=3D${WORLD_LIB} \ > + --with-libelf=3D${WORLD_LIB} \ > --enable-languages=3Dc \ > --disable-decimal-float \ > --disable-libffi \ > @@ -207,13 +360,13 @@ build-gcc-final: > --htmldir=3D${DOC_PREFIX}/html \ > --pdfdir=3D${DOC_PREFIX}/pdf \ > --libexecdir=3D${INTERIM_PREFIX}/lib \ > - --with-gmp=3D${LOCALBASE} \ > - --with-mpfr=3D${LOCALBASE} \ > - --with-mpc=3D${LOCALBASE} \ > - --with-isl=3D${LOCALBASE} \ > - --disable-isl-version-check \ > - --with-cloog=3D${LOCALBASE} \ > - --with-libelf=3D${LOCALBASE} \ > + --with-gmp=3D${WORLD_LIB} \ > + --with-mpfr=3D${WORLD_LIB} \ > + --with-mpc=3D${WORLD_LIB} \ > + --with-isl=3D${WORLD_LIB} \ > + ${ISL_CHECK_VERSION} \ > + --with-cloog=3D${WORLD_LIB} \ > + --with-libelf=3D${WORLD_LIB} \ > --enable-languages=3Dc,c++ \ > --enable-plugins \ > --disable-decimal-float \ > @@ -268,7 +421,7 @@ build-gcc-plugins: > src_files=3D$$(${FIND} $${plugin_dir} -name \*.c -or -name \*.cc) &&= \ > ${ECHO_MSG} "=3D=3D=3D=3D=3D> Build plugin $${plugin_name} from $${= src_files}" && \ > ${ECHO_MSG} "Build plugin $${plugin_name} from $${src_files}" >> ${W= RKDIR}/gcc-plugins.log && \ > - ${CXX} ${CXXFLAGS} ${CPPFLAGS} -fPIC -fno-rtti -O2 -shared -I$${plug= in_target_dir}/include -I${LOCALBASE}/include $${src_files} \ > + ${CXX} ${CXXFLAGS} ${CPPFLAGS} -fPIC -fno-rtti -O2 -shared -I$${plug= in_target_dir}/include -I${WORLD_LIB}/include $${src_files} \ > -o $${plugin_target_dir}/$${plugin_name}.so >> ${WRKDIR}/gcc-plugin= s.log 2>&1 ; \ > done > =20 > @@ -287,13 +440,13 @@ build-libstdcxx: > --mandir=3D${DOC_PREFIX}/man \ > --htmldir=3D${DOC_PREFIX}/html \ > --pdfdir=3D${DOC_PREFIX}/pdf \ > - --with-gmp=3D${LOCALBASE} \ > - --with-mpfr=3D${LOCALBASE} \ > - --with-mpc=3D${LOCALBASE} \ > - --with-isl=3D${LOCALBASE} \ > - --disable-isl-version-check \ > - --with-cloog=3D${LOCALBASE} \ > - --with-libelf=3D${LOCALBASE} \ > + --with-gmp=3D${WORLD_LIB} \ > + --with-mpfr=3D${WORLD_LIB} \ > + --with-mpc=3D${WORLD_LIB} \ > + --with-isl=3D${WORLD_LIB} \ > + ${ISL_CHECK_VERSION} \ > + --with-cloog=3D${WORLD_LIB} \ > + --with-libelf=3D${WORLD_LIB} \ > --enable-languages=3Dc,c++ \ > --disable-decimal-float \ > --disable-libffi \ > @@ -345,7 +498,7 @@ build-gdb: > --disable-nls \ > --disable-sim \ > --with-libexpat \ > - --with-libexpat-prefix=3D${LOCALBASE} \ > + --with-libexpat-prefix=3D${WORLD_LIB} \ > --with-python=3Dno \ > --with-system-gdbinit=3D${INTERIM_PREFIX}/xxxx/${TARGET}/lib/gdbinit \ > --with-lzma=3Dno \ >=20 > Added: head/devel/gcc-arm-embedded/files/extra-patch-gcc-isl-0.13-compati= bility > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/devel/gcc-arm-embedded/files/extra-patch-gcc-isl-0.13-compatibil= ity Wed Jul 9 12:29:08 2014 (r361360) > @@ -0,0 +1,457 @@ > +diff -ruN src/gcc.orig/gcc/graphite-clast-to-gimple.c src/gcc/gcc/graphi= te-clast-to-gimple.c > +--- src/gcc.orig/gcc/graphite-clast-to-gimple.c 2014-07-08 14:47:19.0000= 00000 +0400 > ++++ src/gcc/gcc/graphite-clast-to-gimple.c 2014-07-08 14:49:57.000000000= +0400 > +@@ -28,6 +28,8 @@ > + #include > + #include > + #include > ++#include > ++#include > + #include > + #include > + #endif > +@@ -851,18 +853,18 @@ > + static void > + compute_bounds_for_param (scop_p scop, int param, mpz_t low, mpz_t up) > + { > +- isl_int v; > ++ isl_val *v; > + isl_aff *aff =3D isl_aff_zero_on_domain > + (isl_local_space_from_space (isl_set_get_space (scop->context))); > +=20 > + aff =3D isl_aff_add_coefficient_si (aff, isl_dim_param, param, 1); > +=20 > +- isl_int_init (v); > +- isl_set_min (scop->context, aff, &v); > +- isl_int_get_gmp (v, low); > +- isl_set_max (scop->context, aff, &v); > +- isl_int_get_gmp (v, up); > +- isl_int_clear (v); > ++ v =3D isl_set_min_val (scop->context, aff); > ++ isl_val_get_num_gmp (v, low); > ++ isl_val_free (v); > ++ v =3D isl_set_max_val (scop->context, aff); > ++ isl_val_get_num_gmp (v, up); > ++ isl_val_free (v); > + isl_aff_free (aff); > + } > +=20 > +@@ -881,8 +883,7 @@ > + isl_set *domain; > + isl_aff *dimension; > + isl_local_space *local_space; > +- isl_int isl_value; > +- enum isl_lp_result lp_result; > ++ isl_val *isl_value; > +=20 > + domain =3D isl_set_copy (isl_set_from_cloog_domain (loop->domain)); > + local_space =3D isl_local_space_from_space (isl_set_get_space (domain= )); > +@@ -891,17 +892,12 @@ > + isl_set_dim (domain, isl_dim_set) - 1, > + 1); > +=20 > +- isl_int_init (isl_value); > +- > +- lp_result =3D isl_set_min (domain, dimension, &isl_value); > +- assert (lp_result =3D=3D isl_lp_ok); > +- isl_int_get_gmp (isl_value, low); > +- > +- lp_result =3D isl_set_max (domain, dimension, &isl_value); > +- assert (lp_result =3D=3D isl_lp_ok); > +- isl_int_get_gmp (isl_value, up); > +- > +- isl_int_clear (isl_value); > ++ isl_value =3D isl_set_min_val (domain, dimension); > ++ isl_val_get_num_gmp (isl_value, low); > ++ isl_val_free (isl_value); > ++ isl_value =3D isl_set_max_val (domain, dimension); > ++ isl_val_get_num_gmp (isl_value, up); > ++ isl_val_free (isl_value); > + isl_set_free (domain); > + isl_aff_free (dimension); > + } > +diff -ruN src/gcc.orig/gcc/graphite-interchange.c src/gcc/gcc/graphite-i= nterchange.c > +--- src/gcc.orig/gcc/graphite-interchange.c 2014-07-08 14:47:20.00000000= 0 +0400 > ++++ src/gcc/gcc/graphite-interchange.c 2014-07-08 14:49:57.000000000 +04= 00 > +@@ -29,6 +29,8 @@ > + #include > + #include > + #include > ++#include > ++#include > + #include > + #include > + #endif > +@@ -71,13 +73,13 @@ > + isl_local_space *ls =3D isl_local_space_from_space (isl_map_get_space= (map)); > + unsigned offset, nsubs; > + int i; > +- isl_int size, subsize; > ++ isl_ctx *ct; > ++ > ++ isl_val *size, *subsize, *size1; > +=20 > + res =3D isl_equality_alloc (ls); > +- isl_int_init (size); > +- isl_int_set_ui (size, 1); > +- isl_int_init (subsize); > +- isl_int_set_ui (subsize, 1); > ++ ct =3D isl_local_space_get_ctx (ls); > ++ size =3D isl_val_int_from_ui (ct, 1); > +=20 > + nsubs =3D isl_set_dim (pdr->extent, isl_dim_set); > + /* -1 for the already included L dimension. */ > +@@ -90,18 +92,17 @@ > + isl_space *dc; > + isl_aff *aff; > +=20 > +- res =3D isl_constraint_set_coefficient (res, isl_dim_out, offset = + i, size); > +- > ++ size1 =3D isl_val_copy (size); > ++ res =3D isl_constraint_set_coefficient_val (res, isl_dim_out, off= set + i, size); > + dc =3D isl_set_get_space (pdr->extent); > + aff =3D isl_aff_zero_on_domain (isl_local_space_from_space (dc)); > + aff =3D isl_aff_set_coefficient_si (aff, isl_dim_in, i, 1); > +- isl_set_max (pdr->extent, aff, &subsize); > ++ subsize =3D isl_set_max_val (pdr->extent, aff); > + isl_aff_free (aff); > +- isl_int_mul (size, size, subsize); > ++ size =3D isl_val_mul (size1, subsize); > + } > +=20 > +- isl_int_clear (subsize); > +- isl_int_clear (size); > ++ isl_val_free (size); > +=20 > + return res; > + } > +@@ -118,7 +119,7 @@ > + isl_aff *aff; > + isl_space *dc; > + isl_constraint *lma, *c; > +- isl_int islstride; > ++ isl_val *islstride; > + graphite_dim_t time_depth; > + unsigned offset, nt; > + unsigned i; > +@@ -231,10 +232,9 @@ > + aff =3D isl_aff_zero_on_domain (isl_local_space_from_space (dc)); > + aff =3D isl_aff_set_coefficient_si (aff, isl_dim_in, offset - 1, -1); > + aff =3D isl_aff_set_coefficient_si (aff, isl_dim_in, offset + offset = - 1, 1); > +- isl_int_init (islstride); > +- isl_set_max (set, aff, &islstride); > +- isl_int_get_gmp (islstride, stride); > +- isl_int_clear (islstride); > ++ islstride =3D isl_set_max_val (set, aff); > ++ isl_val_get_num_gmp (islstride, stride); > ++ isl_val_free (islstride); > + isl_aff_free (aff); > + isl_set_free (set); > +=20 > +diff -ruN src/gcc.orig/gcc/graphite-optimize-isl.c src/gcc/gcc/graphite-= optimize-isl.c > +--- src/gcc.orig/gcc/graphite-optimize-isl.c 2014-07-08 14:47:20.0000000= 00 +0400 > ++++ src/gcc/gcc/graphite-optimize-isl.c 2014-07-08 14:49:57.000000000 +0= 400 > +@@ -252,6 +252,7 @@ > + DimToVectorize can be devided by VectorWidth. The default VectorWidt= h is > + currently constant and not yet target specific. This function does n= ot reason > + about parallelism. */ > ++ > + static isl_map * > + getPrevectorMap(isl_ctx *ctx, int DimToVectorize, > + int ScheduleDimensions, > +@@ -265,8 +266,9 @@ > + isl_aff *Aff; > + int PointDimension; /* ip */ > + int TileDimension; /* it */ > +- isl_int VectorWidthMP; > ++ isl_val *VectorWidthMP; > + int i; > ++ isl_ctx *ct; > +=20 > + /* assert (0 <=3D DimToVectorize && DimToVectorize < ScheduleDimensio= ns);*/ > +=20 > +@@ -296,10 +298,10 @@ > + Aff =3D isl_aff_zero_on_domain(LocalSpaceRange); > + Aff =3D isl_aff_set_constant_si(Aff, VectorWidth); > + Aff =3D isl_aff_set_coefficient_si(Aff, isl_dim_in, TileDimension, 1); > +- isl_int_init(VectorWidthMP); > +- isl_int_set_si(VectorWidthMP, VectorWidth); > +- Aff =3D isl_aff_mod(Aff, VectorWidthMP); > +- isl_int_clear(VectorWidthMP); > ++ > ++ ct =3D isl_aff_get_ctx(Aff); > ++ VectorWidthMP =3D isl_val_int_from_si(ct, VectorWidth); > ++ Aff =3D isl_aff_mod_val(Aff, VectorWidthMP); > + Modulo =3D isl_pw_aff_zero_set(isl_pw_aff_from_aff(Aff)); > + TilingMap =3D isl_map_intersect_range(TilingMap, Modulo); > +=20 > +@@ -365,7 +367,7 @@ > + { > + for (i =3D ScheduleDimensions - 1 ; i >=3D 0 ; i--) > + { > +- if (isl_band_member_is_zero_distance(Band, i)) > ++ if (isl_band_member_is_coincident(Band, i)) > + { > + isl_map *TileMap; > + isl_union_map *TileUMap; > +@@ -436,6 +438,7 @@ > + { > +=20 > + isl_schedule *schedule; > ++ isl_schedule_constraints *schedule_constraints; > + isl_union_set *domain; > + isl_union_map *validity, *proximity, *dependences; > + isl_union_map *schedule_map; > +@@ -454,7 +457,14 @@ > + isl_options_set_schedule_maximize_band_depth(scop->ctx, 1); > + isl_options_set_schedule_fuse(scop->ctx, ISL_SCHEDULE_FUSE_MIN); > + isl_options_set_on_error(scop->ctx, ISL_ON_ERROR_CONTINUE); > +- schedule =3D isl_union_set_compute_schedule (domain, validity, proxim= ity); > ++ schedule_constraints =3D isl_schedule_constraints_on_domain(domain); > ++ schedule_constraints =3D > ++ isl_schedule_constraints_set_proximity(schedule_constraints, prox= imity); > ++ schedule_constraints =3D isl_schedule_constraints_set_validity( > ++ schedule_constraints, isl_union_map_copy(validity)); > ++ schedule_constraints =3D > ++ isl_schedule_constraints_set_coincidence(schedule_constraints, va= lidity); > ++ schedule =3D isl_schedule_constraints_compute_schedule(schedule_const= raints); > + isl_options_set_on_error(scop->ctx, ISL_ON_ERROR_ABORT); > +=20 > + if (!schedule) > +diff -ruN src/gcc.orig/gcc/graphite-poly.c src/gcc/gcc/graphite-poly.c > +--- src/gcc.orig/gcc/graphite-poly.c 2014-07-08 14:47:21.000000000 +0400 > ++++ src/gcc/gcc/graphite-poly.c 2014-07-08 14:49:57.000000000 +0400 > +@@ -28,6 +28,8 @@ > + #include > + #include > + #include > ++#include > ++#include > + #include > + #include > + #endif > +@@ -1021,10 +1023,7 @@ > + isl_set *transdomain; > + isl_space *dc; > + isl_aff *aff; > +- isl_int isllb, islub; > +- > +- isl_int_init (isllb); > +- isl_int_init (islub); > ++ isl_val *isllb, *islub; > +=20 > + /* Map the iteration domain through the current scatter, and work > + on the resulting set. */ > +@@ -1038,15 +1037,14 @@ > +=20 > + /* And find the min/max for that function. */ > + /* XXX isl check results? */ > +- isl_set_min (transdomain, aff, &isllb); > +- isl_set_max (transdomain, aff, &islub); > ++ isllb =3D isl_set_min_val (transdomain, aff); > ++ islub =3D isl_set_max_val (transdomain, aff); > +=20 > +- isl_int_sub (islub, islub, isllb); > +- isl_int_add_ui (islub, islub, 1); > +- isl_int_get_gmp (islub, res); > ++ islub =3D isl_val_sub (islub, isllb); > ++ islub =3D isl_val_add_ui (islub, 1); > ++ isl_val_get_num_gmp (islub, res); > +=20 > +- isl_int_clear (isllb); > +- isl_int_clear (islub); > ++ isl_val_free (islub); > + isl_aff_free (aff); > + isl_set_free (transdomain); > + } > +diff -ruN src/gcc.orig/gcc/graphite-sese-to-poly.c src/gcc/gcc/graphite-= sese-to-poly.c > +--- src/gcc.orig/gcc/graphite-sese-to-poly.c 2014-07-08 14:47:19.0000000= 00 +0400 > ++++ src/gcc/gcc/graphite-sese-to-poly.c 2014-07-08 14:49:57.000000000 +0= 400 > +@@ -26,7 +26,8 @@ > + #include > + #include > + #include > +-#include > ++#include > ++#include > + #include > + #include > + #endif > +@@ -46,7 +47,6 @@ > + #include "graphite-poly.h" > + #include "graphite-sese-to-poly.h" > +=20 > +- > + /* Assigns to RES the value of the INTEGER_CST T. */ > +=20 > + static inline void > +@@ -461,13 +461,11 @@ > + int i; > + int nb_iterators =3D pbb_dim_iter_domain (pbb); > + int used_scattering_dimensions =3D nb_iterators * 2 + 1; > +- isl_int val; > ++ isl_val *val; > + isl_space *dc, *dm; > +=20 > + gcc_assert (scattering_dimensions >=3D used_scattering_dimensions); > +=20 > +- isl_int_init (val); > +- > + dc =3D isl_set_get_space (pbb->domain); > + dm =3D isl_space_add_dims (isl_space_from_domain (dc), > + isl_dim_out, scattering_dimensions); > +@@ -481,12 +479,10 @@ > + isl_constraint *c =3D isl_equality_alloc > + (isl_local_space_from_space (isl_map_get_space (pbb->schedule))); > +=20 > +- if (0 !=3D isl_aff_get_coefficient (static_sched, isl_dim_in, > +- i / 2, &val)) > +- gcc_unreachable (); > ++ val =3D isl_aff_get_coefficient_val (static_sched, isl_dim_in, i / 2= ); > +=20 > +- isl_int_neg (val, val); > +- c =3D isl_constraint_set_constant (c, val); > ++ val =3D isl_val_neg (val); > ++ c =3D isl_constraint_set_constant_val (c, val); > + c =3D isl_constraint_set_coefficient_si (c, isl_dim_out, i, 1); > + pbb->schedule =3D isl_map_add_constraint (pbb->schedule, c); > + } > +@@ -500,8 +496,6 @@ > + } > + } > +=20 > +- isl_int_clear (val); > +- > + pbb->transformed =3D isl_map_copy (pbb->schedule); > + } > +=20 > +@@ -681,12 +675,12 @@ > + isl_local_space *ls =3D isl_local_space_from_space (isl_space_copy (s= pace)); > + isl_aff *aff =3D isl_aff_zero_on_domain (ls); > + isl_set *dom =3D isl_set_universe (space); > +- isl_int v; > ++ isl_val *v; > ++ isl_ctx *ct; > +=20 > +- isl_int_init (v); > +- isl_int_set_gmp (v, g); > +- aff =3D isl_aff_add_constant (aff, v); > +- isl_int_clear (v); > ++ ct =3D isl_aff_get_ctx (aff); > ++ v =3D isl_val_int_from_gmp (ct, g); > ++ aff =3D isl_aff_add_constant_val (aff, v); > +=20 > + return isl_pw_aff_alloc (dom, aff); > + } > +@@ -709,18 +703,16 @@ > +=20 > + /* Compute pwaff mod 2^width. */ > +=20 > ++extern isl_ctx *the_isl_ctx; > ++ > + static isl_pw_aff * > + wrap (isl_pw_aff *pwaff, unsigned width) > + { > +- isl_int mod; > +- > +- isl_int_init (mod); > +- isl_int_set_si (mod, 1); > +- isl_int_mul_2exp (mod, mod, width); > +- > +- pwaff =3D isl_pw_aff_mod (pwaff, mod); > ++ isl_val *mod; > +=20 > +- isl_int_clear (mod); > ++ mod =3D isl_val_int_from_ui(the_isl_ctx, width); > ++ mod =3D isl_val_2exp (mod); > ++ pwaff =3D isl_pw_aff_mod_val (pwaff, mod); > +=20 > + return pwaff; > + } > +@@ -976,11 +968,10 @@ > + isl_space *space; > + isl_constraint *c; > + int pos =3D isl_set_dim (outer, isl_dim_set); > +- isl_int v; > ++ isl_val *v; > + mpz_t g; > +=20 > + mpz_init (g); > +- isl_int_init (v); > +=20 > + inner =3D isl_set_add_dims (inner, isl_dim_set, 1); > + space =3D isl_set_get_space (inner); > +@@ -998,8 +989,8 @@ > + (isl_local_space_from_space(isl_space_copy (space))); > + c =3D isl_constraint_set_coefficient_si (c, isl_dim_set, pos, -1); > + tree_int_to_gmp (nb_iters, g); > +- isl_int_set_gmp (v, g); > +- c =3D isl_constraint_set_constant (c, v); > ++ v =3D isl_val_int_from_gmp (the_isl_ctx, g); > ++ c =3D isl_constraint_set_constant_val (c, v); > + inner =3D isl_set_add_constraint (inner, c); > + } > +=20 > +@@ -1053,9 +1044,9 @@ > + c =3D isl_inequality_alloc > + (isl_local_space_from_space (isl_space_copy (space))); > + c =3D isl_constraint_set_coefficient_si (c, isl_dim_set, pos, -1); > +- isl_int_set_gmp (v, g); > ++ v =3D isl_val_int_from_gmp (the_isl_ctx, g); > + mpz_clear (g); > +- c =3D isl_constraint_set_constant (c, v); > ++ c =3D isl_constraint_set_constant_val (c, v); > + inner =3D isl_set_add_constraint (inner, c); > + } > + else > +@@ -1078,7 +1069,6 @@ > +=20 > + isl_set_free (outer); > + isl_space_free (space); > +- isl_int_clear (v); > + mpz_clear (g); > + } > +=20 > +@@ -1342,17 +1332,15 @@ > + isl_space *space =3D isl_set_get_space (scop->context); > + isl_constraint *c; > + mpz_t g; > +- isl_int v; > ++ isl_val *v; > +=20 > + c =3D isl_inequality_alloc (isl_local_space_from_space (space)); > + mpz_init (g); > +- isl_int_init (v); > + tree_int_to_gmp (lb, g); > +- isl_int_set_gmp (v, g); > +- isl_int_neg (v, v); > ++ v =3D isl_val_int_from_gmp (the_isl_ctx, g); > ++ v =3D isl_val_neg (v); > + mpz_clear (g); > +- c =3D isl_constraint_set_constant (c, v); > +- isl_int_clear (v); > ++ c =3D isl_constraint_set_constant_val (c, v); > + c =3D isl_constraint_set_coefficient_si (c, isl_dim_param, p, 1); > +=20 > + scop->context =3D isl_set_add_constraint (scop->context, c); > +@@ -1363,17 +1351,15 @@ > + isl_space *space =3D isl_set_get_space (scop->context); > + isl_constraint *c; > + mpz_t g; > +- isl_int v; > ++ isl_val *v; > +=20 > + c =3D isl_inequality_alloc (isl_local_space_from_space (space)); > +=20 > + mpz_init (g); > +- isl_int_init (v); > + tree_int_to_gmp (ub, g); > +- isl_int_set_gmp (v, g); > ++ v =3D isl_val_int_from_gmp (the_isl_ctx, g); > + mpz_clear (g); > +- c =3D isl_constraint_set_constant (c, v); > +- isl_int_clear (v); > ++ c =3D isl_constraint_set_constant_val (c, v); > + c =3D isl_constraint_set_coefficient_si (c, isl_dim_param, p, -1); > +=20 > + scop->context =3D isl_set_add_constraint (scop->context, c); --82I3+IH0IqGh5yIs Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJTvagfAAoJEPXPYrMgexuh/rAH/2aBdFPbLTstBQPCQXqDb9XA IHX0/y4KX3l7+3PTIXGkO2/ASDaxn/2w7MDmfnLxi2DZg/+hUuNUer7XmqglgMhp EOeFF3eY5NsY+qSUco/eZkITshdyn0wdu1wnuSI110cLaBN+AeyiJngu1v5Nzg5g mwk39XZbP7YEdiPnByYG3yNOThYRB4hi+6CyHxuWPNUh5KtnDAx1TVf/4TM8PVZq KlAofgW5OT4XZnVD9DrDS8wio3mig2sWNNMjfqbcmQdmnypwySSyJKVpAZra/k5j oxmdN51qNzmOed35LVPTv+niNvK9jGA37Zo59MLMzR2oi3mGK4M8hbP9nb+stp0= =XJvq -----END PGP SIGNATURE----- --82I3+IH0IqGh5yIs--