patches/gcc/4.3.1/200-pr24170.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:06:16 2011 +0200 (2011-05-19)
changeset 2461 ec30b191f0e3
parent 746 b150d6f590fc
permissions -rw-r--r--
complibs/ppl: build only C and C++ interfaces for PPL

By default, PPL wants to build interfaces for any of a variety of
langauges it finds on the local host (python, java, possibly perl, also
more esoteric languages such as ocaml and prolog).

These extra interfaces can double the compile time for the library. For
single-process builds, I found a savings of more than 40%:

default / j1: 716s total, 143.2s avg, 0.52s stdev
just_c / j1: 406s total, 81.2s avg, 0.33s stdev
just_c_cpp / j1: 413s total, 82.6s avg, 0.22s stdev

And for multi-process builds, it approached 50%:

default / j4: 625s total, 125.0s avg, 0.57s stdev
just_c / j4: 338s total, 67.6s avg, 1.25s stdev
just_c_cpp / j4: 327s total, 65.4s avg, 0.36s stdev

Since the PPL we build within ct-ng is only used by GCC, we only need to
build the C and C++ interfaces.

Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com>
     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] == '.'