* Update to SVN 20150321.

  * Move the libcc1plugin from the gcc-5-plugin-dev package into the
    gcc-5 package.


git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@7899 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca

8 files changed, 32 insertions, 102 deletions

diff --git a/debian/changelog b/debian/changelog
index 05a00f5..6ca3c77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,33 @@
-gcc-5 (5-20150312-1) UNRELEASED; urgency=medium
+gcc-5 (5-20150321-1) experimental; urgency=medium
 
-  * Update to SVN 20150312.
+  * Update to SVN 20150321.
+  * Move the libcc1plugin from the gcc-5-plugin-dev package into the
+    gcc-5 package.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 21 Mar 2015 15:01:15 +0100
+
+gcc-5 (5-20150316-1) experimental; urgency=medium
+
+  * Update to SVN 20150316.
+    - Fix bootstrap failures on armel, armhh and arm64.
+  * Configure with --enable-checking=yes (instead of =release).
+
+ -- Matthias Klose <doko@debian.org>  Tue, 17 Mar 2015 00:30:27 +0100
+
+gcc-5 (5-20150314-1) experimental; urgency=medium
+
+  * Update to SVN 20150314.
     - libgo: Add arm64 to the pointer size map (Michael Hudson).
     - libgo: Add ppc to the pointer size map.
-    - Enable cgo on arm64 and powerpc.
+    - PR go/65404, enable cgo on arm64 and powerpc. LP: #1431032.
+    - Fix PR/tree-optimization 65418. Closes: #778163.
+    - Fix PR c++/65370. Closes: #778073.
   * Enable libmpx builds on amd64 and i386.
   * Update the gcc-multiarch patch for mips64 (YunQiang Su).
     Closes: #776402, #780271.
+  * Remove pr52306 and pr52714 patches, applied upstream. Closes: #780468.
 
- -- Matthias Klose <doko@debian.org>  Thu, 12 Mar 2015 22:38:27 +0100
+ -- Matthias Klose <doko@debian.org>  Sat, 14 Mar 2015 14:48:19 +0100
 
 gcc-5 (5-20150307-1) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index a1ceb13..2c8ffd0 100644
--- a/debian/control
+++ b/debian/control
@@ -264,7 +264,7 @@ Depends: cpp-5 (= ${gcc:Version}), gcc-5-base (= ${gcc:Version}),
   binutils (>= ${binutils:Version}), 
   ${dep:libgccdev}, ${shlibs:Depends}, ${misc:Depends}
 Recommends: ${dep:libcdev}
-Replaces: gccgo-5 (<< ${gcc:Version})
+Replaces: gccgo-5 (<< ${gcc:Version}), gcc-5-plugin-dev (<< 5-20150321-1)
 Suggests: ${gcc:multilib}, gcc-5-doc (>= ${gcc:SoftVersion}),
  gcc-5-locales (>= ${gcc:SoftVersion}),
  libgcc1-dbg (>= ${libgcc:Version}),
diff --git a/debian/control.m4 b/debian/control.m4
index 070b033..2a101b1 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -745,7 +745,7 @@ Depends: cpp`'PV`'TS (= ${gcc:Version}),ifenabled(`gccbase',` BASEDEP,')
   binutils`'TS (>= ${binutils:Version}),
   ${dep:libgccdev}, ${shlibs:Depends}, ${misc:Depends}
 Recommends: ${dep:libcdev}
-Replaces: gccgo-5 (<< ${gcc:Version})
+Replaces: gccgo-5 (<< ${gcc:Version}), gcc`'PV-plugin-dev`'TS (<< 5-20150321-1)
 Suggests: ${gcc:multilib}, gcc`'PV-doc (>= ${gcc:SoftVersion}),
  gcc`'PV-locales (>= ${gcc:SoftVersion}),
  libdbgdep(gcc`'GCC_SO-dbg,,>=,${libgcc:Version}),
diff --git a/debian/patches/pr52306.diff b/debian/patches/pr52306.diff
deleted file mode 100644
index 93d74eb..0000000
--- a/debian/patches/pr52306.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-# DP: Disable -fauto-inc-dec by default for m68k
-# DP: since it can generate ICEs in C++ code,
-# DP: until a fix is found.
-
-Index: b/src/gcc/common.opt
-===================================================================
---- a/src/gcc/common.opt
-+++ b/src/gcc/common.opt
-@@ -863,7 +863,7 @@
- Generate unwind tables that are exact at each instruction boundary
- 
- fauto-inc-dec
--Common Report Var(flag_auto_inc_dec) Init(1)
-+Common Report Var(flag_auto_inc_dec) Init(0)
- Generate auto-inc/dec instructions
- 
- ; -fcheck-bounds causes gcc to generate array bounds checks.
diff --git a/debian/patches/pr52714.diff b/debian/patches/pr52714.diff
deleted file mode 100644
index 6668b70..0000000
--- a/debian/patches/pr52714.diff
+++ /dev/null
@@ -1,68 +0,0 @@
-# DP: Proposed fix for PR rtl-optimization/52714:
-# DP: Revert gcc 4.8 to gcc the 4.5 version of the PR rtl-optimization/45695 fix:
-
---- a/src/gcc/combine.c
-+++ b/src/gcc/combine.c
-@@ -3690,41 +3690,42 @@ try_combine (rtx i3, rtx i2, rtx i1, rtx
- 	   && GET_CODE (XVECEXP (newpat, 0, 1)) == SET
- 	   && GET_CODE (SET_DEST (XVECEXP (newpat, 0, 1))) != ZERO_EXTRACT
- 	   && GET_CODE (SET_DEST (XVECEXP (newpat, 0, 1))) != STRICT_LOW_PART
-+	   && ! use_crosses_set_p (SET_SRC (XVECEXP (newpat, 0, 1)),
-+				   DF_INSN_LUID (i2))
- 	   && ! reg_referenced_p (SET_DEST (XVECEXP (newpat, 0, 1)),
- 				  XVECEXP (newpat, 0, 0))
- 	   && ! reg_referenced_p (SET_DEST (XVECEXP (newpat, 0, 0)),
- 				  XVECEXP (newpat, 0, 1))
- 	   && ! (contains_muldiv (SET_SRC (XVECEXP (newpat, 0, 0)))
--		 && contains_muldiv (SET_SRC (XVECEXP (newpat, 0, 1)))))
-+		 && contains_muldiv (SET_SRC (XVECEXP (newpat, 0, 1))))
-+#ifdef HAVE_cc0
-+	   /* We cannot split the parallel into two sets if both sets
-+	      reference cc0.  */
-+	   && ! (reg_referenced_p (cc0_rtx, XVECEXP (newpat, 0, 0))
-+		 && reg_referenced_p (cc0_rtx, XVECEXP (newpat, 0, 1)))
-+#endif
-+	   )
-     {
-       /* Normally, it doesn't matter which of the two is done first,
--	 but the one that references cc0 can't be the second, and
--	 one which uses any regs/memory set in between i2 and i3 can't
-+	 but it does if one references cc0.  In that case, it has to
- 	 be first.  */
--      if (!use_crosses_set_p (SET_SRC (XVECEXP (newpat, 0, 1)),
--			      DF_INSN_LUID (i2))
--#ifdef HAVE_cc0
--	  && !reg_referenced_p (cc0_rtx, XVECEXP (newpat, 0, 0))
--#endif
--	 )
--	{
--	  newi2pat = XVECEXP (newpat, 0, 1);
--	  newpat = XVECEXP (newpat, 0, 0);
--	}
--      else if (!use_crosses_set_p (SET_SRC (XVECEXP (newpat, 0, 0)),
--				   DF_INSN_LUID (i2))
- #ifdef HAVE_cc0
--	       && !reg_referenced_p (cc0_rtx, XVECEXP (newpat, 0, 1))
--#endif
--	      )
-+      if (reg_referenced_p (cc0_rtx, XVECEXP (newpat, 0, 0)))
- 	{
-+	  if (use_crosses_set_p (SET_SRC (XVECEXP (newpat, 0, 0)),
-+				 DF_INSN_LUID (i2)))
-+	    {
-+	      undo_all ();
-+	      return 0;
-+	    }
- 	  newi2pat = XVECEXP (newpat, 0, 0);
- 	  newpat = XVECEXP (newpat, 0, 1);
- 	}
-       else
-+#endif
- 	{
--	  undo_all ();
--	  return 0;
-+	  newi2pat = XVECEXP (newpat, 0, 1);
-+	  newpat = XVECEXP (newpat, 0, 0);
- 	}
- 
-       i2_code_number = recog_for_combine (&newi2pat, i2, &new_i2_notes);
diff --git a/debian/rules.d/binary-gcc.mk b/debian/rules.d/binary-gcc.mk
index 1aaeb12..6989d4e 100644
--- a/debian/rules.d/binary-gcc.mk
+++ b/debian/rules.d/binary-gcc.mk
@@ -36,6 +36,7 @@ files_gcc = \
 	$(PF)/bin/$(cmd_prefix)gcc-{ar,ranlib,nm}$(pkg_ver) \
 	$(PF)/share/man/man1/$(cmd_prefix)gcc-{ar,nm,ranlib}$(pkg_ver).1 \
 	$(gcc_lexec_dir)/{collect2,lto1,lto-wrapper} \
+	$(gcc_lib_dir)/plugin/libcc1plugin.so{,.0,.0.0.0} \
 	$(shell test -e $(d)/$(gcc_lib_dir)/SYSCALLS.c.X \
 		&& echo $(gcc_lib_dir)/SYSCALLS.c.X)
 
@@ -248,15 +249,11 @@ $(binary_stamp)-gcc-plugindev: $(install_dependencies)
 	rm -rf $(d_pld)
 	dh_installdirs -p$(p_pld) \
 		$(docdir) \
-		$(gcc_lib_dir)/plugin/include/config/arm
-	DH_COMPAT=2 dh_movefiles -p$(p_pld) \
 		$(gcc_lib_dir)/plugin
-
-	: # FIXME: see #645018, this only works for the native build :-/
-	if [ $(DEB_BUILD_ARCH) = $(DEB_HOST_ARCH) ] && [ $(DEB_HOST_ARCH) = $(DEB_TARGET_ARCH) ]; then \
-	  cp $(builddir)/gcc/build/gengtype $(d_pld)/$(gcc_lib_dir)/; \
-	  cp $(builddir)/gcc/gtype.state $(d_pld)/$(gcc_lib_dir)/; \
-	fi
+	DH_COMPAT=2 dh_movefiles -p$(p_pld) \
+		$(gcc_lib_dir)/plugin/include \
+		$(gcc_lib_dir)/plugin/gtype.state \
+		$(gcc_lexec_dir)/plugin/gengtype
 
 	debian/dh_doclink -p$(p_pld) $(p_xbase)
 	debian/dh_rmemptydirs -p$(p_pld)
diff --git a/debian/rules.patch b/debian/rules.patch
index fc40935..62b50aa 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -187,8 +187,6 @@ endif
 ifeq ($(DEB_TARGET_ARCH),m68k)
   debian_patches += m68k-ada
   debian_patches += m68k-revert-pr45144
-  # debian_patches += pr52714 FIXME, needs update
-  debian_patches += pr52306
 endif
 
 ifeq ($(DEB_TARGET_ARCH),powerpcspe)
diff --git a/debian/rules2 b/debian/rules2
index f36aa31..c9a7717 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -633,7 +633,8 @@ ifeq ($(trunk_build),yes)
   endif
   CONFARGS += --enable-checking=yes
 else
-  CONFARGS += --enable-checking=release
+  #CONFARGS += --enable-checking=release
+  CONFARGS += --enable-checking=yes
 endif
 
 CONFARGS += \