Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.3.2/200-pr24170.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Mon Feb 13 21:47:25 2012 +0100 (2012-02-13)
changeset 2883 cea814c9932a
parent 747 d3e603e7c17c
permissions -rw-r--r--
libc/glibc: do not consume parameters when parsing them

Currently, there are two constructs used to parse arguments in
glibc backends, one that consumes args as they are parsed, and
one that does not.

Always use the construct that does not eat args as they are parsed.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 
     1 Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/61_all_gcc43-pr24170.patch

     2 http://gcc.gnu.org/PR24170

     3 

     4 2008-02-20  Tom Tromey  <tromey@redhat.com>

     5 

     6 	PR libgcj/24170:

     7 	* java/io/natFilePosix.cc (File::performList): Don't use

     8 	readdir_r.

     9 	* configure, include/config.h.in: Rebuilt.

    10 	* configure.ac: Don't check for readdir_r.

    11 

    12 diff -durN gcc-4.3.1.orig/libjava/configure.ac gcc-4.3.1/libjava/configure.ac

    13 --- gcc-4.3.1.orig/libjava/configure.ac	2008-06-10 14:57:42.000000000 +0200

    14 +++ gcc-4.3.1/libjava/configure.ac	2008-06-10 14:58:13.000000000 +0200

    15 @@ -1030,7 +1030,7 @@

    16     PLATFORMNET=NoNet

    17  else

    18     AC_CHECK_FUNCS([strerror_r select fstat open fsync sleep opendir \

    19 -                   localtime_r readdir_r getpwuid_r getcwd \

    20 +                   localtime_r getpwuid_r getcwd \

    21  		   access stat lstat mkdir rename rmdir unlink utime chmod readlink \

    22  		   nl_langinfo setlocale \

    23  		   inet_pton uname inet_ntoa \

    24 diff -durN gcc-4.3.1.orig/libjava/include/config.h.in gcc-4.3.1/libjava/include/config.h.in

    25 --- gcc-4.3.1.orig/libjava/include/config.h.in	2007-07-31 18:17:21.000000000 +0200

    26 +++ gcc-4.3.1/libjava/include/config.h.in	2008-06-10 14:58:13.000000000 +0200

    27 @@ -214,9 +214,6 @@

    28  /* Define to 1 if you have the <pwd.h> header file. */

    29  #undef HAVE_PWD_H

    30  

    31 -/* Define to 1 if you have the `readdir_r' function. */

    32 -#undef HAVE_READDIR_R

    33 -

    34  /* Define to 1 if you have the `readlink' function. */

    35  #undef HAVE_READLINK

    36  

    37 diff -durN gcc-4.3.1.orig/libjava/java/io/natFilePosix.cc gcc-4.3.1/libjava/java/io/natFilePosix.cc

    38 --- gcc-4.3.1.orig/libjava/java/io/natFilePosix.cc	2007-08-04 23:50:01.000000000 +0200

    39 +++ gcc-4.3.1/libjava/java/io/natFilePosix.cc	2008-06-10 14:58:13.000000000 +0200

    40 @@ -1,6 +1,6 @@

    41  // natFile.cc - Native part of File class for POSIX.

    42  

    43 -/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006

    44 +/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006, 2008

    45     Free Software Foundation

    46  

    47     This file is part of libgcj.

    48 @@ -292,13 +292,7 @@

    49  

    50    java::util::ArrayList *list = new java::util::ArrayList ();

    51    struct dirent *d;

    52 -#if defined(HAVE_READDIR_R) && defined(_POSIX_PTHREAD_SEMANTICS)

    53 -  int name_max = pathconf (buf, _PC_NAME_MAX);

    54 -  char dbuf[sizeof (struct dirent) + name_max + 1];

    55 -  while (readdir_r (dir, (struct dirent *) dbuf, &d) == 0 && d != NULL)

    56 -#else /* HAVE_READDIR_R */

    57    while ((d = readdir (dir)) != NULL)

    58 -#endif /* HAVE_READDIR_R */

    59      {

    60        // Omit "." and "..".

    61        if (d->d_name[0] == '.'
crosstool-ng