Avoid tr '\n', for Solaris /usr/bin/tr.

contrib/
	* check_warning_flags.sh: Use \012 instead of \n with tr.

gcc/:
	PR gcc/42525
	* Makefile.in (write_entries_to_file, install-plugin):
	Use \012 instead of \n with tr.

libjava/:
	* Makefile.am (write_entries_to_file): Use \012 instead of \n
	with tr.
	* scripts/makemake.tcl: Likewise.
	* sources.am: Regenerate.
	* Makefile.in: Regenerate.

From-SVN: r155963

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index cd6fba615261bcf03d31d2fb6439749933a695e7..46c1cc3170b52204a5c3fce8bf1c4b6236a68213 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * check_warning_flags.sh: Use \012 instead of \n with tr.
+
 2010-01-05  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * dg-extract-results.sh: Don't use tail -n.

diff --git a/contrib/check_warning_flags.sh b/contrib/check_warning_flags.sh
index eb53832730cebe127b75b031154e044c5f644245..d9c5735abf81f039d0e2f01be1bbcff975032f81 100755 (executable)
--- a/contrib/check_warning_flags.sh
+++ b/contrib/check_warning_flags.sh
@@ -3,7 +3,7 @@
 # Check that the warning flags documented in invoke.texi match up
 # with what the compiler accepts.
 #
-# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 # Written by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>.
 #
 # This script is Free Software, and it can be copied, distributed and
@@ -147,7 +147,7 @@ remove_problematic_help_flags='
   /-$/d
   /=/d'
 help_flags=`
-  $CC --help -v 2>/dev/null | tr ' ' '\n' |
+  $CC --help -v 2>/dev/null | tr ' ' '\012' |
     sed -n '
       b a
       :a

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7d3889ec7c28e096b5d63a197c3d37a899e02ac5..f73bb9139fae2d01062d00de96b319ee4741fd20 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       PR gcc/42525
+       * Makefile.in (write_entries_to_file, install-plugin):
+       Use \012 instead of \n with tr.
+
 2010-01-16  Richard Sandiford  <r.sandiford@uk.ibm.com>
 
        * configure.ac (HAVE_AS_REF): New C macro.

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 2ff27d549af870145918c1fee508323f0fb808ea..d6a57c459e744477cdd59ebb1c37730ae112dd36 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -290,7 +290,7 @@ write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) \
             echo $$i; i=`expr $$i + $(write_entries_to_file_split)`; done), \
          $(shell echo "$(wordlist $(range), \
                          $(shell expr $(range) + $(write_entries_to_file_split) - 1), $(1))" \
-            | tr ' ' '\n' >> $(2)))
+            | tr ' ' '\012' >> $(2)))
 
 # --------
 # UNSORTED
@@ -4289,7 +4289,7 @@ install-plugin: installdirs lang.install-plugin s-header-vars
 # We keep the directory structure for files in config and .def files. All
 # other files are flattened to a single directory.
        $(mkinstalldirs) $(DESTDIR)$(plugin_includedir)
-       headers=`echo $(PLUGIN_HEADERS) | tr ' ' '\n' | sort -u`; \
+       headers=`echo $(PLUGIN_HEADERS) | tr ' ' '\012' | sort -u`; \
        srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`; \
        for file in $$headers; do \
          if [ -f $$file ] ; then \

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d9e46976da21b45e013a3909fc90c3ff56e91935..d527c3578ea565c727938589132ae3c0e183adb7 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * Makefile.am (write_entries_to_file): Use \012 instead of \n
+       with tr.
+       * scripts/makemake.tcl: Likewise.
+       * sources.am: Regenerate.
+       * Makefile.in: Regenerate.
+
 2010-01-09  Jakub Jelinek  <jakub@redhat.com>
 
        * gnu/gcj/convert/Convert.java (version): Update copyright notice

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index f1076845c7233b75fe4e5317d8034cfbb7ada005..11c60dfe09f357f0d2fdee00032e1bc448583902 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -26,7 +26,7 @@ write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) \
             echo $$i; i=`expr $$i + $(write_entries_to_file_split)`; done), \
          $(shell echo $(wordlist $(range), \
                          $(shell expr $(range) + $(write_entries_to_file_split) - 1), $(1)) \
-            | tr ' ' '\n' >> $(2)))
+            | tr ' ' '\012' >> $(2)))
 
 ## ################################################################
 

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 188b055bf0660a5c5586c29d28b3024836c118f4..23461147ef26fa09410276b4b1b1fef215ad1292 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -893,7 +893,7 @@ write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) \
             echo $$i; i=`expr $$i + $(write_entries_to_file_split)`; done), \
          $(shell echo $(wordlist $(range), \
                          $(shell expr $(range) + $(write_entries_to_file_split) - 1), $(1)) \
-            | tr ' ' '\n' >> $(2)))
+            | tr ' ' '\012' >> $(2)))
 
 
 # This is required by TL_AC_GXX_INCLUDE_DIR.
@@ -11946,7 +11946,7 @@ java/io.list: $(java_io_source_files)
 
 java/lang.list: $(java_lang_source_files)
        @$(mkinstalldirs) $(dir $@)
-       echo $(srcdir)/classpath/lib/java/lang/*.class | tr ' ' '\n' | fgrep -v Object.class | fgrep -v Class.class | egrep -v '(Ecos|Posix|Win32)Process' > java/lang.list
+       echo $(srcdir)/classpath/lib/java/lang/*.class | tr ' ' '\012' | fgrep -v Object.class | fgrep -v Class.class | egrep -v '(Ecos|Posix|Win32)Process' > java/lang.list
 
 -include java/lang.deps
 

diff --git a/libjava/scripts/makemake.tcl b/libjava/scripts/makemake.tcl
index 521f604e69c00e837698bee83a9fbd9ce96aaf02..6d1eea95a34f32551d4d5112bfe40cb5a03bd758 100755 (executable)
--- a/libjava/scripts/makemake.tcl
+++ b/libjava/scripts/makemake.tcl
@@ -357,7 +357,7 @@ proc emit_package_rule_to_list {package package_files_list} {
     # Object and Class are special cases due to an apparent compiler
     # bug.  Process is a special case because we don't build all
     # concrete implementations of Process on all platforms.
-    set omit "| tr ' ' '\\n' | fgrep -v Object.class | fgrep -v Class.class | egrep -v '\(Ecos\|Posix\|Win32\)Process' "
+    set omit "| tr ' ' '\\012' | fgrep -v Object.class | fgrep -v Class.class | egrep -v '\(Ecos\|Posix\|Win32\)Process' "
   } else {
     set omit ""
   }

diff --git a/libjava/sources.am b/libjava/sources.am
index 3f33a905738e0d8a2926e0b817c69b57a326ce46..1ccc7b91e0f24e9312b11eb74ea89ad8b238ee5f 100644 (file)
--- a/libjava/sources.am
+++ b/libjava/sources.am
@@ -4722,7 +4722,7 @@ java_lang_header_files = $(filter-out java/lang/Object.h java/lang/Class.h,$(pat
 
 java/lang.list: $(java_lang_source_files)
        @$(mkinstalldirs) $(dir $@)
-       echo $(srcdir)/classpath/lib/java/lang/*.class | tr ' ' '\n' | fgrep -v Object.class | fgrep -v Class.class | egrep -v '(Ecos|Posix|Win32)Process' > java/lang.list
+       echo $(srcdir)/classpath/lib/java/lang/*.class | tr ' ' '\012' | fgrep -v Object.class | fgrep -v Class.class | egrep -v '(Ecos|Posix|Win32)Process' > java/lang.list
 
 -include java/lang.deps