diff options
| author | rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-01-16 14:42:32 +0000 |
|---|---|---|
| committer | rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-01-16 14:42:32 +0000 |
| commit | f57638630e5831f423e01df7996ff2b54b52f746 (patch) | |
| tree | 448346a4b071523906dbff9bf5bc54e6dec0c70f /libjava | |
| parent | 1a9c54a35da528ea0ed834cd8303b31767be0c1f (diff) | |
| download | ppe42-gcc-f57638630e5831f423e01df7996ff2b54b52f746.tar.gz ppe42-gcc-f57638630e5831f423e01df7996ff2b54b52f746.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@155963 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 8 | ||||
| -rw-r--r-- | libjava/Makefile.am | 2 | ||||
| -rw-r--r-- | libjava/Makefile.in | 4 | ||||
| -rwxr-xr-x | libjava/scripts/makemake.tcl | 2 | ||||
| -rw-r--r-- | libjava/sources.am | 2 |
5 files changed, 13 insertions, 5 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d9e46976da2..d527c3578ea 100644 --- 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 f1076845c72..11c60dfe09f 100644 --- 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 188b055bf06..23461147ef2 100644 --- 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 521f604e69c..6d1eea95a34 100755 --- 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 3f33a905738..1ccc7b91e0f 100644 --- 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 |
