dhowells pushed to cross-gcc (f20). "Rebase on gcc-4.9.2-6 [BZ 1183401]"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 8 14:38:38 UTC 2015
>From 7a2bf8c057f8b5bbdd9b1b5cc19e51eb7335fe4f Mon Sep 17 00:00:00 2001
From: David Howells <dhowells at redhat.com>
Date: Wed, 8 Apr 2015 15:34:22 +0100
Subject: Rebase on gcc-4.9.2-6 [BZ 1183401]
diff --git a/.gitignore b/.gitignore
index e8ecda0..fc5676c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
/cloog-0.18.1.tar.gz
/isl-0.12.2.tar.bz2
-/gcc-4.9.2-20150107.tar.bz2
+/gcc-4.9.2-20150212.tar.bz2
diff --git a/cross-gcc-use-sys-cloog.patch b/cross-gcc-use-sys-cloog.patch
new file mode 100644
index 0000000..15e47e2
--- /dev/null
+++ b/cross-gcc-use-sys-cloog.patch
@@ -0,0 +1,45 @@
+diff -u gcc/graphite-poly.h gcc/graphite-poly.h
+--- gcc/graphite-poly.h 2012-12-14 13:41:41.970800726 +0100
++++ gcc/graphite-poly.h 2012-12-14 13:41:41.970800726 +0100
+@@ -23,12 +23,20 @@
+ #define GCC_GRAPHITE_POLY_H
+
+ #include <isl/aff.h>
++#include <isl/deprecated/aff_int.h>
++#include <isl/deprecated/constraint_int.h>
+ #include <isl/schedule.h>
+ #include <isl/ilp.h>
++#include <isl/deprecated/ilp_int.h>
+ #include <isl/flow.h>
+ #include <isl/options.h>
+ #include <cloog/isl/cloog.h>
+ #include <dlfcn.h>
++#ifdef HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE
++#define DYNSYM_ISL_BAND_MEMBER_IS_COINCIDENT DYNSYM (isl_band_member_is_coincident)
++#else
++#define DYNSYM_ISL_BAND_MEMBER_IS_COINCIDENT DYNSYM (isl_band_member_is_zero_distance)
++#endif
+ #define DYNSYMS \
+ DYNSYM (clast_pprint); \
+ DYNSYM (cloog_clast_create_from_input); \
+@@ -60,7 +68,7 @@
+ DYNSYM (isl_band_list_get_band); \
+ DYNSYM (isl_band_list_get_ctx); \
+ DYNSYM (isl_band_list_n_band); \
+- DYNSYM (isl_band_member_is_zero_distance); \
++ DYNSYM_ISL_BAND_MEMBER_IS_COINCIDENT; \
+ DYNSYM (isl_band_n_member); \
+ DYNSYM (isl_basic_map_add_constraint); \
+ DYNSYM (isl_basic_map_project_out); \
+@@ -243,7 +251,11 @@
+ #define isl_band_list_get_band (*cloog_pointers__.p_isl_band_list_get_band)
+ #define isl_band_list_get_ctx (*cloog_pointers__.p_isl_band_list_get_ctx)
+ #define isl_band_list_n_band (*cloog_pointers__.p_isl_band_list_n_band)
++#ifdef HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE
++#define isl_band_member_is_coincident (*cloog_pointers__.p_isl_band_member_is_coincident)
++#else
+ #define isl_band_member_is_zero_distance (*cloog_pointers__.p_isl_band_member_is_zero_distance)
++#endif
+ #define isl_band_n_member (*cloog_pointers__.p_isl_band_n_member)
+ #define isl_basic_map_add_constraint (*cloog_pointers__.p_isl_basic_map_add_constraint)
+ #define isl_basic_map_project_out (*cloog_pointers__.p_isl_basic_map_project_out)
diff --git a/cross-gcc.spec b/cross-gcc.spec
index af12a95..5d6b56f 100644
--- a/cross-gcc.spec
+++ b/cross-gcc.spec
@@ -1,7 +1,7 @@
%define cross cross
%define rpmprefix %{nil}
-%define build_all 1
+%define build_all 0
%define build_aarch64 %{build_all}
%define build_alpha %{build_all}
%define build_arm %{build_all}
@@ -26,7 +26,7 @@
%define build_sh64 %{build_all}
%define build_sparc64 %{build_all}
%define build_tile %{build_all}
-%define build_x86_64 %{build_all}
+%define build_x86_64 %{build_all}1
%define build_xtensa %{build_all}
# built compiler generates lots of ICEs
@@ -55,7 +55,7 @@
%global multilib_64_archs sparc64 ppc64 s390x x86_64
-# we won't build libgcc for these as it depends on C library or kernel headers
+# we won't build libgcc for these as it depends on C library or kernel headers r
%define no_libgcc_targets nios2*|tile-*
###############################################################################
@@ -63,16 +63,16 @@
# The gcc versioning information. In a sed command below, the specfile winds
# pre-release version numbers in BASE-VER back to the last actually-released
# number.
-%global DATE 20150107
-%global SVNREV 219315
+%global DATE 20150212
+%global SVNREV 220644
%global gcc_version 4.9.2
# Note, cross_gcc_release must be integer, if you want to add suffixes
# to %{release}, append them after %{cross_gcc_release} on Release:
# line. gcc_release is the Fedora gcc release that the patches were
# taken from.
-%global gcc_release 5
-%global cross_gcc_release 3
+%global gcc_release 6
+%global cross_gcc_release 4
%global cross_binutils_version 2.25-1
%global isl_version 0.14
%global cloog_version 0.18.3
@@ -105,6 +105,7 @@ Patch5: gcc49-sparc-config-detection.patch
Patch6: gcc49-libgomp-omp_h-multilib.patch
Patch7: gcc49-libtool-no-rpath.patch
Patch8: gcc49-cloog-dl.patch
+#Patch9: gcc49-cloog-dl2.patch
Patch10: gcc49-pr38757.patch
Patch11: gcc49-libstdc++-docs.patch
Patch12: gcc49-no-add-needed.patch
@@ -113,13 +114,13 @@ Patch14: gcc49-libgo-p224.patch
Patch15: gcc49-aarch64-async-unw-tables.patch
Patch16: gcc49-aarch64-unwind-opt.patch
Patch17: gcc49-pr64336.patch
-Patch18: gcc49-pr64536.patch
Patch900: cross-intl-filename.patch
# ia64 - http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44553
# m68k - http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53557
# alpha - http://gcc.gnu.org/bugzilla/show_bug.cgi?id=55344
Patch901: cross-gcc-with-libgcc.patch
+Patch902: cross-gcc-use-sys-cloog.patch
Patch903: cross-gcc-bfin.patch
Patch904: cross-gcc-c6x.patch
@@ -279,10 +280,10 @@ rm -f libgo/go/crypto/elliptic/p224{,_test}.go
%patch15 -p0 -b .aarch64-async-unw-tables~
%patch16 -p0 -b .aarch64-unwind-opt~
%patch17 -p0 -b .pr64336~
-%patch18 -p0 -b .pr64536~
%patch900 -p0 -b .cross-intl~
%patch901 -p1 -b .with-libgcc~
+%patch902 -p0 -b .use-sys-cloog~
%patch903 -p0 -b .bfin~
%patch904 -p0 -b .c6x~
@@ -787,6 +788,9 @@ rm -rf %{buildroot}
%do_files xtensa-linux-gnu %{build_xtensa}
%changelog
+* Wed Apr 8 2015 David Howells <dhowells at redhat.com> - 4.9.2-4
+- Rebase on gcc-4.9.2-6 [BZ 1183401].
+
* Mon Feb 9 2015 David Howells <dhowells at redhat.com> - 4.9.2-3
- Need to build-depend on isl-devel and cloog-devel.
diff --git a/gcc49-cloog-dl.patch b/gcc49-cloog-dl.patch
index dc1cc27..8a72509 100644
--- a/gcc49-cloog-dl.patch
+++ b/gcc49-cloog-dl.patch
@@ -27,25 +27,17 @@
# and compile them.
--- gcc/graphite-poly.h.jj 2012-12-13 11:31:27.000000000 +0100
+++ gcc/graphite-poly.h 2012-12-14 13:41:41.970800726 +0100
-@@ -22,6 +22,383 @@ along with GCC; see the file COPYING3.
+@@ -22,6 +22,371 @@ along with GCC; see the file COPYING3.
#ifndef GCC_GRAPHITE_POLY_H
#define GCC_GRAPHITE_POLY_H
+#include <isl/aff.h>
-+#include <isl/deprecated/aff_int.h>
-+#include <isl/deprecated/constraint_int.h>
+#include <isl/schedule.h>
+#include <isl/ilp.h>
-+#include <isl/deprecated/ilp_int.h>
+#include <isl/flow.h>
+#include <isl/options.h>
+#include <cloog/isl/cloog.h>
+#include <dlfcn.h>
-+#ifdef HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE
-+#define DYNSYM_ISL_BAND_MEMBER_IS_COINCIDENT DYNSYM (isl_band_member_is_coincident)
-+#else
-+#define DYNSYM_ISL_BAND_MEMBER_IS_COINCIDENT DYNSYM (isl_band_member_is_zero_distance)
-+#endif
+#define DYNSYMS \
+ DYNSYM (clast_pprint); \
+ DYNSYM (cloog_clast_create_from_input); \
@@ -77,7 +69,7 @@
+ DYNSYM (isl_band_list_get_band); \
+ DYNSYM (isl_band_list_get_ctx); \
+ DYNSYM (isl_band_list_n_band); \
-+ DYNSYM_ISL_BAND_MEMBER_IS_COINCIDENT; \
++ DYNSYM (isl_band_member_is_zero_distance); \
+ DYNSYM (isl_band_n_member); \
+ DYNSYM (isl_basic_map_add_constraint); \
+ DYNSYM (isl_basic_map_project_out); \
@@ -260,11 +252,7 @@
+#define isl_band_list_get_band (*cloog_pointers__.p_isl_band_list_get_band)
+#define isl_band_list_get_ctx (*cloog_pointers__.p_isl_band_list_get_ctx)
+#define isl_band_list_n_band (*cloog_pointers__.p_isl_band_list_n_band)
-+#ifdef HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE
-+#define isl_band_member_is_coincident (*cloog_pointers__.p_isl_band_member_is_coincident)
-+#else
+#define isl_band_member_is_zero_distance (*cloog_pointers__.p_isl_band_member_is_zero_distance)
-+#endif
+#define isl_band_n_member (*cloog_pointers__.p_isl_band_n_member)
+#define isl_basic_map_add_constraint (*cloog_pointers__.p_isl_basic_map_add_constraint)
+#define isl_basic_map_project_out (*cloog_pointers__.p_isl_basic_map_project_out)
diff --git a/gcc49-pr64536.patch b/gcc49-pr64536.patch
deleted file mode 100644
index 64191ca..0000000
--- a/gcc49-pr64536.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-2015-01-08 Jakub Jelinek <jakub at redhat.com>
-
- PR rtl-optimization/64536
- * cfgrtl.c (rtl_tidy_fallthru_edge): Don't remove tablejumps.
-
- * gcc.dg/pr64536.c: New test.
-
---- gcc/cfgrtl.c.jj 2015-01-05 13:07:12.000000000 +0100
-+++ gcc/cfgrtl.c 2015-01-08 17:03:18.511218340 +0100
-@@ -1782,10 +1782,14 @@ rtl_tidy_fallthru_edge (edge e)
- if (INSN_P (q))
- return;
-
-+ q = BB_END (b);
-+ /* Don't remove table jumps here. */
-+ if (tablejump_p (q, NULL, NULL))
-+ return;
-+
- /* Remove what will soon cease being the jump insn from the source block.
- If block B consisted only of this single jump, turn it into a deleted
- note. */
-- q = BB_END (b);
- if (JUMP_P (q)
- && onlyjump_p (q)
- && (any_uncondjump_p (q)
---- gcc/testsuite/gcc.dg/pr64536.c.jj 2015-01-08 17:13:32.218929003 +0100
-+++ gcc/testsuite/gcc.dg/pr64536.c 2015-01-08 17:28:56.758428958 +0100
-@@ -0,0 +1,67 @@
-+/* PR rtl-optimization/64536 */
-+/* { dg-do link } */
-+/* { dg-options "-O2" } */
-+/* { dg-additional-options "-fPIC" { target fpic } } */
-+
-+struct S { long q; } *h;
-+long a, b, g, j, k, *c, *d, *e, *f, *i;
-+long *baz (void)
-+{
-+ asm volatile ("" : : : "memory");
-+ return e;
-+}
-+
-+void
-+bar (int x)
-+{
-+ int y;
-+ for (y = 0; y < x; y++)
-+ {
-+ switch (b)
-+ {
-+ case 0:
-+ case 2:
-+ a++;
-+ break;
-+ case 3:
-+ a++;
-+ break;
-+ case 1:
-+ a++;
-+ }
-+ if (d)
-+ {
-+ f = baz ();
-+ g = k++;
-+ if (&h->q)
-+ {
-+ j = *f;
-+ h->q = *f;
-+ }
-+ else
-+ i = (long *) (h->q = *f);
-+ *c++ = (long) f;
-+ e += 6;
-+ }
-+ else
-+ {
-+ f = baz ();
-+ g = k++;
-+ if (&h->q)
-+ {
-+ j = *f;
-+ h->q = *f;
-+ }
-+ else
-+ i = (long *) (h->q = *f);
-+ *c++ = (long) f;
-+ e += 6;
-+ }
-+ }
-+}
-+
-+int
-+main ()
-+{
-+ return 0;
-+}
diff --git a/sources b/sources
index c1a53ec..4978b1d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-689887cca4a28c1385169bc5d3a14c77 gcc-4.9.2-20150107.tar.bz2
+bad062712242d2825ca5ef7f3ce7f0bb gcc-4.9.2-20150212.tar.bz2
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/cross-gcc.git/commit/?h=f20&id=7a2bf8c057f8b5bbdd9b1b5cc19e51eb7335fe4f
More information about the scm-commits
mailing list