2010-11-25 Joern Rennecke <amylaar@spamcop.net>

	    Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	PR bootstrap/45888
	* Makefile.in (s-tm-texi): Remove \r occurences from tmp-tm.texi.
	Fix target.def pathname in timestamp comparison.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@167137 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 275e141e5143bc229789ea69744c4e17de30cd4c..07fad35d82825ad523edd8984df950ad658a51a6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-25  Joern Rennecke  <amylaar@spamcop.net>
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       PR bootstrap/45888
+       * Makefile.in (s-tm-texi): Remove \r occurences from tmp-tm.texi.
+       Fix target.def pathname in timestamp comparison.
+
 2010-11-24  Richard Henderson  <rth@redhat.com>
 
        * config/ia64/predicates.md (pmpyshr_operand): New.

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 3a86343f55c67ca6df91829e840ac3c01f0ac086..3165f101fff2426ce1ba8adfbae9df61c21161c4 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3722,14 +3722,23 @@ s-target-hooks-def-h: build/genhooks$(build_exeext)
 # We use a different pathname here to avoid a circular dependency.
 s-tm-texi: $(srcdir)/doc/../doc/tm.texi
 
+# The tm.texi we want to compare against / check into svn should have
+# unix-style line endings.  To make this work on MinGW, remove \r.
+# \r is not portable to Solaris tr, therefore we have a special
+# case for ASCII.  We use \r for other encodings like EBCDIC.
 s-tm-texi: build/genhooks$(build_exeext) $(srcdir)/doc/tm.texi.in
        $(RUN_GEN) build/genhooks$(build_exeext) \
                        $(srcdir)/doc/tm.texi.in > tmp-tm.texi
+       case `echo X|tr X '\101'` in \
+         A) tr -d '\015' < tmp-tm.texi > tmp2-tm.texi ;; \
+         *) tr -d '\r' < tmp-tm.texi > tmp2-tm.texi ;; \
+       esac
+       mv tmp2-tm.texi tmp-tm.texi
        $(SHELL) $(srcdir)/../move-if-change tmp-tm.texi tm.texi
        @if cmp -s $(srcdir)/doc/tm.texi tm.texi; then \
          $(STAMP) $@; \
        elif test $(srcdir)/doc/tm.texi -nt $(srcdir)/doc/tm.texi.in \
-         && test $(srcdir)/doc/tm.texi -nt $(srcdir)/doc/target.def; then \
+         && test $(srcdir)/doc/tm.texi -nt $(srcdir)/target.def; then \
          echo >&2 ; \
          echo You should edit $(srcdir)/doc/tm.texi.in rather than $(srcdir)/doc/tm.texi . >&2 ; \
          false; \