[PATCH] backport PR47612 fix; unbreak DEB_BUILD_OPTIONS=nostrap

[Thorsten Glaser <tg@debian.org>]

Hi,

please apply. This fixes what I believe an oversight that
broke DEB_BUILD_OPTIONS=nostrap, and backports an m68k fix
(actually, fix for all cc0 architectures) already in trunk
and probably soon in the 4.6 branch (while it does not fix
my Perl problem, it can apparently be hit in real life, as
the FreeMiNT people found).

Thanks,
//mirabilos
-- 
  “Having a smoking section in a restaurant is like having
          a peeing section in a swimming pool.”
						-- Edward Burr

diff -u gcc-4.6-4.6.2/debian/rules2 gcc-4.6-4.6.2/debian/rules2
--- gcc-4.6-4.6.2/debian/rules2
+++ gcc-4.6-4.6.2/debian/rules2
@@ -522,7 +522,6 @@
     endif
   endif
 endif
-      bootstrap_target = bootstrap-lean
 
 DEJAGNU_TIMEOUT=300
 # Increase the timeout for one testrun on slow architectures
diff -u gcc-4.6-4.6.2/debian/rules.patch gcc-4.6-4.6.2/debian/rules.patch
--- gcc-4.6-4.6.2/debian/rules.patch
+++ gcc-4.6-4.6.2/debian/rules.patch
@@ -88,6 +88,7 @@
 	$(if $(with_linaro_branch),,pr49030) \
 	$(if $(with_linaro_branch),,pr50193) \
 	pr50114 \
+	pr47612 \
 	libffi-m68k \
 
 #	$(if $(filter yes, $(DEB_CROSS)),,gcc-print-file-name) \
diff -u gcc-4.6-4.6.2/debian/changelog gcc-4.6-4.6.2/debian/changelog
--- gcc-4.6-4.6.2/debian/changelog
+++ gcc-4.6-4.6.2/debian/changelog
@@ -1,3 +1,10 @@
+gcc-4.6 (4.6.2-16+m68k.1) unreleased; urgency=low
+
+  * Add patch from PR47612.
+  * Unbreak DEB_BUILD_OPTIONS=nostrap
+
+ -- Thorsten Glaser <tg@mirbsd.de>  Mon, 27 Feb 2012 19:55:10 +0000
+
 gcc-4.6 (4.6.2-16) unstable; urgency=medium
 
   * Update to SVN 20120223 (r184520) from the gcc-4_6-branch (4.6.3 release
only in patch2:
unchanged:
--- gcc-4.6-4.6.2.orig/debian/patches/pr47612.diff
+++ gcc-4.6-4.6.2/debian/patches/pr47612.diff
@@ -0,0 +1,29 @@
+# DP: Attachment 23909 to fix PR rtl-optimization/47612
+
+--- a/src/gcc/df-problems.c	(revision 172094)
++++ b/src/gcc/df-problems.c	(working copy)
+@@ -4001,7 +4001,10 @@ can_move_insns_across (rtx from, rtx to,
+ 	  if (bitmap_intersect_p (merge_set, test_use)
+ 	      || bitmap_intersect_p (merge_use, test_set))
+ 	    break;
+-	  max_to = insn;
++#ifdef HAVE_cc0
++	  if (!sets_cc0_p (insn))
++#endif
++	    max_to = insn;
+ 	}
+       next = NEXT_INSN (insn);
+       if (insn == to)
+@@ -4038,7 +4041,11 @@ can_move_insns_across (rtx from, rtx to,
+     {
+       if (NONDEBUG_INSN_P (insn))
+ 	{
+-	  if (!bitmap_intersect_p (test_set, local_merge_live))
++	  if (!bitmap_intersect_p (test_set, local_merge_live)
++#ifdef HAVE_cc0
++	      && !sets_cc0_p (insn)
++#endif
++	      )
+ 	    {
+ 	      max_to = insn;
+ 	      break;