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

Bug#743764: marked as done (gcc-4.8: FTCBFS for arm64 during patch application)

Your message dated Thu, 24 Apr 2014 07:12:04 +0200
with message-id <20140424051204.GA26237@alf.mars>
and subject line Re: Bug#743764: gcc-4.8: FTCBFS for arm64 during patch application
has caused the Debian Bug report #743764,
regarding gcc-4.8: FTCBFS for arm64 during patch application
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
743764: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=743764
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: gcc-4.8
Version: 4.8.2-19
Severity: normal
Tags: patch

Some parts of gcc-linaro.diff went into svn-updates.diff as well, so
patch application fails and thus arm64 fails to cross build. The
attached patch removes the duplicate hunks.

Helmut

diff -u gcc-4.8-4.8.2/debian/changelog gcc-4.8-4.8.2/debian/changelog
--- gcc-4.8-4.8.2/debian/changelog
+++ gcc-4.8-4.8.2/debian/changelog
@@ -1,3 +1,11 @@
+gcc-4.8 (4.8.2-19.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Fix application of gcc-linaro.diff: The parts affecting src/gcc/function.c
+    went into svn-updates.diff. Closes: #-1.
+
+ -- Helmut Grohne <helmut@subdivi.de>  Sun, 06 Apr 2014 09:20:09 +0200
+
 gcc-4.8 (4.8.2-19) unstable; urgency=medium
 
   * Update to SVN 20140404 (r209122) from the gcc-4_8-branch.
diff -u gcc-4.8-4.8.2/debian/patches/gcc-linaro.diff gcc-4.8-4.8.2/debian/patches/gcc-linaro.diff
--- gcc-4.8-4.8.2/debian/patches/gcc-linaro.diff
+++ gcc-4.8-4.8.2/debian/patches/gcc-linaro.diff
@@ -17144,67 +17144,6 @@
      insn="nop"
      ;;
    ia64 | s390)
---- a/src/gcc/function.c
-+++ b/src/gcc/function.c
-@@ -5509,22 +5509,45 @@
- 	 except for any part that overlaps SRC (next loop).  */
-       bb_uses = &DF_LR_BB_INFO (bb)->use;
-       bb_defs = &DF_LR_BB_INFO (bb)->def;
--      for (i = dregno; i < end_dregno; i++)
-+      if (df_live)
- 	{
--	  if (REGNO_REG_SET_P (bb_uses, i) || REGNO_REG_SET_P (bb_defs, i))
--	    next_block = NULL;
--	  CLEAR_REGNO_REG_SET (live_out, i);
--	  CLEAR_REGNO_REG_SET (live_in, i);
-+	  for (i = dregno; i < end_dregno; i++)
-+	    {
-+	      if (REGNO_REG_SET_P (bb_uses, i) || REGNO_REG_SET_P (bb_defs, i)
-+		  || REGNO_REG_SET_P (&DF_LIVE_BB_INFO (bb)->gen, i))
-+		next_block = NULL;
-+	      CLEAR_REGNO_REG_SET (live_out, i);
-+	      CLEAR_REGNO_REG_SET (live_in, i);
-+	    }
-+
-+	  /* Check whether BB clobbers SRC.  We need to add INSN to BB if so.
-+	     Either way, SRC is now live on entry.  */
-+	  for (i = sregno; i < end_sregno; i++)
-+	    {
-+	      if (REGNO_REG_SET_P (bb_defs, i)
-+		  || REGNO_REG_SET_P (&DF_LIVE_BB_INFO (bb)->gen, i))
-+		next_block = NULL;
-+	      SET_REGNO_REG_SET (live_out, i);
-+	      SET_REGNO_REG_SET (live_in, i);
-+	    }
- 	}
-+      else
-+	{
-+	  /* DF_LR_BB_INFO (bb)->def does not comprise the DF_REF_PARTIAL and
-+	     DF_REF_CONDITIONAL defs.  So if DF_LIVE doesn't exist, i.e.
-+	     at -O1, just give up searching NEXT_BLOCK.  */
-+	  next_block = NULL;
-+	  for (i = dregno; i < end_dregno; i++)
-+	    {
-+	      CLEAR_REGNO_REG_SET (live_out, i);
-+	      CLEAR_REGNO_REG_SET (live_in, i);
-+	    }
- 
--      /* Check whether BB clobbers SRC.  We need to add INSN to BB if so.
--	 Either way, SRC is now live on entry.  */
--      for (i = sregno; i < end_sregno; i++)
--	{
--	  if (REGNO_REG_SET_P (bb_defs, i))
--	    next_block = NULL;
--	  SET_REGNO_REG_SET (live_out, i);
--	  SET_REGNO_REG_SET (live_in, i);
-+	  for (i = sregno; i < end_sregno; i++)
-+	    {
-+	      SET_REGNO_REG_SET (live_out, i);
-+	      SET_REGNO_REG_SET (live_in, i);
-+	    }
- 	}
- 
-       /* If we don't need to add the move to BB, look for a single
 --- a/src/gcc/tree-vectorizer.h
 +++ b/src/gcc/tree-vectorizer.h
 @@ -838,6 +838,14 @@

--- End Message ---
--- Begin Message --- 
Version: 4.8.2-20

> I agree that this is fixed in SVN, but the fix is not part of the
> 4.8.2-19 upload. Since you didn't upload a new gcc package yet, I need
> something to track this issue. Thus reopening. Please re-close with your
> next gcc upload.

The issue is fixed in the uploaded package now. Thanks.

Helmut

--- End Message ---
Reply to: