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