Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/2.5/160-glibc-2.4-i686-assembler.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Fri Sep 05 11:16:26 2008 +0000 (2008-09-05)
branch1.2
changeset 841 918cc0a7bd0a
permissions -rw-r--r--
Backport #973 from trunk:
Don't allow to specify an ABI for ARM EABI builds: the ABI is implied by the fact we're building for EABI.

/branches/1.2/arch/arm/functions | 19 3 16 0 +++----------------
/branches/1.2/arch/arm/config.in | 9 6 3 0 ++++++---
2 files changed, 9 insertions(+), 19 deletions(-) 
     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