From d9caede9a622bfa41c984c4685a7b185421c96d7 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 14 Aug 2015 00:37:59 -0500 Subject: cygwin-gcc 4.9.3 --- 1002-isl-r218392.patch | 334 ------------------------------------------------- cygwin-gcc.spec | 7 +- sources | 2 +- 3 files changed, 5 insertions(+), 338 deletions(-) delete mode 100644 1002-isl-r218392.patch diff --git a/1002-isl-r218392.patch b/1002-isl-r218392.patch deleted file mode 100644 index 5ea4e4b..0000000 --- a/1002-isl-r218392.patch +++ /dev/null @@ -1,334 +0,0 @@ -From 0cd222d26facd482b4835a551e1ac12a6490a5ae Mon Sep 17 00:00:00 2001 -From: burnus -Date: Thu, 4 Dec 2014 18:25:37 +0000 -Subject: [PATCH] 2014-12-04 Tobias Burnus - - * configure.ac: Permit also ISL 0.14 with CLooG. - * Makefile.def: Make more dependent on mpfr, mpc, isl, and - * cloog. - * Makefile.in: Regenerate. - * configure: Regenerate. - -2014-12-04 Tobias Burnus - - * configure.ac - (ac_has_isl_schedule_constraints_compute_schedule): - New check. - * graphite-clast-to-gimple.c: For ISL 0.14, include deprecate - * headers. - * graphite-interchange.c: Ditto. - * graphite-poly.c: Ditto. - * graphite-sese-to-poly.c: Ditto. - * graphite-optimize-isl.c (getScheduleForBandList): Ditto. - Conditionally use ISL 0.13+ functions. - * config.in: Regenerate. - * configure: Regenerate. - - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@218392 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - ChangeLog | 7 ++++++ - Makefile.def | 4 ++++ - Makefile.in | 32 +++++++++++++++++++++++++++ - configure | 49 ++++++++++++++++++++++++++++++++++++++++++ - configure.ac | 3 +++ - gcc/ChangeLog | 14 ++++++++++++ - gcc/config.in | 6 ++++++ - gcc/configure | 40 ++++++++++++++++++++++++++++++++++ - gcc/configure.ac | 23 ++++++++++++++++++++ - gcc/graphite-clast-to-gimple.c | 5 +++++ - gcc/graphite-interchange.c | 6 ++++++ - gcc/graphite-optimize-isl.c | 8 +++++++ - gcc/graphite-poly.c | 4 ++++ - gcc/graphite-sese-to-poly.c | 5 +++++ - 14 files changed, 206 insertions(+) - -diff --git a/ChangeLog b/ChangeLog -index 4a457e4..21a9792 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,10 @@ -+2014-12-04 Tobias Burnus -+ -+ * configure.ac: Permit also ISL 0.14 with CLooG. -+ * Makefile.def: Make more dependent on mpfr, mpc, isl, and cloog. -+ * Makefile.in: Regenerate. -+ * configure: Regenerate. -+ - 2014-10-30 Release Manager - - * GCC 4.9.2 released. -mv diff --git a/configure b/configure -index d1c67e5..d769d93 100755 ---- a/configure -+++ b/configure -@@ -6024,6 +6024,55 @@ $as_echo "$gcc_cv_isl" >&6; } - fi - - -+ if test "${gcc_cv_isl}" = no ; then -+ -+ if test "${ENABLE_ISL_CHECK}" = yes ; then -+ _isl_saved_CFLAGS=$CFLAGS -+ _isl_saved_LDFLAGS=$LDFLAGS -+ _isl_saved_LIBS=$LIBS -+ -+ CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}" -+ LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}" -+ LIBS="${_isl_saved_LIBS} -lisl" -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.14 of ISL" >&5 -+$as_echo_n "checking for version 0.14 of ISL... " >&6; } -+ if test "$cross_compiling" = yes; then : -+ gcc_cv_isl=yes -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+ #include -+int -+main () -+{ -+if (strncmp (isl_version (), "isl-0.14", strlen ("isl-0.14")) != 0) -+ return 1; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_run "$LINENO"; then : -+ gcc_cv_isl=yes -+else -+ gcc_cv_isl=no -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext -+fi -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5 -+$as_echo "$gcc_cv_isl" >&6; } -+ -+ CFLAGS=$_isl_saved_CFLAGS -+ LDFLAGS=$_isl_saved_LDFLAGS -+ LIBS=$_isl_saved_LIBS -+ fi -+ -+ -+ fi - fi - fi - -diff --git a/configure.ac b/configure.ac -index 1bab680..2aee14a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1658,6 +1658,9 @@ if test "x$with_isl" != "xno" && - ISL_CHECK_VERSION(0,11) - if test "${gcc_cv_isl}" = no ; then - ISL_CHECK_VERSION(0,12) -+ if test "${gcc_cv_isl}" = no ; then -+ ISL_CHECK_VERSION(0,14) -+ fi - fi - fi - dnl Only execute fail-action, if ISL has been requested. -diff --git a/gcc/config.in b/gcc/config.in -index 1e85325..71cf0c9 100644 ---- a/gcc/config.in -+++ b/gcc/config.in -@@ -1211,6 +1211,12 @@ - #endif - - -+/* Define if isl_schedule_constraints_compute_schedule exists. */ -+#ifndef USED_FOR_TARGET -+#undef HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE -+#endif -+ -+ - /* Define to 1 if you have the `kill' function. */ - #ifndef USED_FOR_TARGET - #undef HAVE_KILL -diff --git a/gcc/configure b/gcc/configure -index 291e463..f48dd18 100755 ---- a/gcc/configure -+++ b/gcc/configure -@@ -27851,7 +27851,47 @@ if test "x${CLOOGLIBS}" != "x" ; then - - $as_echo "#define HAVE_cloog 1" >>confdefs.h - -+ -+ # Check whether isl_schedule_constraints_compute_schedule is available; -+ # it's new in ISL-0.13. -+ saved_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS $ISLINC" -+ saved_LIBS="$LIBS" -+ LIBS="$LIBS $CLOOGLIBS $ISLLIBS $GMPLIBS" -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Checking for isl_schedule_constraints_compute_schedule" >&5 -+$as_echo_n "checking Checking for isl_schedule_constraints_compute_schedule... " >&6; } -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main () -+{ -+isl_schedule_constraints_compute_schedule (NULL); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_has_isl_schedule_constraints_compute_schedule=yes -+else -+ ac_has_isl_schedule_constraints_compute_schedule=no - fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_has_isl_schedule_constraints_compute_schedule" >&5 -+$as_echo "$ac_has_isl_schedule_constraints_compute_schedule" >&6; } -+ -+ LIBS="$saved_LIBS" -+ CFLAGS="$saved_CFLAGS" -+ -+ if test x"$ac_has_isl_schedule_constraints_compute_schedule" = x"yes"; then -+ -+$as_echo "#define HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE 1" >>confdefs.h -+ -+ fi -+fi -+ - - # Check for plugin support - # Check whether --enable-plugin was given. -diff --git a/gcc/configure.ac b/gcc/configure.ac -index b9a3799..e54df10 100644 ---- a/gcc/configure.ac -+++ b/gcc/configure.ac -@@ -5495,8 +5495,31 @@ AC_ARG_VAR(CLOOGLIBS,[How to link CLOOG]) - AC_ARG_VAR(CLOOGINC,[How to find CLOOG include files]) - if test "x${CLOOGLIBS}" != "x" ; then - AC_DEFINE(HAVE_cloog, 1, [Define if cloog is in use.]) -+ -+ # Check whether isl_schedule_constraints_compute_schedule is available; -+ # it's new in ISL-0.13. -+ saved_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS $ISLINC" -+ saved_LIBS="$LIBS" -+ LIBS="$LIBS $CLOOGLIBS $ISLLIBS $GMPLIBS" -+ -+ AC_MSG_CHECKING([Checking for isl_schedule_constraints_compute_schedule]) -+ AC_TRY_LINK([#include ], -+ [isl_schedule_constraints_compute_schedule (NULL);], -+ [ac_has_isl_schedule_constraints_compute_schedule=yes], -+ [ac_has_isl_schedule_constraints_compute_schedule=no]) -+ AC_MSG_RESULT($ac_has_isl_schedule_constraints_compute_schedule) -+ -+ LIBS="$saved_LIBS" -+ CFLAGS="$saved_CFLAGS" -+ -+ if test x"$ac_has_isl_schedule_constraints_compute_schedule" = x"yes"; then -+ AC_DEFINE(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE, 1, -+ [Define if isl_schedule_constraints_compute_schedule exists.]) -+ fi - fi - -+ - # Check for plugin support - AC_ARG_ENABLE(plugin, - [AS_HELP_STRING([--enable-plugin], [enable plugin support])], -diff --git a/gcc/graphite-clast-to-gimple.c b/gcc/graphite-clast-to-gimple.c -index fc60845..134388c 100644 ---- a/gcc/graphite-clast-to-gimple.c -+++ b/gcc/graphite-clast-to-gimple.c -@@ -30,6 +30,11 @@ along with GCC; see the file COPYING3. If not see - #include - #include - #include -+#ifdef HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE -+#include -+#include -+#include -+#endif - #endif - - #include "system.h" -diff --git a/gcc/graphite-interchange.c b/gcc/graphite-interchange.c -index 55e3fab..2e625c1 100644 ---- a/gcc/graphite-interchange.c -+++ b/gcc/graphite-interchange.c -@@ -31,6 +31,12 @@ along with GCC; see the file COPYING3. If not see - #include - #include - #include -+#ifdef HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE -+#include -+#include -+#include -+#include -+#endif - #endif - - #include "system.h" -diff --git a/gcc/graphite-optimize-isl.c b/gcc/graphite-optimize-isl.c -index 88d6d6c..fc12eeb 100644 ---- a/gcc/graphite-optimize-isl.c -+++ b/gcc/graphite-optimize-isl.c -@@ -28,6 +28,10 @@ along with GCC; see the file COPYING3. If not see - #include - #include - #include -+#ifdef HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE -+#include -+#include -+#endif - #endif - - #include "system.h" -@@ -373,7 +377,11 @@ getScheduleForBandList (isl_band_list *BandList) - { - for (i = ScheduleDimensions - 1 ; i >= 0 ; i--) - { -+#ifdef HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE -+ if (isl_band_member_is_coincident (Band, i)) -+#else - if (isl_band_member_is_zero_distance (Band, i)) -+#endif - { - isl_map *TileMap; - isl_union_map *TileUMap; -diff --git a/gcc/graphite-poly.c b/gcc/graphite-poly.c -index 4ca62f9..fccc2ec 100644 ---- a/gcc/graphite-poly.c -+++ b/gcc/graphite-poly.c -@@ -30,6 +30,10 @@ along with GCC; see the file COPYING3. If not see - #include - #include - #include -+#ifdef HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE -+#include -+#include -+#endif - #endif - - #include "system.h" -diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c -index 28447e4..059c10d 100644 ---- a/gcc/graphite-sese-to-poly.c -+++ b/gcc/graphite-sese-to-poly.c -@@ -29,6 +29,11 @@ along with GCC; see the file COPYING3. If not see - #include - #include - #include -+#ifdef HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE -+#include -+#include -+#include -+#endif - #endif - - #include "system.h" --- -1.9.4 - diff --git a/cygwin-gcc.spec b/cygwin-gcc.spec index 408882b..2c73a26 100644 --- a/cygwin-gcc.spec +++ b/cygwin-gcc.spec @@ -1,6 +1,6 @@ %global gcc_major 4 %global gcc_minor 9 -%global gcc_micro 2 +%global gcc_micro 3 %global gcc_branch %{gcc_major}.%{gcc_minor} %global gcc_version %{gcc_major}.%{gcc_minor}.%{gcc_micro} # Note, gcc_release must be integer, if you want to add suffixes to @@ -86,7 +86,6 @@ Patch25: 0025-fix-cygwin-stdint.patch # Fedora-specific patches Patch1000: 1000-cross-exe-suffix.patch Patch1001: 1001-textdomain.patch -Patch1002: 1002-isl-r218392.patch %description Cygwin cross-compiler (GCC) suite. @@ -346,7 +345,6 @@ Cygwin x86_64 cross-compiler for Ada. %patch1000 -p1 %patch1001 -p1 -%patch1002 -p1 echo %{gcc_version} > gcc/BASE-VER echo 'Fedora Cygwin %{gcc_version}-%{gcc_release}' > gcc/DEV-PHASE @@ -736,6 +734,9 @@ cat cygwin-cpplib.lang >> cygwin-gcc.lang %changelog +* Fri Aug 14 2015 Yaakov Selkowitz - 4.9.3-1 +- Update to 4.9.3 + * Fri Jun 19 2015 Yaakov Selkowitz - 4.9.2-1 - Update to 4.9.2 - Build cygwin32-gcc and cygwin64-gcc from single SRPM diff --git a/sources b/sources index ff000f3..2cd21ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4df8ee253b7f3863ad0b86359cd39c43 gcc-4.9.2.tar.bz2 +6f831b4d251872736e8e9cc09746f327 gcc-4.9.3.tar.bz2 -- cgit