patches/glibc/2.9/900-march-i686.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sat Dec 31 18:47:37 2011 +0100 (2011-12-31)
changeset 2829 0c3c95f911ec
permissions -rw-r--r--
docs: credit Konrad EISELE for the initial multilib support

Konrad submitted an initial patch adding multlib support:
http://sourceware.org/ml/crossgcc/2011-11/msg00040.html

The patch was full of good ideas, but had a few issues, so
I (Yann E. MORIN) started it all from scatch, re-using part
of the original patch. This got implemented in this series:
hg log -r 446a17b5dd1e:e47d17391ae3

As I forgot to credit Konrad in these changelogs, update the
docs so that the work by Konrad gets credited. Without his
initial effort, we would probably not have had multlib support
so soon. Thank you Konrad!

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.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.9.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.9/nptl/sysdeps/pthread/pt-initfini.c
     7 --- glibc-2.9.orig/nptl/sysdeps/pthread/pt-initfini.c	2009-12-08 21:10:20.000000000 +0100
     8 +++ glibc-2.9/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.9.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.9/sysdeps/unix/sysv/linux/i386/sysdep.h
    22 --- glibc-2.9.orig/sysdeps/unix/sysv/linux/i386/sysdep.h	2009-12-08 21:10:20.000000000 +0100
    23 +++ glibc-2.9/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