diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 8 | ||||
| -rw-r--r-- | libjava/classpath/ChangeLog.gcj | 6 | ||||
| -rwxr-xr-x | libjava/classpath/tools/Makefile.am | 2 | ||||
| -rw-r--r-- | libjava/classpath/tools/Makefile.in | 18 | ||||
| -rw-r--r-- | libjava/configure.ac | 2 | ||||
| -rw-r--r-- | libjava/include/config.h.in | 3 | ||||
| -rw-r--r-- | libjava/java/io/natFilePosix.cc | 8 |
7 files changed, 26 insertions, 21 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 33813125d55..8358c4a04ee 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2008-02-20 Tom Tromey <tromey@redhat.com> + + PR libgcj/24170: + * java/io/natFilePosix.cc (File::performList): Don't use + readdir_r. + * configure, include/config.h.in: Rebuilt. + * configure.ac: Don't check for readdir_r. + 2008-02-16 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> PR libgcj/33085 diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index c28eba0be82..ef35119e8ff 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,3 +1,9 @@ +2008-02-20 Matthias Klose <doko@ubuntu.com> + + * tools/Makefile.am ($(TOOLS_ZIP)): Revert part of previous change, + Do copy resource files in JAVA_MAINTAINER_MODE only. + * tools/Makefile.in: Regenerate. + 2008-02-18 Jakub Jelinek <jakub@redhat.com> * doc/cp-tools.texinfo (@direntry): Prefix info name with cp-. diff --git a/libjava/classpath/tools/Makefile.am b/libjava/classpath/tools/Makefile.am index 22a6e3874b3..de54eed094a 100755 --- a/libjava/classpath/tools/Makefile.am +++ b/libjava/classpath/tools/Makefile.am @@ -186,7 +186,6 @@ if JAVA_MAINTAINER_MODE AC=`echo $(JCOMPILER) | sed -e 's/UTF-8/ISO-8859-1/g'`; \ $$AC -g -w -d $(srcdir)/asm @asm.lst $(JCOMPILER) -g -w -d $(srcdir)/classes @classes.lst @vm-tools.lst -endif ## Copy over tools resource files. @list=`cd $(top_srcdir)/resource && find gnu/classpath/tools \ com/sun/javadoc com/sun/tools/doclets com/sun/tools/javac \ @@ -197,6 +196,7 @@ endif echo " cp $(top_srcdir)/resource/$$p classes/$$p"; \ cp $(top_srcdir)/resource/$$p classes/$$p; \ done +endif ## Copy over rmic template files. @list=`cd $(srcdir) && find gnu/classpath/tools -name \*.jav -print`; \ for p in $$list; do \ diff --git a/libjava/classpath/tools/Makefile.in b/libjava/classpath/tools/Makefile.in index a2d2ed7d44e..ef1b2d06e96 100644 --- a/libjava/classpath/tools/Makefile.in +++ b/libjava/classpath/tools/Makefile.in @@ -1132,15 +1132,15 @@ $(TOOLS_ZIP): $(TOOLS_JAVA_FILES) @JAVA_MAINTAINER_MODE_TRUE@ AC=`echo $(JCOMPILER) | sed -e 's/UTF-8/ISO-8859-1/g'`; \ @JAVA_MAINTAINER_MODE_TRUE@ $$AC -g -w -d $(srcdir)/asm @asm.lst @JAVA_MAINTAINER_MODE_TRUE@ $(JCOMPILER) -g -w -d $(srcdir)/classes @classes.lst @vm-tools.lst - @list=`cd $(top_srcdir)/resource && find gnu/classpath/tools \ - com/sun/javadoc com/sun/tools/doclets com/sun/tools/javac \ - sun/rmi/rmic -name \*.properties -print`; \ - for p in $$list; do \ - dirname=classes/`dirname $$p`; \ - if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \ - echo " cp $(top_srcdir)/resource/$$p classes/$$p"; \ - cp $(top_srcdir)/resource/$$p classes/$$p; \ - done +@JAVA_MAINTAINER_MODE_TRUE@ @list=`cd $(top_srcdir)/resource && find gnu/classpath/tools \ +@JAVA_MAINTAINER_MODE_TRUE@ com/sun/javadoc com/sun/tools/doclets com/sun/tools/javac \ +@JAVA_MAINTAINER_MODE_TRUE@ sun/rmi/rmic -name \*.properties -print`; \ +@JAVA_MAINTAINER_MODE_TRUE@ for p in $$list; do \ +@JAVA_MAINTAINER_MODE_TRUE@ dirname=classes/`dirname $$p`; \ +@JAVA_MAINTAINER_MODE_TRUE@ if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \ +@JAVA_MAINTAINER_MODE_TRUE@ echo " cp $(top_srcdir)/resource/$$p classes/$$p"; \ +@JAVA_MAINTAINER_MODE_TRUE@ cp $(top_srcdir)/resource/$$p classes/$$p; \ +@JAVA_MAINTAINER_MODE_TRUE@ done @list=`cd $(srcdir) && find gnu/classpath/tools -name \*.jav -print`; \ for p in $$list; do \ dirname=classes/`dirname $$p`; \ diff --git a/libjava/configure.ac b/libjava/configure.ac index 0abf1bf87a9..2ef3b7245b0 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -1023,7 +1023,7 @@ if test "x${with_newlib}" = "xyes"; then PLATFORMNET=NoNet else AC_CHECK_FUNCS([strerror_r select fstat open fsync sleep opendir \ - localtime_r readdir_r getpwuid_r getcwd \ + localtime_r getpwuid_r getcwd \ access stat lstat mkdir rename rmdir unlink utime chmod readlink \ nl_langinfo setlocale \ inet_pton uname inet_ntoa \ diff --git a/libjava/include/config.h.in b/libjava/include/config.h.in index 99da702417c..3fdde3944f2 100644 --- a/libjava/include/config.h.in +++ b/libjava/include/config.h.in @@ -214,9 +214,6 @@ /* Define to 1 if you have the <pwd.h> header file. */ #undef HAVE_PWD_H -/* Define to 1 if you have the `readdir_r' function. */ -#undef HAVE_READDIR_R - /* Define to 1 if you have the `readlink' function. */ #undef HAVE_READLINK diff --git a/libjava/java/io/natFilePosix.cc b/libjava/java/io/natFilePosix.cc index ead28557f6e..5b6ec8458ac 100644 --- a/libjava/java/io/natFilePosix.cc +++ b/libjava/java/io/natFilePosix.cc @@ -1,6 +1,6 @@ // natFile.cc - Native part of File class for POSIX. -/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006 +/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006, 2008 Free Software Foundation This file is part of libgcj. @@ -292,13 +292,7 @@ java::io::File::performList (java::io::FilenameFilter *filter, java::util::ArrayList *list = new java::util::ArrayList (); struct dirent *d; -#if defined(HAVE_READDIR_R) && defined(_POSIX_PTHREAD_SEMANTICS) - int name_max = pathconf (buf, _PC_NAME_MAX); - char dbuf[sizeof (struct dirent) + name_max + 1]; - while (readdir_r (dir, (struct dirent *) dbuf, &d) == 0 && d != NULL) -#else /* HAVE_READDIR_R */ while ((d = readdir (dir)) != NULL) -#endif /* HAVE_READDIR_R */ { // Omit "." and "..". if (d->d_name[0] == '.' |