From 3ea4b6ba915e39213ae182a1ed287a8c4e6087b2 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 15 May 2012 13:42:32 +0000
Subject: [PATCH] uClibc: update to 0.9.33.2, fixes #4420

SVN-Revision: 31740
---
 toolchain/uClibc/Config.in                    |  2 +-
 toolchain/uClibc/Config.version               |  4 +--
 toolchain/uClibc/Makefile                     |  2 +-
 .../{config-0.9.33 => config-0.9.33.2}/arm    |  0
 .../{config-0.9.33 => config-0.9.33.2}/armeb  |  0
 .../{config-0.9.33 => config-0.9.33.2}/avr32  |  0
 .../{config-0.9.33 => config-0.9.33.2}/common |  0
 .../{config-0.9.33 => config-0.9.33.2}/cris   |  0
 .../{config-0.9.33 => config-0.9.33.2}/debug  |  0
 .../{config-0.9.33 => config-0.9.33.2}/i386   |  0
 .../{config-0.9.33 => config-0.9.33.2}/i686   |  0
 .../{config-0.9.33 => config-0.9.33.2}/m68k   |  0
 .../{config-0.9.33 => config-0.9.33.2}/mips   |  0
 .../{config-0.9.33 => config-0.9.33.2}/mips64 |  0
 .../mips64el                                  |  0
 .../{config-0.9.33 => config-0.9.33.2}/mipsel |  0
 .../mipsel.cobalt                             |  0
 .../powerpc                                   |  0
 .../powerpc.e500                              |  0
 .../{config-0.9.33 => config-0.9.33.2}/sparc  |  0
 .../sparc.leon                                |  0
 .../ubicom32                                  |  0
 .../{config-0.9.33 => config-0.9.33.2}/x86_64 |  0
 .../110-compat_macros.patch                   |  0
 .../120-adjtimex.patch                        |  0
 ...inet-fix-__read_etc_hosts_r-segfault.patch |  0
 .../140-avr32_atomic_fix.patch                |  0
 .../170-math_finite.patch                     |  0
 .../180-pthread_cleanup_fix.patch             |  0
 ...90-nptl_use_arch_default_stack_limit.patch |  0
 .../200-no_forced_unwind.patch                |  0
 .../350-use-fputs_unlocked.patch              |  0
 .../410-llvm_workaround.patch                 |  0
 .../450-powerpc_copysignl.patch               |  0
 .../480-powerpc_rel24_support.patch           |  0
 .../600-ubicom32-uClibc.patch                 |  0
 .../601-ubicom32_uClibc_fixes.patch           |  0
 .../960-remove_eabi_oabi_selection.patch      |  0
 ...d-pass-it-to-INTERNAL_SYSCALL_NCS-so.patch | 28 -------------------
 .../160-mips_signalfd_sfd_nonblock.patch      | 27 ------------------
 40 files changed, 4 insertions(+), 59 deletions(-)
 rename toolchain/uClibc/{config-0.9.33 => config-0.9.33.2}/arm (100%)
 rename toolchain/uClibc/{config-0.9.33 => config-0.9.33.2}/armeb (100%)
 rename toolchain/uClibc/{config-0.9.33 => config-0.9.33.2}/avr32 (100%)
 rename toolchain/uClibc/{config-0.9.33 => config-0.9.33.2}/common (100%)
 rename toolchain/uClibc/{config-0.9.33 => config-0.9.33.2}/cris (100%)
 rename toolchain/uClibc/{config-0.9.33 => config-0.9.33.2}/debug (100%)
 rename toolchain/uClibc/{config-0.9.33 => config-0.9.33.2}/i386 (100%)
 rename toolchain/uClibc/{config-0.9.33 => config-0.9.33.2}/i686 (100%)
 rename toolchain/uClibc/{config-0.9.33 => config-0.9.33.2}/m68k (100%)
 rename toolchain/uClibc/{config-0.9.33 => config-0.9.33.2}/mips (100%)
 rename toolchain/uClibc/{config-0.9.33 => config-0.9.33.2}/mips64 (100%)
 rename toolchain/uClibc/{config-0.9.33 => config-0.9.33.2}/mips64el (100%)
 rename toolchain/uClibc/{config-0.9.33 => config-0.9.33.2}/mipsel (100%)
 rename toolchain/uClibc/{config-0.9.33 => config-0.9.33.2}/mipsel.cobalt (100%)
 rename toolchain/uClibc/{config-0.9.33 => config-0.9.33.2}/powerpc (100%)
 rename toolchain/uClibc/{config-0.9.33 => config-0.9.33.2}/powerpc.e500 (100%)
 rename toolchain/uClibc/{config-0.9.33 => config-0.9.33.2}/sparc (100%)
 rename toolchain/uClibc/{config-0.9.33 => config-0.9.33.2}/sparc.leon (100%)
 rename toolchain/uClibc/{config-0.9.33 => config-0.9.33.2}/ubicom32 (100%)
 rename toolchain/uClibc/{config-0.9.33 => config-0.9.33.2}/x86_64 (100%)
 rename toolchain/uClibc/{patches-0.9.33 => patches-0.9.33.2}/110-compat_macros.patch (100%)
 rename toolchain/uClibc/{patches-0.9.33 => patches-0.9.33.2}/120-adjtimex.patch (100%)
 rename toolchain/uClibc/{patches-0.9.33 => patches-0.9.33.2}/131-inet-fix-__read_etc_hosts_r-segfault.patch (100%)
 rename toolchain/uClibc/{patches-0.9.33 => patches-0.9.33.2}/140-avr32_atomic_fix.patch (100%)
 rename toolchain/uClibc/{patches-0.9.33 => patches-0.9.33.2}/170-math_finite.patch (100%)
 rename toolchain/uClibc/{patches-0.9.33 => patches-0.9.33.2}/180-pthread_cleanup_fix.patch (100%)
 rename toolchain/uClibc/{patches-0.9.33 => patches-0.9.33.2}/190-nptl_use_arch_default_stack_limit.patch (100%)
 rename toolchain/uClibc/{patches-0.9.33 => patches-0.9.33.2}/200-no_forced_unwind.patch (100%)
 rename toolchain/uClibc/{patches-0.9.33 => patches-0.9.33.2}/350-use-fputs_unlocked.patch (100%)
 rename toolchain/uClibc/{patches-0.9.33 => patches-0.9.33.2}/410-llvm_workaround.patch (100%)
 rename toolchain/uClibc/{patches-0.9.33 => patches-0.9.33.2}/450-powerpc_copysignl.patch (100%)
 rename toolchain/uClibc/{patches-0.9.33 => patches-0.9.33.2}/480-powerpc_rel24_support.patch (100%)
 rename toolchain/uClibc/{patches-0.9.33 => patches-0.9.33.2}/600-ubicom32-uClibc.patch (100%)
 rename toolchain/uClibc/{patches-0.9.33 => patches-0.9.33.2}/601-ubicom32_uClibc_fixes.patch (100%)
 rename toolchain/uClibc/{patches-0.9.33 => patches-0.9.33.2}/960-remove_eabi_oabi_selection.patch (100%)
 delete mode 100644 toolchain/uClibc/patches-0.9.33/001-backport-Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS-so.patch
 delete mode 100644 toolchain/uClibc/patches-0.9.33/160-mips_signalfd_sfd_nonblock.patch

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 82e4a610da..74d15ae33d 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -8,7 +8,7 @@ choice
 	  Select the version of uClibc you wish to use.
 
 	config UCLIBC_VERSION_0_9_33
-		bool "uClibc 0.9.33"
+		bool "uClibc 0.9.33.2"
 
 endchoice
 
diff --git a/toolchain/uClibc/Config.version b/toolchain/uClibc/Config.version
index 501330dcc5..0d0b4a76a3 100644
--- a/toolchain/uClibc/Config.version
+++ b/toolchain/uClibc/Config.version
@@ -1,8 +1,8 @@
 config UCLIBC_VERSION
 	string
 	depends on USE_UCLIBC
-	default "0.9.33"       if UCLIBC_VERSION_0_9_33
-	default "0.9.33"
+	default "0.9.33.2"       if UCLIBC_VERSION_0_9_33
+	default "0.9.33.2"
 
 if !TOOLCHAINOPTS
 
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index 5441e7c36b..6e7e9ddd8b 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -15,7 +15,7 @@ LIBC_SO_VERSION:=$(PKG_VERSION)
 PATCH_DIR:=./patches-$(PKG_VERSION)
 CONFIG_DIR:=./config-$(PKG_VERSION)
 
-PKG_MD5SUM_0.9.33 = cf9d25e4b3c87af1a99d33a6b959fbf1
+PKG_MD5SUM_0.9.33.2 = a338aaffc56f0f5040e6d9fa8a12eda1
 PKG_MD5SUM=$(PKG_MD5SUM_$(PKG_VERSION))
 
 HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)-$(PKG_VERSION)
diff --git a/toolchain/uClibc/config-0.9.33/arm b/toolchain/uClibc/config-0.9.33.2/arm
similarity index 100%
rename from toolchain/uClibc/config-0.9.33/arm
rename to toolchain/uClibc/config-0.9.33.2/arm
diff --git a/toolchain/uClibc/config-0.9.33/armeb b/toolchain/uClibc/config-0.9.33.2/armeb
similarity index 100%
rename from toolchain/uClibc/config-0.9.33/armeb
rename to toolchain/uClibc/config-0.9.33.2/armeb
diff --git a/toolchain/uClibc/config-0.9.33/avr32 b/toolchain/uClibc/config-0.9.33.2/avr32
similarity index 100%
rename from toolchain/uClibc/config-0.9.33/avr32
rename to toolchain/uClibc/config-0.9.33.2/avr32
diff --git a/toolchain/uClibc/config-0.9.33/common b/toolchain/uClibc/config-0.9.33.2/common
similarity index 100%
rename from toolchain/uClibc/config-0.9.33/common
rename to toolchain/uClibc/config-0.9.33.2/common
diff --git a/toolchain/uClibc/config-0.9.33/cris b/toolchain/uClibc/config-0.9.33.2/cris
similarity index 100%
rename from toolchain/uClibc/config-0.9.33/cris
rename to toolchain/uClibc/config-0.9.33.2/cris
diff --git a/toolchain/uClibc/config-0.9.33/debug b/toolchain/uClibc/config-0.9.33.2/debug
similarity index 100%
rename from toolchain/uClibc/config-0.9.33/debug
rename to toolchain/uClibc/config-0.9.33.2/debug
diff --git a/toolchain/uClibc/config-0.9.33/i386 b/toolchain/uClibc/config-0.9.33.2/i386
similarity index 100%
rename from toolchain/uClibc/config-0.9.33/i386
rename to toolchain/uClibc/config-0.9.33.2/i386
diff --git a/toolchain/uClibc/config-0.9.33/i686 b/toolchain/uClibc/config-0.9.33.2/i686
similarity index 100%
rename from toolchain/uClibc/config-0.9.33/i686
rename to toolchain/uClibc/config-0.9.33.2/i686
diff --git a/toolchain/uClibc/config-0.9.33/m68k b/toolchain/uClibc/config-0.9.33.2/m68k
similarity index 100%
rename from toolchain/uClibc/config-0.9.33/m68k
rename to toolchain/uClibc/config-0.9.33.2/m68k
diff --git a/toolchain/uClibc/config-0.9.33/mips b/toolchain/uClibc/config-0.9.33.2/mips
similarity index 100%
rename from toolchain/uClibc/config-0.9.33/mips
rename to toolchain/uClibc/config-0.9.33.2/mips
diff --git a/toolchain/uClibc/config-0.9.33/mips64 b/toolchain/uClibc/config-0.9.33.2/mips64
similarity index 100%
rename from toolchain/uClibc/config-0.9.33/mips64
rename to toolchain/uClibc/config-0.9.33.2/mips64
diff --git a/toolchain/uClibc/config-0.9.33/mips64el b/toolchain/uClibc/config-0.9.33.2/mips64el
similarity index 100%
rename from toolchain/uClibc/config-0.9.33/mips64el
rename to toolchain/uClibc/config-0.9.33.2/mips64el
diff --git a/toolchain/uClibc/config-0.9.33/mipsel b/toolchain/uClibc/config-0.9.33.2/mipsel
similarity index 100%
rename from toolchain/uClibc/config-0.9.33/mipsel
rename to toolchain/uClibc/config-0.9.33.2/mipsel
diff --git a/toolchain/uClibc/config-0.9.33/mipsel.cobalt b/toolchain/uClibc/config-0.9.33.2/mipsel.cobalt
similarity index 100%
rename from toolchain/uClibc/config-0.9.33/mipsel.cobalt
rename to toolchain/uClibc/config-0.9.33.2/mipsel.cobalt
diff --git a/toolchain/uClibc/config-0.9.33/powerpc b/toolchain/uClibc/config-0.9.33.2/powerpc
similarity index 100%
rename from toolchain/uClibc/config-0.9.33/powerpc
rename to toolchain/uClibc/config-0.9.33.2/powerpc
diff --git a/toolchain/uClibc/config-0.9.33/powerpc.e500 b/toolchain/uClibc/config-0.9.33.2/powerpc.e500
similarity index 100%
rename from toolchain/uClibc/config-0.9.33/powerpc.e500
rename to toolchain/uClibc/config-0.9.33.2/powerpc.e500
diff --git a/toolchain/uClibc/config-0.9.33/sparc b/toolchain/uClibc/config-0.9.33.2/sparc
similarity index 100%
rename from toolchain/uClibc/config-0.9.33/sparc
rename to toolchain/uClibc/config-0.9.33.2/sparc
diff --git a/toolchain/uClibc/config-0.9.33/sparc.leon b/toolchain/uClibc/config-0.9.33.2/sparc.leon
similarity index 100%
rename from toolchain/uClibc/config-0.9.33/sparc.leon
rename to toolchain/uClibc/config-0.9.33.2/sparc.leon
diff --git a/toolchain/uClibc/config-0.9.33/ubicom32 b/toolchain/uClibc/config-0.9.33.2/ubicom32
similarity index 100%
rename from toolchain/uClibc/config-0.9.33/ubicom32
rename to toolchain/uClibc/config-0.9.33.2/ubicom32
diff --git a/toolchain/uClibc/config-0.9.33/x86_64 b/toolchain/uClibc/config-0.9.33.2/x86_64
similarity index 100%
rename from toolchain/uClibc/config-0.9.33/x86_64
rename to toolchain/uClibc/config-0.9.33.2/x86_64
diff --git a/toolchain/uClibc/patches-0.9.33/110-compat_macros.patch b/toolchain/uClibc/patches-0.9.33.2/110-compat_macros.patch
similarity index 100%
rename from toolchain/uClibc/patches-0.9.33/110-compat_macros.patch
rename to toolchain/uClibc/patches-0.9.33.2/110-compat_macros.patch
diff --git a/toolchain/uClibc/patches-0.9.33/120-adjtimex.patch b/toolchain/uClibc/patches-0.9.33.2/120-adjtimex.patch
similarity index 100%
rename from toolchain/uClibc/patches-0.9.33/120-adjtimex.patch
rename to toolchain/uClibc/patches-0.9.33.2/120-adjtimex.patch
diff --git a/toolchain/uClibc/patches-0.9.33/131-inet-fix-__read_etc_hosts_r-segfault.patch b/toolchain/uClibc/patches-0.9.33.2/131-inet-fix-__read_etc_hosts_r-segfault.patch
similarity index 100%
rename from toolchain/uClibc/patches-0.9.33/131-inet-fix-__read_etc_hosts_r-segfault.patch
rename to toolchain/uClibc/patches-0.9.33.2/131-inet-fix-__read_etc_hosts_r-segfault.patch
diff --git a/toolchain/uClibc/patches-0.9.33/140-avr32_atomic_fix.patch b/toolchain/uClibc/patches-0.9.33.2/140-avr32_atomic_fix.patch
similarity index 100%
rename from toolchain/uClibc/patches-0.9.33/140-avr32_atomic_fix.patch
rename to toolchain/uClibc/patches-0.9.33.2/140-avr32_atomic_fix.patch
diff --git a/toolchain/uClibc/patches-0.9.33/170-math_finite.patch b/toolchain/uClibc/patches-0.9.33.2/170-math_finite.patch
similarity index 100%
rename from toolchain/uClibc/patches-0.9.33/170-math_finite.patch
rename to toolchain/uClibc/patches-0.9.33.2/170-math_finite.patch
diff --git a/toolchain/uClibc/patches-0.9.33/180-pthread_cleanup_fix.patch b/toolchain/uClibc/patches-0.9.33.2/180-pthread_cleanup_fix.patch
similarity index 100%
rename from toolchain/uClibc/patches-0.9.33/180-pthread_cleanup_fix.patch
rename to toolchain/uClibc/patches-0.9.33.2/180-pthread_cleanup_fix.patch
diff --git a/toolchain/uClibc/patches-0.9.33/190-nptl_use_arch_default_stack_limit.patch b/toolchain/uClibc/patches-0.9.33.2/190-nptl_use_arch_default_stack_limit.patch
similarity index 100%
rename from toolchain/uClibc/patches-0.9.33/190-nptl_use_arch_default_stack_limit.patch
rename to toolchain/uClibc/patches-0.9.33.2/190-nptl_use_arch_default_stack_limit.patch
diff --git a/toolchain/uClibc/patches-0.9.33/200-no_forced_unwind.patch b/toolchain/uClibc/patches-0.9.33.2/200-no_forced_unwind.patch
similarity index 100%
rename from toolchain/uClibc/patches-0.9.33/200-no_forced_unwind.patch
rename to toolchain/uClibc/patches-0.9.33.2/200-no_forced_unwind.patch
diff --git a/toolchain/uClibc/patches-0.9.33/350-use-fputs_unlocked.patch b/toolchain/uClibc/patches-0.9.33.2/350-use-fputs_unlocked.patch
similarity index 100%
rename from toolchain/uClibc/patches-0.9.33/350-use-fputs_unlocked.patch
rename to toolchain/uClibc/patches-0.9.33.2/350-use-fputs_unlocked.patch
diff --git a/toolchain/uClibc/patches-0.9.33/410-llvm_workaround.patch b/toolchain/uClibc/patches-0.9.33.2/410-llvm_workaround.patch
similarity index 100%
rename from toolchain/uClibc/patches-0.9.33/410-llvm_workaround.patch
rename to toolchain/uClibc/patches-0.9.33.2/410-llvm_workaround.patch
diff --git a/toolchain/uClibc/patches-0.9.33/450-powerpc_copysignl.patch b/toolchain/uClibc/patches-0.9.33.2/450-powerpc_copysignl.patch
similarity index 100%
rename from toolchain/uClibc/patches-0.9.33/450-powerpc_copysignl.patch
rename to toolchain/uClibc/patches-0.9.33.2/450-powerpc_copysignl.patch
diff --git a/toolchain/uClibc/patches-0.9.33/480-powerpc_rel24_support.patch b/toolchain/uClibc/patches-0.9.33.2/480-powerpc_rel24_support.patch
similarity index 100%
rename from toolchain/uClibc/patches-0.9.33/480-powerpc_rel24_support.patch
rename to toolchain/uClibc/patches-0.9.33.2/480-powerpc_rel24_support.patch
diff --git a/toolchain/uClibc/patches-0.9.33/600-ubicom32-uClibc.patch b/toolchain/uClibc/patches-0.9.33.2/600-ubicom32-uClibc.patch
similarity index 100%
rename from toolchain/uClibc/patches-0.9.33/600-ubicom32-uClibc.patch
rename to toolchain/uClibc/patches-0.9.33.2/600-ubicom32-uClibc.patch
diff --git a/toolchain/uClibc/patches-0.9.33/601-ubicom32_uClibc_fixes.patch b/toolchain/uClibc/patches-0.9.33.2/601-ubicom32_uClibc_fixes.patch
similarity index 100%
rename from toolchain/uClibc/patches-0.9.33/601-ubicom32_uClibc_fixes.patch
rename to toolchain/uClibc/patches-0.9.33.2/601-ubicom32_uClibc_fixes.patch
diff --git a/toolchain/uClibc/patches-0.9.33/960-remove_eabi_oabi_selection.patch b/toolchain/uClibc/patches-0.9.33.2/960-remove_eabi_oabi_selection.patch
similarity index 100%
rename from toolchain/uClibc/patches-0.9.33/960-remove_eabi_oabi_selection.patch
rename to toolchain/uClibc/patches-0.9.33.2/960-remove_eabi_oabi_selection.patch
diff --git a/toolchain/uClibc/patches-0.9.33/001-backport-Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS-so.patch b/toolchain/uClibc/patches-0.9.33/001-backport-Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS-so.patch
deleted file mode 100644
index aefedfb170..0000000000
--- a/toolchain/uClibc/patches-0.9.33/001-backport-Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS-so.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 812ae602fe96bb40d1743d410eb1eadb6aa722f5 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 3 Feb 2012 10:57:44 -0800
-Subject: [PATCH] Declare __err and pass it to INTERNAL_SYSCALL_NCS so subsequent macros can use it
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libc/sysdeps/linux/common/bits/syscalls-common.h |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libc/sysdeps/linux/common/bits/syscalls-common.h b/libc/sysdeps/linux/common/bits/syscalls-common.h
-index faebd1b..0f5a929 100644
---- a/libc/sysdeps/linux/common/bits/syscalls-common.h
-+++ b/libc/sysdeps/linux/common/bits/syscalls-common.h
-@@ -59,8 +59,8 @@
- #ifndef INLINE_SYSCALL_NOERR_NCS
- # define INLINE_SYSCALL_NOERR_NCS(name, nr, args...)			\
- ({									\
--	/*INTERNAL_SYSCALL_DECL(__err);*/					\
--	long __res = INTERNAL_SYSCALL_NCS(name, /*__err*/, nr, args);	\
-+	INTERNAL_SYSCALL_DECL(__err);					\
-+	long __res = INTERNAL_SYSCALL_NCS(name, __err, nr, args);	\
- 	__res;								\
- })
- #endif
--- 
-1.7.2.1
-
diff --git a/toolchain/uClibc/patches-0.9.33/160-mips_signalfd_sfd_nonblock.patch b/toolchain/uClibc/patches-0.9.33/160-mips_signalfd_sfd_nonblock.patch
deleted file mode 100644
index 6d94d32261..0000000000
--- a/toolchain/uClibc/patches-0.9.33/160-mips_signalfd_sfd_nonblock.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f87898ca4a7d4b7171779c06ff1f4848efeee431 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 30 Jun 2011 07:32:11 +0000
-Subject: mips/signalfd.h: SFD_NONBLOCK for mips is 0200 unlike 04000 commonly
-
-Exposed by udev 171 which uses signalfd
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
---- a/include/sys/signalfd.h
-+++ b/include/sys/signalfd.h
-@@ -73,6 +73,15 @@ enum
- # define SFD_NONBLOCK SFD_NONBLOCK
-   };
- 
-+#elif defined __mips__
-+enum
-+  {
-+    SFD_CLOEXEC = 02000000,
-+# define SFD_CLOEXEC SFD_CLOEXEC
-+    SFD_NONBLOCK = 0200
-+# define SFD_NONBLOCK SFD_NONBLOCK
-+  };
-+
- #else
- enum
-   {
-- 
2.30.2