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 "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
Fri Jan 27 13:31:16 2012 +0100 (2012-01-27)
changeset 2854 a70abdbfa342
permissions -rw-r--r--
complibs/cloog: fix linking with libm

In Ubuntu 11.04 and 11.10, the default options for ld have changed.
--no-copy-dt-needed-entries and --as-needed are now enabled by default, which
causes errors like:

[EXTRA] Checking CLooG/ppl
[DEBUG] ==> Executing: 'make' '-j3' '-s' 'check'
[ALL ] Making check in .
[ALL ] config.status: creating include/cloog/cloog-config.h
[ALL ] config.status: include/cloog/cloog-config.h is unchanged
[ALL ] libtool: link: i686-build_pc-linux-gnu-gcc -Wall -fomit-frame-pointer
-pipe -o cloog cloog.o -L/<snip>/build/static/lib ./.libs/libcloog.a -lm
/<snip>/build/static/lib/libppl_c.a /<snip>/build/static/lib/libpwl.a
/<snip>/build/static/lib/libppl.a /<snip>/build/static/lib/libgmpxx.a
/<snip>/build/static/lib/libgmp.a -lstdc++
[ALL ] /usr/bin/ld: /<snip>/build/static/lib/libppl.a(MIP_Problem.o):
undefined reference to symbol 'sqrt@@GLIBC_2.0'
[ALL ] /usr/bin/ld: note: 'sqrt@@GLIBC_2.0' is defined in DSO
/usr/lib/gcc/i686-linux-gnu/4.6.1/../../../i386-linux-gnu/libm.so so try adding
it to the linker command line
[ALL ] /usr/lib/gcc/i686-linux-gnu/4.6.1/../../../i386-linux-gnu/libm.so:
could not read symbols: Invalid operation
[ALL ] collect2: ld returned 1 exit status
[ERROR] make[2]: *** [cloog] Error 1
[ERROR] make[1]: *** [check-recursive] Error 1

See:
https://wiki.ubuntu.com/NattyNarwhal/ToolchainTransition

This patch fixes these errors by placing '-lm' at the right place on the command
line as libppl requires libm when linking cloog.

Signed-off-by: "Benoît Thébaudeau" <benoit.thebaudeau@advansee.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