From 459d4972e8e152ff080e74d4a811f69fc20a413f Mon Sep 17 00:00:00 2001 From: Joern Rennecke Date: Thu, 25 Nov 2010 08:02:13 +0000 Subject: [PATCH] re PR bootstrap/45888 (tm.texi generation is not portable, rule is broken) 2010-11-25 Joern Rennecke Ralf Wildenhues PR bootstrap/45888 * Makefile.in (s-tm-texi): Remove \r occurences from tmp-tm.texi. Fix target.def pathname in timestamp comparison. Co-Authored-By: Ralf Wildenhues From-SVN: r167137 --- gcc/ChangeLog | 7 +++++++ gcc/Makefile.in | 11 ++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 275e141..07fad35 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2010-11-25 Joern Rennecke + Ralf Wildenhues + + 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 * config/ia64/predicates.md (pmpyshr_operand): New. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 3a86343..3165f10 100644 --- 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; \ -- 2.7.4