From 0037bc538a141d1495aa048c3d774aa6b1b671e4 Mon Sep 17 00:00:00 2001
From: kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 24 Jan 2011 09:40:24 +0000
Subject: [toolchain/uClibc]: update to latest git

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25082 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 toolchain/uClibc/Config.in                         |  2 +-
 toolchain/uClibc/Makefile                          |  4 +-
 .../150-cris_missing_syscall_include.patch         | 11 ---
 .../patches-0.9.32/151-cris_add_sys_user_h.patch   | 84 ----------------------
 4 files changed, 3 insertions(+), 98 deletions(-)
 delete mode 100644 toolchain/uClibc/patches-0.9.32/150-cris_missing_syscall_include.patch
 delete mode 100644 toolchain/uClibc/patches-0.9.32/151-cris_add_sys_user_h.patch

(limited to 'toolchain')

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 6046b9896..aabb51a06 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -14,7 +14,7 @@ choice
 		bool "uClibc 0.9.31"
 
 	config UCLIBC_VERSION_0_9_32
-		bool "uClibc 0.9.32 (with nptl support)"
+		bool "uClibc 0.9.32-git"
 
 endchoice
 
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index 672d48622..23b70f953 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -14,10 +14,10 @@ PKG_VERSION:=$(call qstrip,$(CONFIG_UCLIBC_VERSION))
 ifeq ($(CONFIG_UCLIBC_VERSION_0_9_32),y)
   PKG_SOURCE_URL:=git://git.busybox.net/uClibc
   PKG_SOURCE_PROTO:=git
-  PKG_SOURCE_VERSION:=4ac7ad3543dd6d7780e71af80fa5c45414451719
+  PKG_SOURCE_VERSION:=a7c33ecabcead542e54c0c3514a92f4155add5b6
   PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
   PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-  LIBC_SO_VERSION:=$(PKG_VERSION)-rc1-git
+  LIBC_SO_VERSION:=$(PKG_VERSION)-rc2-git
 else
   PKG_SOURCE_URL:=http://www.uclibc.org/downloads
   PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/toolchain/uClibc/patches-0.9.32/150-cris_missing_syscall_include.patch b/toolchain/uClibc/patches-0.9.32/150-cris_missing_syscall_include.patch
deleted file mode 100644
index 0f74d6e5e..000000000
--- a/toolchain/uClibc/patches-0.9.32/150-cris_missing_syscall_include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libc/sysdeps/linux/cris/sysdep.h
-+++ b/libc/sysdeps/linux/cris/sysdep.h
-@@ -20,6 +20,8 @@
- #ifndef _SYSDEP_H_
- #define _SYSDEP_H_
- 
-+#include <sys/syscall.h>
-+
- #ifndef C_LABEL
- 
- /* Define a macro we can use to construct the asm name for a C symbol.  */
diff --git a/toolchain/uClibc/patches-0.9.32/151-cris_add_sys_user_h.patch b/toolchain/uClibc/patches-0.9.32/151-cris_add_sys_user_h.patch
deleted file mode 100644
index 3bcf5af0e..000000000
--- a/toolchain/uClibc/patches-0.9.32/151-cris_add_sys_user_h.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- /dev/null
-+++ b/libc/sysdeps/linux/cris/sys/user.h
-@@ -0,0 +1,81 @@
-+#ifndef __ASM_CRIS_USER_H
-+#define __ASM_CRIS_USER_H
-+
-+/* User-mode register used for core dumps. */
-+
-+struct user_fpregs {
-+};
-+
-+struct user_regs_struct {
-+	unsigned long r0;	/* General registers. */
-+	unsigned long r1;
-+	unsigned long r2;
-+	unsigned long r3;
-+	unsigned long r4;
-+	unsigned long r5;
-+	unsigned long r6;
-+	unsigned long r7;
-+	unsigned long r8;
-+	unsigned long r9;
-+	unsigned long r10;
-+	unsigned long r11;
-+	unsigned long r12;
-+	unsigned long r13;
-+	unsigned long sp;	/* R14, Stack pointer. */
-+	unsigned long acr;	/* R15, Address calculation register. */
-+	unsigned long bz;	/* P0, Constant zero (8-bits). */
-+	unsigned long vr;	/* P1, Version register (8-bits). */
-+	unsigned long pid;	/* P2, Process ID (8-bits). */
-+	unsigned long srs;	/* P3, Support register select (8-bits). */
-+	unsigned long wz;	/* P4, Constant zero (16-bits). */
-+	unsigned long exs;	/* P5, Exception status. */
-+	unsigned long eda;	/* P6, Exception data address. */
-+	unsigned long mof;	/* P7, Multiply overflow regiter. */
-+	unsigned long dz;	/* P8, Constant zero (32-bits). */
-+	unsigned long ebp;	/* P9, Exception base pointer. */
-+	unsigned long erp;	/* P10, Exception return pointer. */
-+	unsigned long srp;	/* P11, Subroutine return pointer. */
-+	unsigned long nrp;	/* P12, NMI return pointer. */
-+	unsigned long ccs;	/* P13, Condition code stack. */
-+	unsigned long usp;	/* P14, User mode stack pointer. */
-+	unsigned long spc;	/* P15, Single step PC. */
-+};
-+
-+/*
-+ * Core file format: The core file is written in such a way that gdb
-+ * can understand it and provide useful information to the user (under
-+ * linux we use the `trad-core' bfd).  The file contents are as follows:
-+ *
-+ *  upage: 1 page consisting of a user struct that tells gdb
-+ *	what is present in the file.  Directly after this is a
-+ *	copy of the task_struct, which is currently not used by gdb,
-+ *	but it may come in handy at some point.  All of the registers
-+ *	are stored as part of the upage.  The upage should always be
-+ *	only one page long.
-+ *  data: The data segment follows next.  We use current->end_text to
-+ *	current->brk to pick up all of the user variables, plus any memory
-+ *	that may have been sbrk'ed.  No attempt is made to determine if a
-+ *	page is demand-zero or if a page is totally unused, we just cover
-+ *	the entire range.  All of the addresses are rounded in such a way
-+ *	that an integral number of pages is written.
-+ *  stack: We need the stack information in order to get a meaningful
-+ *	backtrace.  We need to write the data from usp to
-+ *	current->start_stack, so we round each of these in order to be able
-+ *	to write an integer number of pages.
-+ */
-+
-+struct user {
-+	struct user_regs_struct	regs;		/* entire machine state */
-+	size_t		u_tsize;		/* text size (pages) */
-+	size_t		u_dsize;		/* data size (pages) */
-+	size_t		u_ssize;		/* stack size (pages) */
-+	unsigned long	start_code;		/* text starting address */
-+	unsigned long	start_data;		/* data starting address */
-+	unsigned long	start_stack;		/* stack starting address */
-+	long int	signal;			/* signal causing core dump */
-+	unsigned long	u_ar0;			/* help gdb find registers */
-+	unsigned long	magic;			/* identifies a core file */
-+	char		u_comm[32];		/* user command name */
-+};
-+
-+#endif /* __ASM_CRIS_USER_H */
-- 
cgit v1.2.3