patches/glibc/2.11.1/900-march-i686.patch
author Johannes Stezenbach <js@sig21.net>
Tue Oct 30 00:22:25 2012 +0000 (2012-10-30)
changeset 3097 5c67476c7342
permissions -rw-r--r--
scripts/functions: fix endless loop in debug-shell with IO redirection

CT_DEBUG_INTERACTIVE is disabled when stdin, stdout or
stderr are redirected, but the check is only done at
the start of the build and doesn't catch when individual
build commands use redirection. When stdin is redirected
it will cause the debug shell to exit immediately, causing
and endless loop. Thus, save the stdin/our/err file handles
and restore them before invoking the debug shell.

Signed-off-by: Johannes Stezenbach <js@sig21.net>
Message-Id: <20121030102225.GA8303@sig21.net>
Patchwork-Id: 195409
     1 2007-02-15  Khem Raj  <kraj@xxxxxxxxxx>
     2 
     3        * sysdeps/unix/sysv/linux/i386/sysdep.h: Re-define __i686.
     4        * nptl/sysdeps/pthread/pt-initfini.c: Ditto.
     5 
     6 diff -urN glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c
     7 --- glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c	2009-12-08 21:10:20.000000000 +0100
     8 +++ glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c	2010-12-30 11:33:31.520855595 +0100
     9 @@ -45,6 +45,11 @@
    10  /* Embed an #include to pull in the alignment and .end directives. */
    11  asm ("\n#include \"defs.h\"");
    12  
    13 +asm ("\n#if defined __i686 && defined __ASSEMBLER__");
    14 +asm ("\n#undef __i686");
    15 +asm ("\n#define __i686 __i686");
    16 +asm ("\n#endif");
    17 +
    18  /* The initial common code ends here. */
    19  asm ("\n/*@HEADER_ENDS*/");
    20  
    21 diff -urN glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h
    22 --- glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h	2009-12-08 21:10:20.000000000 +0100
    23 +++ glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h	2010-12-30 11:33:31.520855595 +0100
    24 @@ -29,6 +29,10 @@
    25  #include <dl-sysdep.h>
    26  #include <tls.h>
    27  
    28 +#if defined __i686 && defined __ASSEMBLER__
    29 +#undef __i686
    30 +#define __i686 __i686
    31 +#endif
    32  
    33  /* For Linux we can use the system call table in the header file
    34  	/usr/include/asm/unistd.h