net147@3033: Submitted By: Matt Burgess net147@3033: Date: 2010-04-18 net147@3033: Initial Package Version: 2.11.1 net147@3033: Upstream Status: Not Submitted net147@3033: Origin: http://www.eglibc.org/archives/patches/msg00073.html net147@3033: Description: Fixes the following build problem with GCC-4.5.0: net147@3033: net147@3033: /mnt/lfs/sources/libc-build/math/s_frexp.os.dt -MT /mnt/lfs/sources/libc-build/math/s_frexp.os net147@3033: ./sysdeps/i386/fpu/s_frexp.S: Assembler messages: net147@3033: ./sysdeps/i386/fpu/s_frexp.S:66: Error: invalid identifier for ".ifdef" net147@3033: ./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1' net147@3033: ./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1' net147@3033: ./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1' net147@3033: ./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `.' net147@3033: ./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1' net147@3033: ./sysdeps/i386/fpu/s_frexp.S:66: Error: expected comma after name `' in .size directive net147@3033: ./sysdeps/i386/fpu/s_frexp.S:66: Error: ".endif" without ".if" net147@3033: ./sysdeps/i386/fpu/s_frexp.S:66: Error: junk `.get_pc_thunk.dx' after expression net147@3033: make[2]: *** [/mnt/lfs/sources/libc-build/math/s_frexp.os] Error 1 net147@3033: net147@3033: diff -Naur glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c net147@3033: --- glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c 2009-12-08 20:10:20.000000000 +0000 net147@3033: +++ glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c 2010-04-17 11:34:06.882681001 +0000 net147@3033: @@ -45,6 +45,11 @@ net147@3033: /* Embed an #include to pull in the alignment and .end directives. */ net147@3033: asm ("\n#include \"defs.h\""); net147@3033: net147@3033: +asm ("\n#if defined __i686 && defined __ASSEMBLER__"); net147@3033: +asm ("\n#undef __i686"); net147@3033: +asm ("\n#define __i686 __i686"); net147@3033: +asm ("\n#endif"); net147@3033: + net147@3033: /* The initial common code ends here. */ net147@3033: asm ("\n/*@HEADER_ENDS*/"); net147@3033: net147@3033: diff -Naur glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h net147@3033: --- glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h 2009-12-08 20:10:20.000000000 +0000 net147@3033: +++ glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h 2010-04-17 11:34:06.882681001 +0000 net147@3033: @@ -29,6 +29,10 @@ net147@3033: #include net147@3033: #include net147@3033: net147@3033: +#if defined __i686 && defined __ASSEMBLER__ net147@3033: +#undef __i686 net147@3033: +#define __i686 __i686 net147@3033: +#endif net147@3033: net147@3033: /* For Linux we can use the system call table in the header file net147@3033: /usr/include/asm/unistd.h net147@3033: