From 9c8d079c425b540f969471e21264a6f43f0ad13d Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Wed, 19 Jun 2002 15:00:09 -0400
Subject: [PATCH] Makefile.in (unstrap, restrap): New targets.

        * Makefile.in (unstrap, restrap): New targets.
        (bootstrap): Mention restrap.

From-SVN: r54795
---
 gcc/ChangeLog   |  5 +++++
 gcc/Makefile.in | 13 ++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 53734cad683..e9c8968502f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-19  Jason Merrill  <jason@redhat.com>
+
+	* Makefile.in (unstrap, restrap): New targets.
+	(bootstrap): Mention restrap.
+
 2002-06-19  Ian Dall  <ian@sibyl.beware.dropbear.id.au>
 
 	* config/ns32k/ns32k.md: Give "*xxx" names to all unnamed insn's.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index bba2c9bb7ac..46d42530b8f 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3276,7 +3276,8 @@ bootstrap: stage3_build
 	@echo
 	@echo Bootstrap complete - make \"quickstrap\" to redo last build,
 	@echo \"restage1\" through \"restage3\" to rebuild specific stages,
-	@echo or \"cleanstrap\" to redo the bootstrap from scratch.
+	@echo \"restrap\" to redo the bootstrap from stage1, or
+	@echo \"cleanstrap\" to redo the bootstrap from scratch.
 
 bootstrap-lean : clean_s1 clean_s2 stage3_build
 	@echo
@@ -3345,6 +3346,16 @@ cleanstrap:
 	-$(MAKE) clean
 	$(MAKE) LANGUAGES="$(LANGUAGES)" bootstrap
 
+unstrap:
+	-rm -rf stage[234]*
+	$(MAKE) unstage1
+
+# Differs from cleanstrap in that it starts from the earlier stage1 build,
+# not from scratch.
+restrap:
+	$(MAKE) unstrap
+	$(MAKE) LANGUAGES="$(LANGUAGES)" bootstrap
+
 # Compare the object files in the current directory with those in the
 # stage2 directory.