Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/ports-2.10.1/500-alpha-add-getsystats-support.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Tue Oct 16 20:57:44 2012 +0200 (2012-10-16)
changeset 3079 37831a33e07e
permissions -rw-r--r--
kernel/linux: fix using custom location

Currently, extract and patch are skipped as thus:
- using a custom directory of pre-installed headers
- a correctly named directory already exists

Otherwise, extract and patch are done.

The current second condition is wrong, because it allows the following
sequence to happen:
- a non-custom kernel is used
- a previous build only partially extracted the non-custom sources
- that p[revious build broke during extraction (eg. incomplete tarball...)
- a subsequent build will find a properly named directory, and will
thus skip extract and patch, which is wrong

Fix that by following the conditions in this table:

Type | Extract | Patch
----------------------+---------+-------
Pre-installed headers | N | N
custom directory | N | N
custom tarball | Y | N
mainstream tarball | Y | Y

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: David Holsgrove <david.holsgrove@xilinx.com> 
     1 2009-05-16  Aurelien Jarno  <aurelien@aurel32.net>

     2 

     3         * sysdeps/unix/sysv/linux/alpha/getsysstats.c (GET_NPROCS_PARSER):

     4         Change parameters and use next_line.

     5 

     6  ports/sysdeps/unix/sysv/linux/alpha/getsysstats.c |    5 +++--

     7  1 file changed, 3 insertions(+), 2 deletions(-)

     8 

     9 diff -durN glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/getsysstats.c glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/getsysstats.c

    10 --- glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/getsysstats.c	2009-05-16 10:36:20.000000000 +0200

    11 +++ glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/getsysstats.c	2009-11-13 00:51:07.000000000 +0100

    12 @@ -20,15 +20,16 @@

    13  

    14  

    15  /* We need to define a special parser for /proc/cpuinfo.  */

    16 -#define GET_NPROCS_PARSER(FP, BUFFER, RESULT)				   \

    17 +#define GET_NPROCS_PARSER(FD, BUFFER, CP, RE, BUFFER_END, RESULT)	   \

    18    do									   \

    19      {									   \

    20        /* Find the line that contains the information about the number of   \

    21  	 active cpus.  We don't have to fear extremely long lines since	   \

    22  	 the kernel will not generate them.  8192 bytes are really enough. \

    23  	 If there is no "CPUs ..." line then we are on a UP system.  */	   \

    24 +      char *l;								   \

    25        (RESULT) = 1;							   \

    26 -      while (fgets_unlocked (BUFFER, sizeof (BUFFER), FP) != NULL)	   \

    27 +      while ((l = next_line (FD, BUFFER, &CP, &RE, BUFFER_END)) != NULL)  \

    28  	if ((sscanf (BUFFER, "cpus active : %d", &(RESULT)) == 1)	   \

    29  	    || (sscanf (BUFFER, "CPUs probed %*d active %d",		   \

    30  			&(RESULT)) == 1))  				   \

    31 diff -durN glibc-2.10.1.orig/ports/sysdeps/unix/sysv/linux/alpha/getsysstats.c glibc-2.10.1/ports/sysdeps/unix/sysv/linux/alpha/getsysstats.c
crosstool-ng