mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2024-12-27 00:11:05 +00:00
ac4a37c8c4
This partially reverts commit 429b3e8846.
Bring back the patches for glibc 2.12 and newer. Propagate/refresh
some patches as needed.
Signed-off-by: Alexey Neyman <stilor@att.net>
51 lines
2.5 KiB
Diff
51 lines
2.5 KiB
Diff
Submitted By: Matt Burgess <matthew_at_linuxfromscratch_dot_org>
|
|
Date: 2010-04-18
|
|
Initial Package Version: 2.11.1
|
|
Upstream Status: Not Submitted
|
|
Origin: http://www.eglibc.org/archives/patches/msg00073.html
|
|
Description: Fixes the following build problem with GCC-4.5.0:
|
|
|
|
/mnt/lfs/sources/libc-build/math/s_frexp.os.dt -MT /mnt/lfs/sources/libc-build/math/s_frexp.os
|
|
./sysdeps/i386/fpu/s_frexp.S: Assembler messages:
|
|
./sysdeps/i386/fpu/s_frexp.S:66: Error: invalid identifier for ".ifdef"
|
|
./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1'
|
|
./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1'
|
|
./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1'
|
|
./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `.'
|
|
./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1'
|
|
./sysdeps/i386/fpu/s_frexp.S:66: Error: expected comma after name `' in .size directive
|
|
./sysdeps/i386/fpu/s_frexp.S:66: Error: ".endif" without ".if"
|
|
./sysdeps/i386/fpu/s_frexp.S:66: Error: junk `.get_pc_thunk.dx' after expression
|
|
make[2]: *** [/mnt/lfs/sources/libc-build/math/s_frexp.os] Error 1
|
|
|
|
diff -Naur glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c
|
|
--- glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c 2009-12-08 20:10:20.000000000 +0000
|
|
+++ glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c 2010-04-17 11:34:06.882681001 +0000
|
|
@@ -45,6 +45,11 @@
|
|
/* Embed an #include to pull in the alignment and .end directives. */
|
|
asm ("\n#include \"defs.h\"");
|
|
|
|
+asm ("\n#if defined __i686 && defined __ASSEMBLER__");
|
|
+asm ("\n#undef __i686");
|
|
+asm ("\n#define __i686 __i686");
|
|
+asm ("\n#endif");
|
|
+
|
|
/* The initial common code ends here. */
|
|
asm ("\n/*@HEADER_ENDS*/");
|
|
|
|
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
|
|
--- glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h 2009-12-08 20:10:20.000000000 +0000
|
|
+++ glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h 2010-04-17 11:34:06.882681001 +0000
|
|
@@ -29,6 +29,10 @@
|
|
#include <dl-sysdep.h>
|
|
#include <tls.h>
|
|
|
|
+#if defined __i686 && defined __ASSEMBLER__
|
|
+#undef __i686
|
|
+#define __i686 __i686
|
|
+#endif
|
|
|
|
/* For Linux we can use the system call table in the header file
|
|
/usr/include/asm/unistd.h
|
|
|