patches/glibc/2.6/130-i686-assembler.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Wed May 20 20:13:13 2009 +0000 (2009-05-20)
changeset 1345 27fec561af53
parent 744 4bf8448536d5
permissions -rw-r--r--
Merge the uClinux/noMMU stuff back to /trunk:
- merge Linux and uClinux back to a single kernel
- add ARCH_USE_MMU and acquainted config options that
architectures can auto-select
- make binutils and elf2flt two "Binary utilities" that
go in a single common sub-{menu,directory} structure

-------- diffstat follows --------
/trunk/scripts/build/kernel/uclinux.sh | 2 0 2 0 -
/trunk/scripts/build/kernel/linux.sh | 206 204 2 0 +++++++++++++++++++++++++++++
/trunk/scripts/build/kernel/linux-common.sh | 198 0 198 0 ----------------------------
/trunk/scripts/build/binutils.sh | 232 0 232 0 --------------------------------
/trunk/scripts/build/elf2flt.sh | 150 0 150 0 ---------------------
/trunk/scripts/crosstool-NG.sh.in | 6 4 2 0 +
/trunk/config/kernel/linux.in | 249 249 0 0 +++++++++++++++++++++++++++++++++++
/trunk/config/kernel/linux.in-common | 252 0 252 0 -----------------------------------
/trunk/config/kernel/uclinux.in | 21 0 21 0 ---
/trunk/config/target.in | 23 22 1 0 +++
/trunk/config/elf2flt.in | 49 0 49 0 -------
/trunk/config/libc/glibc.in | 2 1 1 0
/trunk/config/libc/eglibc.in | 2 1 1 0
/trunk/config/config.in | 1 0 1 0 -
/trunk/config/arch/sh.in | 1 1 0 0 +
/trunk/config/arch/arm.in | 2 1 1 0
/trunk/config/arch/powerpc.in | 1 1 0 0 +
/trunk/config/arch/ia64.in | 1 1 0 0 +
/trunk/config/arch/alpha.in | 1 1 0 0 +
/trunk/config/arch/x86.in | 1 1 0 0 +
/trunk/config/arch/mips.in | 1 1 0 0 +
/trunk/config/arch/powerpc64.in | 1 1 0 0 +
22 files changed, 489 insertions(+), 913 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