patches/glibc/ports-2.13/120-i386-x86_64-revert-clone-cfi.patch
author "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
Wed Dec 14 16:55:22 2011 +0100 (2011-12-14)
branch1.13
changeset 2848 1ff89596dab0
permissions -rw-r--r--
libc/eglibc: fix localedef 2.14 build

The localedef of eglibc 2.14 requires NOT_IN_libc to be defined in order to
compile intl/l10nflist.c.

This is because localedef is built separately from eglibc and uses some parts of
eglibc that don't compile in standalone without this preprocessor definition.

This fixes the following error:

[ALL ] gcc -g -O2 -DNO_SYSCONF -DNO_UNCOMPRESS
-DLOCALE_PATH='"/usr/lib/locale:/usr/share/i18n"'
-DLOCALEDIR='"/usr/lib/locale"' -DLOCALE_ALIAS_PATH='"/usr/share/locale"'
-DCHARMAP_PATH='"/usr/share/i18n/charmaps"'
-DREPERTOIREMAP_PATH='"/usr/share/i18n/repertoiremaps"'
-DLOCSRCDIR='"/usr/share/i18n/locales"' -Iglibc/locale/programs -Iglibc/locale
-I/<snip>/.build/src/eglibc-localedef-2_14/include
-I/<snip>/.build/src/eglibc-localedef-2_14 -I.
-include /<snip>/.build/src/eglibc-localedef-2_14/include/always.h -Wall
-Wno-format -c -o locarchive.o glibc/locale/programs/locarchive.c
[ALL ] glibc/locale/programs/locarchive.c: In function 'enlarge_archive':
[ALL ] glibc/locale/programs/locarchive.c:303:21: warning: variable
'oldlocrectab' set but not used [-Wunused-but-set-variable]
[ALL ] In file included from glibc/locale/programs/locarchive.c:651:0:
[ALL ] glibc/locale/programs/../../intl/l10nflist.c: In function
'_nl_normalize_codeset':
[ERROR] glibc/locale/programs/../../intl/l10nflist.c:342:9: error:
'_nl_C_locobj_ptr' undeclared (first use in this function)
[ALL ] glibc/locale/programs/../../intl/l10nflist.c:342:9: note: each
undeclared identifier is reported only once for each function it appears in
[ALL ] glibc/locale/programs/locarchive.c: In function
'add_locales_to_archive':
[ALL ] glibc/locale/programs/locarchive.c:1450:7: warning: passing argument
1 of '__xpg_basename' discards 'const' qualifier from pointer target type
[enabled by default]
[ALL ] /usr/include/libgen.h:35:14: note: expected 'char *' but argument is
of type 'const char *'
[ERROR] make[1]: *** [locarchive.o] Error 1

Signed-off-by: "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
(transplanted from 4cd9134739b594451794cf61a6e1b137422cdafd)
     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.13.orig/sysdeps/unix/sysv/linux/i386/clone.S glibc-2.13/sysdeps/unix/sysv/linux/i386/clone.S
    15 --- glibc-2.13.orig/sysdeps/unix/sysv/linux/i386/clone.S	2006-12-04 00:12:36.000000000 +0100
    16 +++ glibc-2.13/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.13.orig/sysdeps/unix/sysv/linux/x86_64/clone.S glibc-2.13/sysdeps/unix/sysv/linux/x86_64/clone.S
    36 --- glibc-2.13.orig/sysdeps/unix/sysv/linux/x86_64/clone.S	2006-12-04 00:12:36.000000000 +0100
    37 +++ glibc-2.13/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))