Sync Makefile.tpl with gcc.

	2016-04-13  Segher Boessenkool  <segher@kernel.crashing.org>

	PR bootstrap/70173
	* Makefile.tpl (local-distclean): Delete the libcc1, gnattools,
	and gotools directories.  Delete the stage_final file.
	* Makefile.in: Regenerate.

diff --git a/ChangeLog b/ChangeLog
index 3904dc134d82b4c1afde5a3ca1aa1fedef83767a..9ab3101a4a2e8b633803f6008d2ee4965a03c827 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2016-04-19  Nick Clifton  <nickc@redhat.com>
+
+       * Import this patch from the GCC mainline:
+
+       2016-04-13  Segher Boessenkool  <segher@kernel.crashing.org>
+
+       PR bootstrap/70173
+       * Makefile.tpl (local-distclean): Delete the libcc1, gnattools,
+       and gotools directories.  Delete the stage_final file.
+       * Makefile.in: Regenerate.
+
 2016-03-17  Cary Coutant  <ccoutant@gmail.com>
 
        * configure.ac: Add mips and s390 to the gold target check.

diff --git a/Makefile.in b/Makefile.in
index 1d01a625149bca4e79729fb0ffd6d85bdb574202..0de41670832f1915772935af0121c5070d157327 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2317,7 +2317,7 @@ local-clean:
 
 local-distclean:
        -rm -f Makefile config.status config.cache mh-frag mt-frag
-       -rm -f maybedep.tmp serdep.tmp
+       -rm -f maybedep.tmp serdep.tmp stage_final
        -if [ "$(TARGET_SUBDIR)" != "." ]; then \
          rm -rf $(TARGET_SUBDIR); \
        else true; fi
@@ -2329,7 +2329,8 @@ local-distclean:
        -rm -f texinfo/doc/Makefile texinfo/po/POTFILES
        -rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null
        -rmdir texinfo/makeinfo texinfo/po texinfo/util 2>/dev/null
-       -rmdir fastjar gcc libiberty texinfo zlib 2>/dev/null
+       -rmdir fastjar gcc gnattools gotools libcc1 libiberty 2>/dev/null
+       -rmdir texinfo zlib 2>/dev/null
        -find . -name config.cache -exec rm -f {} \; \; 2>/dev/null
 
 local-maintainer-clean:

diff --git a/Makefile.tpl b/Makefile.tpl
index 5a9a83bfb76e84d5ec19fee6e919a0140dd49599..6be6c4eb330e14e613267ce48c7e5acc48341ac6 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -811,7 +811,7 @@ local-clean:
 
 local-distclean:
        -rm -f Makefile config.status config.cache mh-frag mt-frag
-       -rm -f maybedep.tmp serdep.tmp
+       -rm -f maybedep.tmp serdep.tmp stage_final
        -if [ "$(TARGET_SUBDIR)" != "." ]; then \
          rm -rf $(TARGET_SUBDIR); \
        else true; fi
@@ -823,7 +823,8 @@ local-distclean:
        -rm -f texinfo/doc/Makefile texinfo/po/POTFILES
        -rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null
        -rmdir texinfo/makeinfo texinfo/po texinfo/util 2>/dev/null
-       -rmdir fastjar gcc libiberty texinfo zlib 2>/dev/null
+       -rmdir fastjar gcc gnattools gotools libcc1 libiberty 2>/dev/null
+       -rmdir texinfo zlib 2>/dev/null
        -find . -name config.cache -exec rm -f {} \; \; 2>/dev/null
 
 local-maintainer-clean: