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>
Wed Dec 05 20:31:43 2012 +0100 (2012-12-05)
changeset 3134 863723936e24
permissions -rw-r--r--
scripts/xldd: use user's sed and grep

xldd uses sed and grep as detected by ./configure. This works well if is
used on the machine that build the toolchain.

But if the user moves the toolchain to another machine where sed and grep
are not in the same directory (eg. /bin/sed vs. /usr/bin/sed), then xldd
will stop functionning.

Fix that by using ${SED} and ${GREP} if they are set in the environment.

Reported-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> 
     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