From 93567175e4d1f7fea4f055672044a787d4716051 Mon Sep 17 00:00:00 2001
From: Mirko Vogt <mirko@openwrt.org>
Date: Sun, 20 Jun 2010 22:18:43 +0000
Subject: add support for uClibc version 0.9.32 based on git rev
 a7642511b08b0b8a4012bab67cb8aa554992df6b, this includes support for nptl
 which got merged into the uClibc master branch recently

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21856 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../patches-0.9.32/100-c90-std-compatibility.patch | 78 ++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 toolchain/uClibc/patches-0.9.32/100-c90-std-compatibility.patch

(limited to 'toolchain/uClibc/patches-0.9.32/100-c90-std-compatibility.patch')

diff --git a/toolchain/uClibc/patches-0.9.32/100-c90-std-compatibility.patch b/toolchain/uClibc/patches-0.9.32/100-c90-std-compatibility.patch
new file mode 100644
index 0000000000..acee2811c2
--- /dev/null
+++ b/toolchain/uClibc/patches-0.9.32/100-c90-std-compatibility.patch
@@ -0,0 +1,78 @@
+diff -ruN uClibc-0.9.32/libpthread/nptl/allocatestack.c uClibc-0.9.32/libpthread/nptl.new/allocatestack.c
+--- uClibc-0.9.32/libpthread/nptl/allocatestack.c	2010-06-19 20:50:30.000000000 +0200
++++ uClibc-0.9.32/libpthread/nptl.new/allocatestack.c	2010-06-19 16:06:32.000000000 +0200
+@@ -844,7 +844,8 @@
+ 
+ 	      curp->specific_used = false;
+ 
+-	      for (size_t cnt = 1; cnt < PTHREAD_KEY_1STLEVEL_SIZE; ++cnt)
++	      size_t cnt;
++	      for (cnt = 1; cnt < PTHREAD_KEY_1STLEVEL_SIZE; ++cnt)
+ 		if (curp->specific[cnt] != NULL)
+ 		  {
+ 		    memset (curp->specific[cnt], '\0',
+diff -ruN uClibc-0.9.32/libpthread/nptl/pthread_key_create.c uClibc-0.9.32/libpthread/nptl.new/pthread_key_create.c
+--- uClibc-0.9.32/libpthread/nptl/pthread_key_create.c	2010-06-19 20:50:30.000000000 +0200
++++ uClibc-0.9.32/libpthread/nptl.new/pthread_key_create.c	2010-06-19 16:06:59.000000000 +0200
+@@ -29,7 +29,8 @@
+      void (*destr) (void *))
+ {
+   /* Find a slot in __pthread_kyes which is unused.  */
+-  for (size_t cnt = 0; cnt < PTHREAD_KEYS_MAX; ++cnt)
++  size_t cnt;
++  for (cnt = 0; cnt < PTHREAD_KEYS_MAX; ++cnt)
+     {
+       uintptr_t seq = __pthread_keys[cnt].seq;
+ 
+diff -ruN uClibc-0.9.32/libpthread/nptl/sysdeps/generic/dl-tls.c uClibc-0.9.32/libpthread/nptl.new/sysdeps/generic/dl-tls.c
+--- uClibc-0.9.32/libpthread/nptl/sysdeps/generic/dl-tls.c	2010-06-19 20:50:30.000000000 +0200
++++ uClibc-0.9.32/libpthread/nptl.new/sysdeps/generic/dl-tls.c	2010-06-19 16:06:04.000000000 +0200
+@@ -258,7 +258,8 @@
+   /* We simply start with zero.  */
+   size_t offset = 0;
+ 
+-  for (size_t cnt = 0; slotinfo[cnt].map != NULL; ++cnt)
++  size_t cnt;
++  for (cnt = 0; slotinfo[cnt].map != NULL; ++cnt)
+     {
+       assert (cnt < GL(dl_tls_dtv_slotinfo_list)->len);
+ 
+diff -ruN uClibc-0.9.32/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_attr_getaffinity.c uClibc-0.9.32/libpthread/nptl.new/sysdeps/unix/sysv/linux/pthread_attr_getaffinity.c
+--- uClibc-0.9.32/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_attr_getaffinity.c	2010-06-19 20:50:30.000000000 +0200
++++ uClibc-0.9.32/libpthread/nptl.new/sysdeps/unix/sysv/linux/pthread_attr_getaffinity.c	2010-06-19 16:05:38.000000000 +0200
+@@ -38,7 +38,8 @@
+     {
+       /* Check whether there are any bits set beyond the limits
+ 	 the user requested.  */
+-      for (size_t cnt = cpusetsize; cnt < iattr->cpusetsize; ++cnt)
++      size_t cnt;
++      for (cnt = cpusetsize; cnt < iattr->cpusetsize; ++cnt)
+ 	if (((char *) iattr->cpuset)[cnt] != 0)
+ 	  return EINVAL;
+ 
+diff -ruN uClibc-0.9.32/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_attr_setaffinity.c uClibc-0.9.32/libpthread/nptl.new/sysdeps/unix/sysv/linux/pthread_attr_setaffinity.c
+--- uClibc-0.9.32/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_attr_setaffinity.c	2010-06-19 20:50:30.000000000 +0200
++++ uClibc-0.9.32/libpthread/nptl.new/sysdeps/unix/sysv/linux/pthread_attr_setaffinity.c	2010-06-19 16:04:46.000000000 +0200
+@@ -57,7 +57,8 @@
+ 
+       /* Check whether the new bitmask has any bit set beyond the
+ 	 last one the kernel accepts.  */
+-      for (size_t cnt = __kernel_cpumask_size; cnt < cpusetsize; ++cnt)
++      size_t cnt;
++      for (cnt = __kernel_cpumask_size; cnt < cpusetsize; ++cnt)
+ 	if (((char *) cpuset)[cnt] != '\0')
+ 	  /* Found a nonzero byte.  This means the user request cannot be
+ 	     fulfilled.  */
+diff -ruN uClibc-0.9.32/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c uClibc-0.9.32/libpthread/nptl.new/sysdeps/unix/sysv/linux/pthread_setaffinity.c
+--- uClibc-0.9.32/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c	2010-06-19 20:50:30.000000000 +0200
++++ uClibc-0.9.32/libpthread/nptl.new/sysdeps/unix/sysv/linux/pthread_setaffinity.c	2010-06-19 16:05:15.000000000 +0200
+@@ -71,7 +71,8 @@
+ 
+   /* We now know the size of the kernel cpumask_t.  Make sure the user
+      does not request to set a bit beyond that.  */
+-  for (size_t cnt = __kernel_cpumask_size; cnt < cpusetsize; ++cnt)
++  size_t cnt;
++  for (cnt = __kernel_cpumask_size; cnt < cpusetsize; ++cnt)
+     if (((char *) cpuset)[cnt] != '\0')
+       /* Found a nonzero byte.  This means the user request cannot be
+ 	 fulfilled.  */
-- 
cgit v1.2.3