wok-next annotate glibc/stuff/glibc-2.14.1-gcc_fix-1.patch @ rev 13312
Add pcsc-lite
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Wed Aug 29 13:09:27 2012 +0200 (2012-08-29) |
| parents | |
| children |
| rev | line source |
|---|---|
| pankso@12269 | 1 Submitted By: Matt Burgess <matthew_at_linuxfromscratch_dot_org> |
| pankso@12269 | 2 Date: 2010-04-18 |
| pankso@12269 | 3 Initial Package Version: 2.11.1 |
| pankso@12269 | 4 Upstream Status: Not Submitted |
| pankso@12269 | 5 Origin: http://www.eglibc.org/archives/patches/msg00073.html |
| pankso@12269 | 6 Description: Fixes the following build problem with GCC-4.5.0: |
| pankso@12269 | 7 |
| pankso@12269 | 8 /mnt/lfs/sources/libc-build/math/s_frexp.os.dt -MT /mnt/lfs/sources/libc-build/math/s_frexp.os |
| pankso@12269 | 9 ./sysdeps/i386/fpu/s_frexp.S: Assembler messages: |
| pankso@12269 | 10 ./sysdeps/i386/fpu/s_frexp.S:66: Error: invalid identifier for ".ifdef" |
| pankso@12269 | 11 ./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1' |
| pankso@12269 | 12 ./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1' |
| pankso@12269 | 13 ./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1' |
| pankso@12269 | 14 ./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `.' |
| pankso@12269 | 15 ./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1' |
| pankso@12269 | 16 ./sysdeps/i386/fpu/s_frexp.S:66: Error: expected comma after name `' in .size directive |
| pankso@12269 | 17 ./sysdeps/i386/fpu/s_frexp.S:66: Error: ".endif" without ".if" |
| pankso@12269 | 18 ./sysdeps/i386/fpu/s_frexp.S:66: Error: junk `.get_pc_thunk.dx' after expression |
| pankso@12269 | 19 make[2]: *** [/mnt/lfs/sources/libc-build/math/s_frexp.os] Error 1 |
| pankso@12269 | 20 |
| pankso@12269 | 21 diff -Naur glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c |
| pankso@12269 | 22 --- glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c 2009-12-08 20:10:20.000000000 +0000 |
| pankso@12269 | 23 +++ glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c 2010-04-17 11:34:06.882681001 +0000 |
| pankso@12269 | 24 @@ -45,6 +45,11 @@ |
| pankso@12269 | 25 /* Embed an #include to pull in the alignment and .end directives. */ |
| pankso@12269 | 26 asm ("\n#include \"defs.h\""); |
| pankso@12269 | 27 |
| pankso@12269 | 28 +asm ("\n#if defined __i686 && defined __ASSEMBLER__"); |
| pankso@12269 | 29 +asm ("\n#undef __i686"); |
| pankso@12269 | 30 +asm ("\n#define __i686 __i686"); |
| pankso@12269 | 31 +asm ("\n#endif"); |
| pankso@12269 | 32 + |
| pankso@12269 | 33 /* The initial common code ends here. */ |
| pankso@12269 | 34 asm ("\n/*@HEADER_ENDS*/"); |
| pankso@12269 | 35 |
| pankso@12269 | 36 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 |
| pankso@12269 | 37 --- glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h 2009-12-08 20:10:20.000000000 +0000 |
| pankso@12269 | 38 +++ glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h 2010-04-17 11:34:06.882681001 +0000 |
| pankso@12269 | 39 @@ -29,6 +29,10 @@ |
| pankso@12269 | 40 #include <dl-sysdep.h> |
| pankso@12269 | 41 #include <tls.h> |
| pankso@12269 | 42 |
| pankso@12269 | 43 +#if defined __i686 && defined __ASSEMBLER__ |
| pankso@12269 | 44 +#undef __i686 |
| pankso@12269 | 45 +#define __i686 __i686 |
| pankso@12269 | 46 +#endif |
| pankso@12269 | 47 |
| pankso@12269 | 48 /* For Linux we can use the system call table in the header file |
| pankso@12269 | 49 /usr/include/asm/unistd.h |