Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/2.6/130-i686-assembler.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Wed Jan 26 00:04:41 2011 +0100 (2011-01-26)
branch1.9
changeset 2291 075510bba768
parent 744 4bf8448536d5
permissions -rw-r--r--
libc/mingw: do not remove support symlink

Under mingw, it seems that there is a mix between the traditional /usr
directory, and a similar-purposed /mingw directory (both in the sysroot).

Currently, we create /mingw as a symlink to /usr, and we removed it in
the libc-finish step.

Unfortunately, this prevents the pre-processor to find the headers.
Keeping the symlink makes it magically work...

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from fa5c70b11fecf390c78780fe8f8ba0a836a59e92) 
     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 

     7 

     8 Index: glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h

     9 ===================================================================

    10 --- glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h	(revision 1469)

    11 +++ glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h	(working copy)

    12 @@ -29,6 +29,10 @@

    13  #include <dl-sysdep.h>

    14  #include <tls.h>

    15  

    16 +#if defined __i686 && defined __ASSEMBLER__

    17 +#undef __i686

    18 +#define __i686 __i686

    19 +#endif

    20  

    21  /* For Linux we can use the system call table in the header file

    22  	/usr/include/asm/unistd.h

    23 Index: glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c

    24 ===================================================================

    25 --- glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c	(revision 1469)

    26 +++ glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c	(working copy)

    27 @@ -45,6 +45,11 @@

    28  /* Embed an #include to pull in the alignment and .end directives. */

    29  asm ("\n#include \"defs.h\"");

    30  

    31 +asm ("\n#if defined __i686 && defined __ASSEMBLER__");

    32 +asm ("\n#undef __i686");

    33 +asm ("\n#define __i686 __i686");

    34 +asm ("\n#endif");

    35 +

    36  /* The initial common code ends here. */

    37  asm ("\n/*@HEADER_ENDS*/");

    38
crosstool-ng