Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/2.5/130-i686-assembler.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Jan 17 23:06:02 2010 +0100 (2010-01-17)
changeset 1740 c57458bb354d
parent 744 4bf8448536d5
permissions -rw-r--r--
configure: do not require hg when configuring in an hg clone

When configuring in an hg clone, we need hg to compute the version string.
It can happen that users do not have Mercurial (eg. if they got a snapshot
rather that they did a full clone). In this case, we can still run, of
course, so simply fill the version string with a sufficiently explicit
value, that does not require hg. The date is a good candidate. 
     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