[arch-commits] Commit in gcc/trunk (PKGBUILD pr66035.patch)

[Allan McRae]

    Date: Saturday, December 5, 2015 @ 08:00:44
  Author: allan
Revision: 252371

upstream update, use latest ISL

Modified:
  gcc/trunk/PKGBUILD
Deleted:
  gcc/trunk/pr66035.patch

---------------+
 PKGBUILD      |   17 ++++++-----------
 pr66035.patch |   48 ------------------------------------------------
 2 files changed, 6 insertions(+), 59 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-05 06:22:53 UTC (rev 252370)
+++ PKGBUILD	2015-12-05 07:00:44 UTC (rev 252371)
@@ -5,10 +5,10 @@
 # NOTE: libtool requires rebuilt with each new gcc version
 
 pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
-pkgver=5.2.0
+pkgver=5.3.0
 _pkgver=5
-_islver=0.14.1
-pkgrel=2
+_islver=0.15
+pkgrel=1
 #_snapshot=5-20150623
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64')
@@ -19,11 +19,9 @@
 options=('!emptydirs')
 source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
         #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
-        http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2
-        pr66035.patch)
-md5sums=('a51bcfeb3da7dd4c623e27207ed43467'
-         '118d1a379abf7606a3334c98a8411c79'
-         '5b980076cd5fcbc3aff6014f306282dd')
+        http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2)
+md5sums=('c9616fd448f980259c31de613e575719'
+         '8428efbbc6f6e2810ce5c1ba73ecf98c')
 
 if [ -n "${_snapshot}" ]; then
   _basedir=gcc-${_snapshot}
@@ -50,9 +48,6 @@
   # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
   sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
 
-  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66035
-  patch -p1 -i ${srcdir}/pr66035.patch
-
   mkdir ${srcdir}/gcc-build
 }
 

Deleted: pr66035.patch
===================================================================
--- pr66035.patch	2015-12-05 06:22:53 UTC (rev 252370)
+++ pr66035.patch	2015-12-05 07:00:44 UTC (rev 252371)
@@ -1,48 +0,0 @@
---- a/gcc/fortran/trans-expr.c	
-+++ a/gcc/fortran/trans-expr.c	
-@@ -6897,6 +6897,30 @@ alloc_scalar_allocatable_for_subcomponent_assignment (stmtblock_t *block,
- 				       TREE_TYPE (tmp), tmp,
- 				       fold_convert (TREE_TYPE (tmp), size));
-     }
-+  else if (cm->ts.type == BT_CLASS)
-+    {
-+      gcc_assert (expr2->ts.type == BT_CLASS || expr2->ts.type == BT_DERIVED);
-+      if (expr2->ts.type == BT_DERIVED)
-+	{
-+	  tmp = gfc_get_symbol_decl (gfc_find_vtab (&expr2->ts));
-+	  tmp = gfc_build_addr_expr (NULL_TREE, tmp);
-+	  size = fold_convert (size_type_node, gfc_vptr_size_get (tmp));
-+	}
-+      else
-+	{
-+	  gfc_expr *e2vtab;
-+	  gfc_se se;
-+	  e2vtab = gfc_find_and_cut_at_last_class_ref (expr2);
-+	  gfc_add_vptr_component (e2vtab);
-+	  gfc_add_size_component (e2vtab);
-+	  gfc_init_se (&se, NULL);
-+	  gfc_conv_expr (&se, e2vtab);
-+	  gfc_add_block_to_block (block, &se.pre);
-+	  size = fold_convert (size_type_node, se.expr);
-+	  gfc_free_expr (e2vtab);
-+	}
-+      size_in_bytes = size;
-+    }
-   else
-     {
-       /* Otherwise use the length in bytes of the rhs.  */
-@@ -7068,6 +7092,14 @@ gfc_trans_subcomponent_assign (tree dest, gfc_component * cm, gfc_expr * expr,
- 	  tmp = gfc_build_memcpy_call (tmp, se.expr, size);
- 	  gfc_add_expr_to_block (&block, tmp);
- 	}
-+      else if (cm->ts.type == BT_CLASS && expr->ts.type == BT_CLASS)
-+	{
-+	  tmp = gfc_copy_class_to_class (se.expr, dest, integer_one_node,
-+				   CLASS_DATA (cm)->attr.unlimited_polymorphic);
-+	  gfc_add_expr_to_block (&block, tmp);
-+	  gfc_add_modify (&block, gfc_class_vptr_get (dest),
-+			  gfc_class_vptr_get (se.expr));
-+	}
-       else
- 	gfc_add_modify (&block, tmp,
- 			fold_convert (TREE_TYPE (tmp), se.expr));