patches/glibc/ports-2.12.1/120-i386-x86_64-revert-clone-cfi.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 revert cfi additions to clone on i386/x86_64 to workaround problems in
     2 gcc's unwinder code.  this is not a bug in glibc, it triggers problems
     3 elsewhere.  this cfi code does not gain us a whole lot anyways.
     4 
     5 http://gcc.gnu.org/ml/gcc/2006-12/msg00293.html
     6 
     7 Index: sysdeps/unix/sysv/linux/i386/clone.S
     8 ===================================================================
     9 RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/i386/clone.S,v
    10 retrieving revision 1.27
    11 retrieving revision 1.26
    12 diff -u -p -r1.27 -r1.26
    13 
    14 diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/i386/clone.S glibc-2.12.1/sysdeps/unix/sysv/linux/i386/clone.S
    15 --- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/i386/clone.S	2006-12-04 00:12:36.000000000 +0100
    16 +++ glibc-2.12.1/sysdeps/unix/sysv/linux/i386/clone.S	2009-11-13 00:49:45.000000000 +0100
    17 @@ -120,9 +120,6 @@
    18  	ret
    19  
    20  L(thread_start):
    21 -	cfi_startproc;
    22 -	/* Clearing frame pointer is insufficient, use CFI.  */
    23 -	cfi_undefined (eip);
    24  	/* Note: %esi is zero.  */
    25  	movl	%esi,%ebp	/* terminate the stack frame */
    26  #ifdef RESET_PID
    27 @@ -155,7 +152,6 @@
    28  	jmp	L(haspid)
    29  	.previous
    30  #endif
    31 -	cfi_endproc;
    32  
    33  	cfi_startproc
    34  PSEUDO_END (BP_SYM (__clone))
    35 diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/x86_64/clone.S glibc-2.12.1/sysdeps/unix/sysv/linux/x86_64/clone.S
    36 --- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/x86_64/clone.S	2006-12-04 00:12:36.000000000 +0100
    37 +++ glibc-2.12.1/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-11-13 00:49:45.000000000 +0100
    38 @@ -89,9 +89,6 @@
    39  	ret
    40  
    41  L(thread_start):
    42 -	cfi_startproc;
    43 -	/* Clearing frame pointer is insufficient, use CFI.  */
    44 -	cfi_undefined (rip);
    45  	/* Clear the frame pointer.  The ABI suggests this be done, to mark
    46  	   the outermost frame obviously.  */
    47  	xorl	%ebp, %ebp
    48 @@ -116,7 +113,6 @@
    49  	/* Call exit with return value from function call. */
    50  	movq	%rax, %rdi
    51  	call	HIDDEN_JUMPTARGET (_exit)
    52 -	cfi_endproc;
    53  
    54  	cfi_startproc;
    55  PSEUDO_END (BP_SYM (__clone))