This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

RFA: Fix bootstrap/45888


As discussed in the PR, this patch removes the extra \r characters from the
MinGW generated tm.texi so that can match the one from svn.

Bootstrapped in i686-pc-linux-gnu .

Cesar Strauss has confirmed that this patch fixes the build issue on MinGW.
2010-11-15  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.

Index: Makefile.in
===================================================================
--- Makefile.in	(revision 166756)
+++ Makefile.in	(working copy)
@@ -3705,11 +3705,20 @@ s-tm-texi: $(srcdir)/doc/../doc/tm.texi
 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
+	@# 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.
+	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; \

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]