patches/glibc/2.12.2/900-march-i686.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Tue May 08 18:31:10 2012 +0200 (2012-05-08)
changeset 2964 d48c03998dc1
permissions -rw-r--r--
scripts: fix catching failures

POSIX 1003.1-2008 does not say whether "set -e" should catch a sub-shell
that exits with !0 (it has a list of conditions to catch, but no list of
conditions not to catch, and this situation is not listed).

bash-3 does not catch such a failure, but bash-4 does. That why, on my
Squeeze system I did not see the issue, while Thomas did on is Lenny chroot.

Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
     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.12.2.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.12.2/nptl/sysdeps/pthread/pt-initfini.c
     7 --- glibc-2.12.2.orig/nptl/sysdeps/pthread/pt-initfini.c	2009-10-30 18:17:08.000000000 +0100
     8 +++ glibc-2.12.2/nptl/sysdeps/pthread/pt-initfini.c	2010-12-30 11:36:19.858708534 +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.12.2.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.12.2/sysdeps/unix/sysv/linux/i386/sysdep.h
    22 --- glibc-2.12.2.orig/sysdeps/unix/sysv/linux/i386/sysdep.h	2009-10-30 18:17:08.000000000 +0100
    23 +++ glibc-2.12.2/sysdeps/unix/sysv/linux/i386/sysdep.h	2010-12-30 11:36:19.858708534 +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