patches/gcc/4.3.1/350-pr24170.patch
changeset 746 b150d6f590fc
parent 552 4edbcdb17e3d
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/patches/gcc/4.3.1/350-pr24170.patch	Mon Jul 28 21:08:01 2008 +0000
     1.3 @@ -0,0 +1,61 @@
     1.4 +Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/61_all_gcc43-pr24170.patch
     1.5 +http://gcc.gnu.org/PR24170
     1.6 +
     1.7 +2008-02-20  Tom Tromey  <tromey@redhat.com>
     1.8 +
     1.9 +	PR libgcj/24170:
    1.10 +	* java/io/natFilePosix.cc (File::performList): Don't use
    1.11 +	readdir_r.
    1.12 +	* configure, include/config.h.in: Rebuilt.
    1.13 +	* configure.ac: Don't check for readdir_r.
    1.14 +
    1.15 +diff -durN gcc-4.3.1.orig/libjava/configure.ac gcc-4.3.1/libjava/configure.ac
    1.16 +--- gcc-4.3.1.orig/libjava/configure.ac	2008-06-10 14:57:42.000000000 +0200
    1.17 ++++ gcc-4.3.1/libjava/configure.ac	2008-06-10 14:58:13.000000000 +0200
    1.18 +@@ -1030,7 +1030,7 @@
    1.19 +    PLATFORMNET=NoNet
    1.20 + else
    1.21 +    AC_CHECK_FUNCS([strerror_r select fstat open fsync sleep opendir \
    1.22 +-                   localtime_r readdir_r getpwuid_r getcwd \
    1.23 ++                   localtime_r getpwuid_r getcwd \
    1.24 + 		   access stat lstat mkdir rename rmdir unlink utime chmod readlink \
    1.25 + 		   nl_langinfo setlocale \
    1.26 + 		   inet_pton uname inet_ntoa \
    1.27 +diff -durN gcc-4.3.1.orig/libjava/include/config.h.in gcc-4.3.1/libjava/include/config.h.in
    1.28 +--- gcc-4.3.1.orig/libjava/include/config.h.in	2007-07-31 18:17:21.000000000 +0200
    1.29 ++++ gcc-4.3.1/libjava/include/config.h.in	2008-06-10 14:58:13.000000000 +0200
    1.30 +@@ -214,9 +214,6 @@
    1.31 + /* Define to 1 if you have the <pwd.h> header file. */
    1.32 + #undef HAVE_PWD_H
    1.33 + 
    1.34 +-/* Define to 1 if you have the `readdir_r' function. */
    1.35 +-#undef HAVE_READDIR_R
    1.36 +-
    1.37 + /* Define to 1 if you have the `readlink' function. */
    1.38 + #undef HAVE_READLINK
    1.39 + 
    1.40 +diff -durN gcc-4.3.1.orig/libjava/java/io/natFilePosix.cc gcc-4.3.1/libjava/java/io/natFilePosix.cc
    1.41 +--- gcc-4.3.1.orig/libjava/java/io/natFilePosix.cc	2007-08-04 23:50:01.000000000 +0200
    1.42 ++++ gcc-4.3.1/libjava/java/io/natFilePosix.cc	2008-06-10 14:58:13.000000000 +0200
    1.43 +@@ -1,6 +1,6 @@
    1.44 + // natFile.cc - Native part of File class for POSIX.
    1.45 + 
    1.46 +-/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006
    1.47 ++/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006, 2008
    1.48 +    Free Software Foundation
    1.49 + 
    1.50 +    This file is part of libgcj.
    1.51 +@@ -292,13 +292,7 @@
    1.52 + 
    1.53 +   java::util::ArrayList *list = new java::util::ArrayList ();
    1.54 +   struct dirent *d;
    1.55 +-#if defined(HAVE_READDIR_R) && defined(_POSIX_PTHREAD_SEMANTICS)
    1.56 +-  int name_max = pathconf (buf, _PC_NAME_MAX);
    1.57 +-  char dbuf[sizeof (struct dirent) + name_max + 1];
    1.58 +-  while (readdir_r (dir, (struct dirent *) dbuf, &d) == 0 && d != NULL)
    1.59 +-#else /* HAVE_READDIR_R */
    1.60 +   while ((d = readdir (dir)) != NULL)
    1.61 +-#endif /* HAVE_READDIR_R */
    1.62 +     {
    1.63 +       // Omit "." and "..".
    1.64 +       if (d->d_name[0] == '.'