diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-07-02 09:47:00 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2011-07-02 09:47:00 +0000 |
commit | 59d9085226d1f454611db8dfec409a355de2da45 (patch) | |
tree | 30c31d95eaad77814a30af63f0ad80ae1ce6fdb0 /toolchain/eglibc/patches/2.9 | |
parent | 4867656d72894dd366ebc38eae4850b58c80da97 (diff) | |
download | master-187ad058-59d9085226d1f454611db8dfec409a355de2da45.tar.gz master-187ad058-59d9085226d1f454611db8dfec409a355de2da45.tar.bz2 master-187ad058-59d9085226d1f454611db8dfec409a355de2da45.zip |
eglibc: remove old versions
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27360 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/eglibc/patches/2.9')
-rw-r--r-- | toolchain/eglibc/patches/2.9/100-darwin_cross.patch | 71 | ||||
-rw-r--r-- | toolchain/eglibc/patches/2.9/901-glibc_bug_7048.patch | 14 |
2 files changed, 0 insertions, 85 deletions
diff --git a/toolchain/eglibc/patches/2.9/100-darwin_cross.patch b/toolchain/eglibc/patches/2.9/100-darwin_cross.patch deleted file mode 100644 index a9fddb7d01..0000000000 --- a/toolchain/eglibc/patches/2.9/100-darwin_cross.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- a/libc/sunrpc/rpc/types.h -+++ b/libc/sunrpc/rpc/types.h -@@ -68,6 +68,7 @@ typedef unsigned long rpcport_t; - #include <sys/types.h> - #endif - -+#if !defined(_CROSS_RPCGEN_) || !defined(__APPLE__) - #ifndef __u_char_defined - typedef __u_char u_char; - typedef __u_short u_short; -@@ -83,6 +84,7 @@ typedef __daddr_t daddr_t; - typedef __caddr_t caddr_t; - # define __daddr_t_defined - #endif -+#endif - - #include <sys/time.h> - #include <sys/param.h> ---- a/libc/sunrpc/rpc_main.c -+++ b/libc/sunrpc/rpc_main.c -@@ -40,7 +40,11 @@ - #include <stdio.h> - #include <string.h> - #include <unistd.h> -+#ifdef _CROSS_RPCGEN_ -+#define gettext(X) (X) -+#else - #include <libintl.h> -+#endif - #include <ctype.h> - #include <sys/types.h> - #include <sys/param.h> -@@ -998,9 +1002,10 @@ mkfile_output (struct commandline *cmd) - abort (); - temp = rindex (cmd->infile, '.'); - cp = stpcpy (mkfilename, "Makefile."); -- if (temp != NULL) -- *((char *) stpncpy (cp, cmd->infile, temp - cmd->infile)) = '\0'; -- else -+ if (temp != NULL) { -+ strncpy (cp, cmd->infile, temp - cmd->infile); -+ cp[temp - cmd->infile - 1] = '\0'; -+ } else - stpcpy (cp, cmd->infile); - - } ---- a/libc/sunrpc/rpc_scan.c -+++ b/libc/sunrpc/rpc_scan.c -@@ -39,7 +39,11 @@ - #include <stdio.h> - #include <ctype.h> - #include <string.h> -+#ifdef _CROSS_RPCGEN_ -+#define gettext(X) (X) -+#else - #include <libintl.h> -+#endif - #include "rpc_scan.h" - #include "rpc_parse.h" - #include "rpc_util.h" ---- a/libc/timezone/Makefile -+++ b/libc/timezone/Makefile -@@ -181,7 +181,7 @@ zic-objs = zic.o ialloc.o scheck.o - $(objpfx)zic: $(addprefix $(objpfx), $(zic-objs)) - - $(addprefix $(objpfx)cross-,$(zic-objs)): $(objpfx)cross-%.o: %.c -- gcc $< -c $(OUTPUT_OPTION) $(CFLAGS-$*.c) $(CPPFLAGS-$*) \ -+ gcc $< -c $(OUTPUT_OPTION) $(filter-out -DHAVE_GETTEXT,$(CFLAGS-$*.c)) $(CPPFLAGS-$*) \ - -DCROSS_ZIC $(compile-mkdep-flags) - - $(objpfx)cross-zic: $(addprefix $(objpfx)cross-,$(zic-objs)) diff --git a/toolchain/eglibc/patches/2.9/901-glibc_bug_7048.patch b/toolchain/eglibc/patches/2.9/901-glibc_bug_7048.patch deleted file mode 100644 index 3d14a38831..0000000000 --- a/toolchain/eglibc/patches/2.9/901-glibc_bug_7048.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://sourceware.org/bugzilla/show_bug.cgi?id=7048 - ---- a/libc/sysdeps/i386/dl-tlsdesc.S -+++ b/libc/sysdeps/i386/dl-tlsdesc.S -@@ -128,8 +128,7 @@ - .Lslow: - cfi_adjust_cfa_offset (28) - movl %ebx, 16(%esp) -- call __i686.get_pc_thunk.bx -- addl $_GLOBAL_OFFSET_TABLE_, %ebx -+ LOAD_PIC_REG(bx) - call ___tls_get_addr@PLT - movl 16(%esp), %ebx - jmp .Lret |