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 <hel...@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 @@