summaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/uClibc/Makefile.inc4
-rw-r--r--toolchain/uClibc/patches/devel-prefix-lib.patch14
-rw-r--r--toolchain/uClibc/patches/fastat-64bithost.patch79
-rw-r--r--toolchain/uClibc/patches/mips.patch66
-rw-r--r--toolchain/uClibc/patches/mips64.patch22
-rw-r--r--toolchain/uClibc/patches/sparc.patch26
6 files changed, 9 insertions, 202 deletions
diff --git a/toolchain/uClibc/Makefile.inc b/toolchain/uClibc/Makefile.inc
index 1ffcde868..f02b99e1a 100644
--- a/toolchain/uClibc/Makefile.inc
+++ b/toolchain/uClibc/Makefile.inc
@@ -2,8 +2,8 @@
# material, please see the LICENCE file in the top-level directory.
PKG_NAME:= uClibc
-PKG_VERSION:= 0.9.30.2
+PKG_VERSION:= 0.9.30.3
PKG_RELEASE:= 1
-PKG_MD5SUM:= e759ec855500082ac3e671dd6cacfdb0
+PKG_MD5SUM:= 73a4bf4a0fa508b01a7a3143574e3d21
PKG_SITES:= http://uclibc.org/downloads/
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/toolchain/uClibc/patches/devel-prefix-lib.patch b/toolchain/uClibc/patches/devel-prefix-lib.patch
index b0f8a8011..336fad1c7 100644
--- a/toolchain/uClibc/patches/devel-prefix-lib.patch
+++ b/toolchain/uClibc/patches/devel-prefix-lib.patch
@@ -1,6 +1,6 @@
-diff -Nur uClibc-0.9.30.1.orig/Makefile.in uClibc-0.9.30.1/Makefile.in
---- uClibc-0.9.30.1.orig/Makefile.in 2008-11-17 23:38:34.000000000 +0100
-+++ uClibc-0.9.30.1/Makefile.in 2009-12-07 20:34:07.000000000 +0100
+diff -Nur uClibc-0.9.30.3.orig/Makefile.in uClibc-0.9.30.3/Makefile.in
+--- uClibc-0.9.30.3.orig/Makefile.in 2010-03-12 20:32:42.000000000 +0100
++++ uClibc-0.9.30.3/Makefile.in 2010-03-12 22:05:15.486918488 +0100
@@ -190,7 +190,7 @@
install: install_runtime install_dev
@@ -8,12 +8,12 @@ diff -Nur uClibc-0.9.30.1.orig/Makefile.in uClibc-0.9.30.1/Makefile.in
-RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell $(top_srcdir)extra/scripts/relative_path.sh $(DEVEL_PREFIX)lib $(RUNTIME_PREFIX)lib)
+RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell $(top_srcdir)extra/scripts/relative_path.sh $(DEVEL_PREFIX_LIB)lib $(RUNTIME_PREFIX)lib)
- $(top_builddir)extra/scripts/unifdef: $(top_srcdir)extra/scripts/unifdef.c
+ $(top_builddir)extra/scripts/unifdef: $(top_srcdir)extra/scripts/unifdef.c|$(@D)
$(hcompile.u)
-@@ -370,41 +370,41 @@
+@@ -371,41 +371,41 @@
# Installs development library links.
- install_dev: install_headers all
+ install_dev: install_headers install_runtime
- $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)lib
- -$(INSTALL) -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)lib/
+ $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX_LIB)lib
@@ -64,7 +64,7 @@ diff -Nur uClibc-0.9.30.1.orig/Makefile.in uClibc-0.9.30.1/Makefile.in
| $(SED) -e 's/\.a$$/_pic.a/'`; \
done ; \
fi
-@@ -413,9 +413,9 @@
+@@ -414,9 +414,9 @@
ifeq ($(UCLIBC_FORMAT_SHARED_FLAT),y)
for file in lib/lib*.gdb; do \
if test -f $$file; then \
diff --git a/toolchain/uClibc/patches/fastat-64bithost.patch b/toolchain/uClibc/patches/fastat-64bithost.patch
deleted file mode 100644
index dee068d00..000000000
--- a/toolchain/uClibc/patches/fastat-64bithost.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -Nur uClibc-0.9.30.2.orig/libc/sysdeps/linux/common/fstatat64.c uClibc-0.9.30.2/libc/sysdeps/linux/common/fstatat64.c
---- uClibc-0.9.30.2.orig/libc/sysdeps/linux/common/fstatat64.c 2010-01-13 22:22:31.000000000 +0100
-+++ uClibc-0.9.30.2/libc/sysdeps/linux/common/fstatat64.c 2010-01-23 11:55:14.000000000 +0100
-@@ -12,6 +12,11 @@
-
- #ifdef __UCLIBC_HAS_LFS__
-
-+/* 64bit ports tend to favor newfstatat() */
-+#ifdef __NR_newfstatat
-+# define __NR_fstatat64 __NR_newfstatat
-+#endif
-+
- #ifdef __NR_fstatat64
- int fstatat64(int fd, const char *file, struct stat64 *buf, int flag)
- {
-diff -Nur uClibc-0.9.30.2.orig/libc/sysdeps/linux/common/fstatat.c uClibc-0.9.30.2/libc/sysdeps/linux/common/fstatat.c
---- uClibc-0.9.30.2.orig/libc/sysdeps/linux/common/fstatat.c 2010-01-13 22:22:31.000000000 +0100
-+++ uClibc-0.9.30.2/libc/sysdeps/linux/common/fstatat.c 2010-01-23 11:54:50.000000000 +0100
-@@ -10,15 +10,20 @@
- #include <sys/stat.h>
- #include "xstatconv.h"
-
-+/* 64bit ports tend to favor newfstatat() */
-+#ifdef __NR_newfstatat
-+# define __NR_fstatat64 __NR_newfstatat
-+#endif
-+
- #ifdef __NR_fstatat64
- int fstatat(int fd, const char *file, struct stat *buf, int flag)
- {
- int ret;
-- struct kernel_stat kbuf;
-+ struct kernel_stat64 kbuf;
-
- ret = INLINE_SYSCALL(fstatat64, 4, fd, file, &kbuf, flag);
- if (ret == 0)
-- __xstat_conv(&kbuf, buf);
-+ __xstat32_conv(&kbuf, buf);
-
- return ret;
- }
-diff -Nur uClibc-0.9.30.2.orig/libc/sysdeps/linux/common/xstatconv.c uClibc-0.9.30.2/libc/sysdeps/linux/common/xstatconv.c
---- uClibc-0.9.30.2.orig/libc/sysdeps/linux/common/xstatconv.c 2010-01-13 22:22:31.000000000 +0100
-+++ uClibc-0.9.30.2/libc/sysdeps/linux/common/xstatconv.c 2010-01-23 11:56:07.000000000 +0100
-@@ -70,4 +70,23 @@
- buf->st_ctim = kbuf->st_ctim;
- }
-
-+void __xstat32_conv(struct kernel_stat64 *kbuf, struct stat *buf)
-+{
-+ /* Convert to current kernel version of `struct stat64'. */
-+ memset(buf, 0x00, sizeof(*buf));
-+ buf->st_dev = kbuf->st_dev;
-+ buf->st_ino = kbuf->st_ino;
-+ buf->st_mode = kbuf->st_mode;
-+ buf->st_nlink = kbuf->st_nlink;
-+ buf->st_uid = kbuf->st_uid;
-+ buf->st_gid = kbuf->st_gid;
-+ buf->st_rdev = kbuf->st_rdev;
-+ buf->st_size = kbuf->st_size;
-+ buf->st_blksize = kbuf->st_blksize;
-+ buf->st_blocks = kbuf->st_blocks;
-+ buf->st_atim = kbuf->st_atim;
-+ buf->st_mtim = kbuf->st_mtim;
-+ buf->st_ctim = kbuf->st_ctim;
-+}
-+
- #endif /* __UCLIBC_HAS_LFS__ */
-diff -Nur uClibc-0.9.30.2.orig/libc/sysdeps/linux/common/xstatconv.h uClibc-0.9.30.2/libc/sysdeps/linux/common/xstatconv.h
---- uClibc-0.9.30.2.orig/libc/sysdeps/linux/common/xstatconv.h 2010-01-13 22:22:31.000000000 +0100
-+++ uClibc-0.9.30.2/libc/sysdeps/linux/common/xstatconv.h 2010-01-23 11:56:38.000000000 +0100
-@@ -26,6 +26,7 @@
- #include <bits/kernel_stat.h>
-
- extern void __xstat_conv(struct kernel_stat *kbuf, struct stat *buf) attribute_hidden;
-+extern void __xstat32_conv(struct kernel_stat64 *kbuf, struct stat *buf) attribute_hidden;
- #if defined __UCLIBC_HAS_LFS__
- extern void __xstat64_conv(struct kernel_stat64 *kbuf, struct stat64 *buf) attribute_hidden;
- #endif
diff --git a/toolchain/uClibc/patches/mips.patch b/toolchain/uClibc/patches/mips.patch
deleted file mode 100644
index 59bf5963c..000000000
--- a/toolchain/uClibc/patches/mips.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -Nur uClibc-0.9.30.2.orig/libc/sysdeps/linux/mips/crt1.S uClibc-0.9.30.2/libc/sysdeps/linux/mips/crt1.S
---- uClibc-0.9.30.2.orig/libc/sysdeps/linux/mips/crt1.S 2010-01-13 22:22:31.000000000 +0100
-+++ uClibc-0.9.30.2/libc/sysdeps/linux/mips/crt1.S 2010-01-24 20:33:06.297867491 +0100
-@@ -85,29 +85,10 @@
-
- __start:
- #ifdef __PIC__
--#if _MIPS_SIM == _MIPS_SIM_ABI32
-- .frame sp, 24, sp
-- .set noreorder
-- move $0, $31 /* Save old ra. */
-- bal 10f /* Find addr of cpload. */
-- nop
--10:
-- .cpload $31
-- move $31, $0
-- .set reorder
-- .cprestore 16
--#else
-- move $0, $31; /* Save old ra. */
-- .set noreorder
-- bal 10f /* Find addr of .cpsetup. */
-- nop
--10:
-- .set reorder
-- .cpsetup $31, $25, 10b
-- move $31, $0
--#endif
-+ SETUP_GPX($0)
-+ SETUP_GPX64($25,$0)
- #else
-- la $28, _gp /* Setup GP correctly if we're non-PIC. */
-+ PTR_LA $28, _gp /* Setup GP correctly if we're non-PIC. */
- move $31, $0
- #endif
-
-@@ -118,18 +99,18 @@
- /* Allocate space on the stack for seven arguments and
- * make sure the stack is aligned to double words (8 bytes) */
-
-+ and $29, -2 * SZREG
-+
- #if _MIPS_SIM == _MIPS_SIM_ABI32
-- and $29, -2 * 4
-- subu $29, 32
-- la $7, _init /* init */
-- la $8, _fini
-- sw $8, 16($29) /* fini */
-- sw $2, 20($29) /* rtld_fini */
-- sw $29, 24($29) /* stack_end */
--#else
-- and $29, -2 * PTRSIZE
-+ PTR_SUBIU $29, 32
-+#endif
- PTR_LA $7, _init /* init */
-- PTR_LA $8, _fini /* fini */
-+ PTR_LA $8, _fini
-+#if _MIPS_SIM == _MIPS_SIM_ABI32
-+ PTR_S $8, 16($29) /* fini */
-+ PTR_S $2, 20($29) /* rtld_fini */
-+ PTR_S $29, 24($29) /* stack_end */
-+#else
- move $9, $2 /* rtld_fini */
- move $10, $29 /* stack_end */
- #endif
--
diff --git a/toolchain/uClibc/patches/mips64.patch b/toolchain/uClibc/patches/mips64.patch
deleted file mode 100644
index fd2135a48..000000000
--- a/toolchain/uClibc/patches/mips64.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Nur uClibc-0.9.30.2.orig/libc/sysdeps/linux/common/getdents.c uClibc-0.9.30.2/libc/sysdeps/linux/common/getdents.c
---- uClibc-0.9.30.2.orig/libc/sysdeps/linux/common/getdents.c 2010-01-13 22:22:31.000000000 +0100
-+++ uClibc-0.9.30.2/libc/sysdeps/linux/common/getdents.c 2010-02-03 20:21:34.000000000 +0100
-@@ -136,9 +136,6 @@
- return (char *) dp - buf;
- }
-
--#if defined __UCLIBC_HAS_LFS__ && ! defined __NR_getdents64
--attribute_hidden strong_alias(__getdents,__getdents64)
--#endif
-
- #elif __WORDSIZE == 32
-
-@@ -171,4 +168,8 @@
- }
- #endif
-
-+#if defined __UCLIBC_HAS_LFS__ && ! defined __NR_getdents64
-+attribute_hidden strong_alias(__getdents,__getdents64)
-+#endif
-+
- #endif
diff --git a/toolchain/uClibc/patches/sparc.patch b/toolchain/uClibc/patches/sparc.patch
deleted file mode 100644
index bcf5b5fd8..000000000
--- a/toolchain/uClibc/patches/sparc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nur uClibc-0.9.30.2.orig/libc/sysdeps/linux/sparc/sigaction.c uClibc-0.9.30.2/libc/sysdeps/linux/sparc/sigaction.c
---- uClibc-0.9.30.2.orig/libc/sysdeps/linux/sparc/sigaction.c 2010-01-13 22:22:31.000000000 +0100
-+++ uClibc-0.9.30.2/libc/sysdeps/linux/sparc/sigaction.c 2010-02-14 12:10:52.000000000 +0100
-@@ -34,7 +34,8 @@
- static void __rt_sigreturn_stub(void);
- static void __sigreturn_stub(void);
-
--int __libc_sigaction(int sig, const struct sigaction *act, struct sigaction *oact)
-+libc_hidden_proto(sigaction)
-+int sigaction(int sig, const struct sigaction *act, struct sigaction *oact)
- {
- int ret;
- struct sigaction kact, koact;
-@@ -65,10 +66,8 @@
- return ret;
- }
-
--#ifndef LIBC_SIGACTION
--weak_alias(__libc_sigaction,sigaction)
--libc_hidden_weak(sigaction)
--#endif
-+libc_hidden_def(sigaction)
-+weak_alias(sigaction,__libc_sigaction)
-
- static void
- __rt_sigreturn_stub(void)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 10:25:57 +0000