[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#809165: Patch attached



tags 809165 + patch moreinfo
thanks

Heyya,

Thinned out my patch to something a bit more digestable. Added a blank
changelog entry, so you can just `dch -rm` if it looks good. I had to
refresh the patch against the package, so the line offsets look
different than the PR. Content should match, though.

Added DEP3 headers, but I just noticed other patches don't have them.
Feel free to strip out the headers if they bother you.

I got most of the way through a compile, but I had to run. This patch
still needs testing. I'll try and get that done and follow up.

Cheers,
  Paul
diff -u gcc-5-5.3.1/debian/changelog gcc-5-5.3.1/debian/changelog
--- gcc-5-5.3.1/debian/changelog
+++ gcc-5-5.3.1/debian/changelog
@@ -1,3 +1,11 @@
+gcc-5 (5.3.1-5) UNRELEASED; urgency=medium
+
+  [ Paul Tagliamonte ]
+  * Apply PR 68668, which fixes a regression in detecting the type of an
+    array of consts in some situations. (Closes: #809165)
+
+ -- Paul Tagliamonte <paultag@debian.org>  Sun, 27 Dec 2015 14:01:21 -0500
+
 gcc-5 (5.3.1-4) unstable; urgency=medium
 
   * Update to SVN 20151219 (r231847, 5.3.1) from the gcc-5-branch.
diff -u gcc-5-5.3.1/debian/rules.patch gcc-5-5.3.1/debian/rules.patch
--- gcc-5-5.3.1/debian/rules.patch
+++ gcc-5-5.3.1/debian/rules.patch
@@ -92,6 +92,7 @@
 	gcc-configure-pie \
 	ada-gnattools-ldflags \
 	libjit-ldflags \
+    pr68668 \
 
 # this is still needed on powerpc, e.g. firefox and insighttoolkit4 will ftbfs.
 ifneq (,$(filter $(DEB_TARGET_ARCH),powerpc))
--- gcc-5-5.3.1.orig/debian/patches/pr68668.diff
+++ gcc-5-5.3.1/debian/patches/pr68668.diff
@@ -0,0 +1,19 @@
+Description: Clean up handling of arrays of constants not being groked
+ correctly.
+Forwarded: not-needed
+Origin: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68668
+Bug-Debian: https://bugs.debian.org/809165
+Author: Marek Polacek
+Reviewed-By: Paul Tagliamonte <paultag@debian.org>
+
+--- a/src/gcc/c/c-decl.c
++++ b/src/gcc/c/c-decl.c
+@@ -6444,6 +6444,8 @@ grokdeclarator (const struct c_declarato
+ 	  {
+ 	    /* Transfer const-ness of array into that of type pointed to.  */
+ 	    type = TREE_TYPE (type);
++        if (orig_qual_type != NULL_TREE)
++          orig_qual_type = TREE_TYPE (orig_qual_type);
+ 	    if (type_quals)
+ 	      type = c_build_qualified_type (type, type_quals, orig_qual_type,
+ 					     orig_qual_indirect);

Attachment: signature.asc
Description: PGP signature


Reply to: