diff options
Diffstat (limited to 'toolchain/uclibc/patches')
13 files changed, 30 insertions, 585 deletions
diff --git a/toolchain/uclibc/patches/0.9.34-git/0001-Revert-sparc-use-HIDDEN_JUMPTARGET-for-errno.patch b/toolchain/uclibc/patches/0.9.34-git/0001-Revert-sparc-use-HIDDEN_JUMPTARGET-for-errno.patch deleted file mode 100644 index 2d4ac24bb..000000000 --- a/toolchain/uclibc/patches/0.9.34-git/0001-Revert-sparc-use-HIDDEN_JUMPTARGET-for-errno.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 984be720d4ee1fc717d4de5e67a776419003c1c6 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb <wbx@openadk.org> -Date: Wed, 20 Aug 2014 03:44:53 +0200 -Subject: [PATCH 01/11] Revert "sparc: use HIDDEN_JUMPTARGET for errno" - -This reverts commit f51fb26dbcceee9e48d10facc830bd4a549f6cc2. - -This fixes linking error for sparc build. -While building a sparc system you get following linking error: -libc/sysdeps/linux/sparc/pipe.S:54: undefined reference to `__GI___errno_location' - -Removing the HIDDEN_JUMPTARGET fixes the issue, while using gcc 4.8.3/binutils 2.24. - -The definition of __errno_location was changed recently here: -http://git.uclibc.org/uClibc/commit/?id=8f550715c2b211036fc273add3cb5219397ed312 - -Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org> ---- - libc/sysdeps/linux/sparc/fork.S | 2 +- - libc/sysdeps/linux/sparc/pipe.S | 2 +- - libc/sysdeps/linux/sparc/vfork.S | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libc/sysdeps/linux/sparc/fork.S b/libc/sysdeps/linux/sparc/fork.S -index 8e4bc22..1715911 100644 ---- a/libc/sysdeps/linux/sparc/fork.S -+++ b/libc/sysdeps/linux/sparc/fork.S -@@ -35,7 +35,7 @@ fork: - bcc,a 9000f - nop - save %sp,-96,%sp -- call HIDDEN_JUMPTARGET(__errno_location) -+ call __errno_location - nop - st %i0,[%o0] - jmpl %i7+8,%g0 -diff --git a/libc/sysdeps/linux/sparc/pipe.S b/libc/sysdeps/linux/sparc/pipe.S -index b085faf..fa77f4d 100644 ---- a/libc/sysdeps/linux/sparc/pipe.S -+++ b/libc/sysdeps/linux/sparc/pipe.S -@@ -49,7 +49,7 @@ pipe: - restore %g0,%g0,%o0 - - .Lerror: -- call HIDDEN_JUMPTARGET(__errno_location) -+ call __errno_location - or %g0,EINVAL,%i0 - st %i0,[%o0] - ret -diff --git a/libc/sysdeps/linux/sparc/vfork.S b/libc/sysdeps/linux/sparc/vfork.S -index 4b701f7..e5a3c30 100644 ---- a/libc/sysdeps/linux/sparc/vfork.S -+++ b/libc/sysdeps/linux/sparc/vfork.S -@@ -37,7 +37,7 @@ __vfork: - bcc,a 9000f - nop - save %sp,-96,%sp -- call HIDDEN_JUMPTARGET(__errno_location) -+ call __errno_location - nop - st %i0,[%o0] - jmpl %i7+8,%g0 --- -1.8.5.2 (Apple Git-48) - diff --git a/toolchain/uclibc/patches/0.9.34-git/0001-test-disable-test-when-UCLIBC_HAS_XLOCALE-is-n.patch b/toolchain/uclibc/patches/0.9.34-git/0001-test-disable-test-when-UCLIBC_HAS_XLOCALE-is-n.patch new file mode 100644 index 000000000..9149b9573 --- /dev/null +++ b/toolchain/uclibc/patches/0.9.34-git/0001-test-disable-test-when-UCLIBC_HAS_XLOCALE-is-n.patch @@ -0,0 +1,30 @@ +From 78bcf3a7a5db798d301875adba55b7b33397b789 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb <wbx@openadk.org> +Date: Thu, 28 Aug 2014 14:09:51 +0200 +Subject: [PATCH] test: disable test when UCLIBC_HAS_XLOCALE is n + +wcsftime() is only implemented when locale support in uClibc +is activated. So test will always fail when locale is deactivated +by the user. + +Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> +--- + test/time/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/time/Makefile.in b/test/time/Makefile.in +index 05f73a4..3b063f9 100644 +--- a/test/time/Makefile.in ++++ b/test/time/Makefile.in +@@ -5,7 +5,7 @@ TESTS_DISABLED := bug-asctime bug-asctime_r time tst-mktime2 tst-posixtz \ + tst-strftime tst-strptime tst-timezone + + ifneq ($(UCLIBC_HAS_XLOCALE),y) +-TESTS_DISABLED += tst-ftime_l ++TESTS_DISABLED += tst-ftime_l tst_wcsftime.c + endif + + CFLAGS_tst-strptime2 := -std=c99 +-- +1.8.5.2 (Apple Git-48) + diff --git a/toolchain/uclibc/patches/0.9.34-git/0002-Revert-sparc-disable-cancellable-system-as-it-fails-.patch b/toolchain/uclibc/patches/0.9.34-git/0002-Revert-sparc-disable-cancellable-system-as-it-fails-.patch deleted file mode 100644 index 57ecffbb2..000000000 --- a/toolchain/uclibc/patches/0.9.34-git/0002-Revert-sparc-disable-cancellable-system-as-it-fails-.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 3422668d945229f9f707aafe24491b5d3e8d7636 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb <wbx@openadk.org> -Date: Wed, 20 Aug 2014 04:02:49 +0200 -Subject: [PATCH 02/11] Revert "sparc: disable cancellable system, as it fails - in strange ways right now" - -This reverts commit 1db4f8f8389f6a935ecd83aff7fcce5d1cf2c0f3. - -It is unclear in which way this is breaking sparc systems. -With this change added you get following linking error: -libpthread/nptl/libpthread_so.a(pt-system.oS): In function `__libc_system': -libc/stdlib/system.c:64: undefined reference to `__wait4_nocancel' - -Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org> ---- - libc/stdlib/system.c | 13 +++++++------ - 1 file changed, 7 insertions(+), 6 deletions(-) - -diff --git a/libc/stdlib/system.c b/libc/stdlib/system.c -index 151a229..8c5d25d 100644 ---- a/libc/stdlib/system.c -+++ b/libc/stdlib/system.c -@@ -18,13 +18,14 @@ - #include <sysdep-cancel.h> - #endif - --extern __typeof(system) __libc_system; -- --/* TODO: the cancellable version breaks on sparc currently, -- * need to figure out why still -- */ --#if !defined __UCLIBC_HAS_THREADS_NATIVE__ || defined __sparc__ -+#if !defined __UCLIBC_HAS_THREADS_NATIVE__ -+/* uClinux-2.0 has vfork, but Linux 2.0 doesn't */ -+#include <sys/syscall.h> -+#ifndef __NR_vfork -+# define vfork fork -+#endif - -+extern __typeof(system) __libc_system; - int __libc_system(const char *command) - { - int wait_val, pid; --- -1.8.5.2 (Apple Git-48) - diff --git a/toolchain/uclibc/patches/0.9.34-git/0003-remove-unused-subdirs-variable.patch b/toolchain/uclibc/patches/0.9.34-git/0003-remove-unused-subdirs-variable.patch deleted file mode 100644 index 12a027c1e..000000000 --- a/toolchain/uclibc/patches/0.9.34-git/0003-remove-unused-subdirs-variable.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f24c9f0a1ae6367c9bd512e49b17e9705b4e1561 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb <wbx@openadk.org> -Date: Wed, 20 Aug 2014 04:31:35 +0200 -Subject: [PATCH 03/11] remove unused subdirs variable - -For sparc TARGET_SUBARCH is never used. And there is a typo in the -path. - -Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org> ---- - libpthread/nptl/sysdeps/sparc/Makefile.arch | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/libpthread/nptl/sysdeps/sparc/Makefile.arch b/libpthread/nptl/sysdeps/sparc/Makefile.arch -index 52ac6db..f9662c6 100644 ---- a/libpthread/nptl/sysdeps/sparc/Makefile.arch -+++ b/libpthread/nptl/sysdeps/sparc/Makefile.arch -@@ -4,8 +4,5 @@ - # - # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. - # --subdirs += libpthread/nptl/sysdeps/$(TARGET_ARCH)/$(TARGET_SUBARCH)/sparv9 - - CFLAGS-pthread_spin_lock.c += -D_GNU_SOURCE -- -- --- -1.8.5.2 (Apple Git-48) - diff --git a/toolchain/uclibc/patches/0.9.34-git/0004-sparc-testsuite-compile-fix.patch b/toolchain/uclibc/patches/0.9.34-git/0004-sparc-testsuite-compile-fix.patch deleted file mode 100644 index 01064624e..000000000 --- a/toolchain/uclibc/patches/0.9.34-git/0004-sparc-testsuite-compile-fix.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 939bd5baadb18f56235c3bf9a2fa08e30e8d336a Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb <wbx@openadk.org> -Date: Wed, 20 Aug 2014 04:39:04 +0200 -Subject: [PATCH 04/11] sparc testsuite compile fix - -tst-spin1.c compile breaks with: -test/nptl/tst-spin1.c:34: undefined reference to `pthread_spin_lock' - -pthread_spin_lock and pthread_spin_trylock is missing while -building sparc. add the meta c files here. - -Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org> ---- - libpthread/nptl/sysdeps/sparc/pthread_spin_lock.c | 5 +++++ - libpthread/nptl/sysdeps/sparc/pthread_spin_trylock.c | 5 +++++ - 2 files changed, 10 insertions(+) - create mode 100644 libpthread/nptl/sysdeps/sparc/pthread_spin_lock.c - create mode 100644 libpthread/nptl/sysdeps/sparc/pthread_spin_trylock.c - -diff --git a/libpthread/nptl/sysdeps/sparc/pthread_spin_lock.c b/libpthread/nptl/sysdeps/sparc/pthread_spin_lock.c -new file mode 100644 -index 0000000..dcc5ae2 ---- /dev/null -+++ b/libpthread/nptl/sysdeps/sparc/pthread_spin_lock.c -@@ -0,0 +1,5 @@ -+#if defined(__arch64__) -+#include "sparc64/pthread_spin_lock.c" -+#else -+#include "sparc32/pthread_spin_lock.c" -+#endif -diff --git a/libpthread/nptl/sysdeps/sparc/pthread_spin_trylock.c b/libpthread/nptl/sysdeps/sparc/pthread_spin_trylock.c -new file mode 100644 -index 0000000..af63eec ---- /dev/null -+++ b/libpthread/nptl/sysdeps/sparc/pthread_spin_trylock.c -@@ -0,0 +1,5 @@ -+#if defined(__arch64__) -+#include "sparc64/pthread_spin_trylock.c" -+#else -+#include "sparc32/pthread_spin_trylock.c" -+#endif --- -1.8.5.2 (Apple Git-48) - diff --git a/toolchain/uclibc/patches/0.9.34-git/0005-sync-WRITE_BUFFER_SIZE-with-glibc-test.patch b/toolchain/uclibc/patches/0.9.34-git/0005-sync-WRITE_BUFFER_SIZE-with-glibc-test.patch deleted file mode 100644 index f43fd9836..000000000 --- a/toolchain/uclibc/patches/0.9.34-git/0005-sync-WRITE_BUFFER_SIZE-with-glibc-test.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 642cf06b4c07658b78fb6029648edc14fcd0075a Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb <wbx@openadk.org> -Date: Wed, 20 Aug 2014 20:29:08 +0200 -Subject: [PATCH 05/11] sync WRITE_BUFFER_SIZE with glibc test - -Test on Linux 3.16.1 in Qemu ARM fails with: - TEST_EXEC nptl/ tst-cancel4 -ret == 1 ; expected_ret == 0 -make[1]: *** [tst-cancel4.exe] Error 1 -The output of failed test is: -minimum write buffer size too large -../Test.mak:89: recipe for target 'tst-cancel4.exe' failed - -Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org> ---- - test/nptl/tst-cancel4.c | 26 ++++++++++++++++++++++++-- - 1 file changed, 24 insertions(+), 2 deletions(-) - -diff --git a/test/nptl/tst-cancel4.c b/test/nptl/tst-cancel4.c -index e711958..53abf83 100644 ---- a/test/nptl/tst-cancel4.c -+++ b/test/nptl/tst-cancel4.c -@@ -83,7 +83,30 @@ static pthread_barrier_t b2; - # define IPC_ADDVAL 0 - #endif - --#define WRITE_BUFFER_SIZE 4096 -+/* The WRITE_BUFFER_SIZE value needs to be chosen such that if we set -+ the socket send buffer size to '1', a write of this size on that -+ socket will block. -+ -+ The Linux kernel imposes a minimum send socket buffer size which -+ has changed over the years. As of Linux 3.10 the value is: -+ -+ 2 * (2048 + SKB_DATA_ALIGN(sizeof(struct sk_buff))) -+ -+ which is attempting to make sure that with standard MTUs, -+ TCP can always queue up at least 2 full sized packets. -+ -+ Furthermore, there is logic in the socket send paths that -+ will allow one more packet (of any size) to be queued up as -+ long as some socket buffer space remains. Blocking only -+ occurs when we try to queue up a new packet and the send -+ buffer space has already been fully consumed. -+ -+ Therefore we must set this value to the largest possible value of -+ the formula above (and since it depends upon the size of "struct -+ sk_buff", it is dependent upon machine word size etc.) plus some -+ slack space. */ -+ -+#define WRITE_BUFFER_SIZE 16384 - - /* Cleanup handling test. */ - static int cl_called; -@@ -758,7 +781,6 @@ tf_sigpause (void *arg) - - pthread_cleanup_push (cl, NULL); - -- /* Just for fun block the cancellation signal. */ - sigpause (SIGCANCEL); - - pthread_cleanup_pop (0); --- -1.8.5.2 (Apple Git-48) - diff --git a/toolchain/uclibc/patches/0.9.34-git/0006-do-not-depend-on-compile.patch b/toolchain/uclibc/patches/0.9.34-git/0006-do-not-depend-on-compile.patch deleted file mode 100644 index d8e954547..000000000 --- a/toolchain/uclibc/patches/0.9.34-git/0006-do-not-depend-on-compile.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 19d6be8095e87682b04a9fb69ee8f6fd37e16a50 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb <wbx@openadk.org> -Date: Wed, 20 Aug 2014 20:32:38 +0200 -Subject: [PATCH 06/11] do not depend on compile - -When you cross-compile the testsuite and then try to run -on a system without gcc/binutils it would be nice if no compiling -or linking is tried. - -Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org> ---- - test/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/Makefile b/test/Makefile -index b759bf9..787c530 100644 ---- a/test/Makefile -+++ b/test/Makefile -@@ -45,7 +45,7 @@ endif - - test check all: run - --run: compile subdirs_run -+run: subdirs_run - - compile: $(top_builddir)$(LOCAL_INSTALL_PATH) subdirs_compile - --- -1.8.5.2 (Apple Git-48) - diff --git a/toolchain/uclibc/patches/0.9.34-git/0007-disable-test-for-non-MMU-systems.patch b/toolchain/uclibc/patches/0.9.34-git/0007-disable-test-for-non-MMU-systems.patch deleted file mode 100644 index 3101a2e9e..000000000 --- a/toolchain/uclibc/patches/0.9.34-git/0007-disable-test-for-non-MMU-systems.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 325f778f3bbb1b13c436e7754dd22097d31c04d2 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb <wbx@uclibc-ng.org> -Date: Thu, 21 Aug 2014 22:02:26 +0200 -Subject: [PATCH 07/11] disable test for non-MMU systems - -This test fails for non-MMU systems, because it uses fork() - -Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org> ---- - test/Makefile | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/test/Makefile b/test/Makefile -index 787c530..d51bb62 100644 ---- a/test/Makefile -+++ b/test/Makefile -@@ -42,6 +42,10 @@ endif - ifeq ($(HAS_NO_THREADS),y) - DIRS := $(filter-out pthread,$(DIRS)) - endif -+# librt test needs fork() -+ifneq ($(ARCH_USE_MMU),y) -+ DIRS := $(filter-out librt,$(DIRS)) -+endif - - test check all: run - --- -1.8.5.2 (Apple Git-48) - diff --git a/toolchain/uclibc/patches/0.9.34-git/0008-disable-test-for-systems-without-FPU.patch b/toolchain/uclibc/patches/0.9.34-git/0008-disable-test-for-systems-without-FPU.patch deleted file mode 100644 index 18bed235b..000000000 --- a/toolchain/uclibc/patches/0.9.34-git/0008-disable-test-for-systems-without-FPU.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 012dfda4b27ad92edb6a9ea14e5ce4c5567d1c91 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb <wbx@uclibc-ng.org> -Date: Thu, 21 Aug 2014 22:04:59 +0200 -Subject: [PATCH 08/11] disable test for systems without FPU - -This test fails for systems without fpu. -For example m68k build for non-mmu/non-fpu systems fail. - -Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org> ---- - test/math/Makefile.in | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/test/math/Makefile.in b/test/math/Makefile.in -index d241baa..147d579 100644 ---- a/test/math/Makefile.in -+++ b/test/math/Makefile.in -@@ -13,6 +13,9 @@ endif - ifeq ($(DO_C99_MATH),) - TESTS_DISABLED += test-float test-ifloat test-double test-idouble rint signgam ilogb - endif -+ifeq ($(UCLIBC_HAS_FPU),) -+TESTS_DISABLED += test-fpucw -+endif - - DODIFF_rint := 1 - DODIFF_signgam := 1 --- -1.8.5.2 (Apple Git-48) - diff --git a/toolchain/uclibc/patches/0.9.34-git/0009-fix-typo.patch b/toolchain/uclibc/patches/0.9.34-git/0009-fix-typo.patch deleted file mode 100644 index 56d6888cd..000000000 --- a/toolchain/uclibc/patches/0.9.34-git/0009-fix-typo.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0b6a99fbbb11287ca5c3ce71ef13689e72d2b79e Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb <wbx@uclibc-ng.org> -Date: Thu, 21 Aug 2014 22:08:43 +0200 -Subject: [PATCH 09/11] fix typo - -otherwise you get compile warnings, when building for m68k. - -Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org> ---- - libc/sysdeps/linux/m68k/bits/huge_vall.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libc/sysdeps/linux/m68k/bits/huge_vall.h b/libc/sysdeps/linux/m68k/bits/huge_vall.h -index c44b64d..674b46d 100644 ---- a/libc/sysdeps/linux/m68k/bits/huge_vall.h -+++ b/libc/sysdeps/linux/m68k/bits/huge_vall.h -@@ -26,7 +26,7 @@ - # define HUGE_VALL (__builtin_huge_vall ()) - #elif __GNUC_PREREQ(2,96) - # define HUGE_VALL (__extension__ 0x1.0p32767L) --#elif defined__GNUC__ -+#elif defined __GNUC__ - - # define HUGE_VALL \ - (__extension__ \ --- -1.8.5.2 (Apple Git-48) - diff --git a/toolchain/uclibc/patches/0.9.34-git/0010-disable-tst_wcsftime.patch b/toolchain/uclibc/patches/0.9.34-git/0010-disable-tst_wcsftime.patch deleted file mode 100644 index 3e8ddb34b..000000000 --- a/toolchain/uclibc/patches/0.9.34-git/0010-disable-tst_wcsftime.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f3bbc3ce512df52a604c3da80163146245d03c0e Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb <wbx@uclibc-ng.org> -Date: Sun, 24 Aug 2014 09:45:54 +0200 -Subject: [PATCH 10/11] disable tst_wcsftime - -Feature is not implemented in uClibc, so no need to do a test. - -Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org> ---- - test/time/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/time/Makefile.in b/test/time/Makefile.in -index 05f73a4..7bb5fb4 100644 ---- a/test/time/Makefile.in -+++ b/test/time/Makefile.in -@@ -2,7 +2,7 @@ - # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. - - TESTS_DISABLED := bug-asctime bug-asctime_r time tst-mktime2 tst-posixtz \ -- tst-strftime tst-strptime tst-timezone -+ tst-strftime tst-strptime tst-timezone tst_wcsftime - - ifneq ($(UCLIBC_HAS_XLOCALE),y) - TESTS_DISABLED += tst-ftime_l --- -1.8.5.2 (Apple Git-48) - diff --git a/toolchain/uclibc/patches/0.9.34-git/0011-get-out-of-the-endless-while-loop-when-bind-failed.patch b/toolchain/uclibc/patches/0.9.34-git/0011-get-out-of-the-endless-while-loop-when-bind-failed.patch deleted file mode 100644 index 81fab7094..000000000 --- a/toolchain/uclibc/patches/0.9.34-git/0011-get-out-of-the-endless-while-loop-when-bind-failed.patch +++ /dev/null @@ -1,26 +0,0 @@ -From cefde9e8caac8ad05409265dcaade63843f2fc71 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb <wbx@uclibc-ng.org> -Date: Sun, 24 Aug 2014 21:37:48 +0200 -Subject: [PATCH 11/11] get out of the endless while loop, when bind failed - -Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org> ---- - test/nptl/tst-cancel4.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/test/nptl/tst-cancel4.c b/test/nptl/tst-cancel4.c -index 53abf83..4ba4045 100644 ---- a/test/nptl/tst-cancel4.c -+++ b/test/nptl/tst-cancel4.c -@@ -1015,6 +1015,8 @@ tf_accept (void *arg) - if (++tries > 10) - { - printf ("%s: too many unsuccessful bind calls\n", __FUNCTION__); -+ /* prevent endless loop, when bind fails forever */ -+ exit (1); - } - - strcpy (sun.sun_path, "/tmp/tst-cancel4-socket-1-XXXXXX"); --- -1.8.5.2 (Apple Git-48) - diff --git a/toolchain/uclibc/patches/0.9.34-git/0012-sync-with-glibc-use-do_test.patch b/toolchain/uclibc/patches/0.9.34-git/0012-sync-with-glibc-use-do_test.patch deleted file mode 100644 index 10cdac6d7..000000000 --- a/toolchain/uclibc/patches/0.9.34-git/0012-sync-with-glibc-use-do_test.patch +++ /dev/null @@ -1,164 +0,0 @@ -From 5ffc18ff0d517a96f1b534cd5cc668f62322f6ff Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb <wbx@uclibc-ng.org> -Date: Mon, 25 Aug 2014 23:05:15 +0200 -Subject: [PATCH 12/12] sync with glibc, use do_test - -Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org> ---- - test/nptl/tst-sem3.c | 33 ++++++++++++++++++--------------- - test/nptl/tst-sem4.c | 7 +++++-- - 2 files changed, 23 insertions(+), 17 deletions(-) - -diff --git a/test/nptl/tst-sem3.c b/test/nptl/tst-sem3.c -index d14f6f6..7b75e29 100644 ---- a/test/nptl/tst-sem3.c -+++ b/test/nptl/tst-sem3.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. -+/* Copyright (C) 2002-2014 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. - -@@ -28,7 +28,7 @@ - - - int --main (void) -+do_test (void) - { - size_t ps = sysconf (_SC_PAGESIZE); - char tmpfname[] = "/tmp/tst-sem3.XXXXXX"; -@@ -43,7 +43,7 @@ main (void) - if (fd == -1) - { - printf ("cannot open temporary file: %m\n"); -- exit (1); -+ return 1; - } - - /* Make sure it is always removed. */ -@@ -56,14 +56,14 @@ main (void) - if (write (fd, data, ps) != (ssize_t) ps) - { - puts ("short write"); -- exit (1); -+ return 1; - } - - mem = mmap (NULL, ps, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); - if (mem == MAP_FAILED) - { - printf ("mmap failed: %m\n"); -- exit (1); -+ return 1; - } - - s = (sem_t *) (((uintptr_t) mem + __alignof (sem_t)) -@@ -73,25 +73,25 @@ main (void) - if (sem_init (s, 1, 1) == -1) - { - puts ("init failed"); -- exit (1); -+ return 1; - } - - if (TEMP_FAILURE_RETRY (sem_wait (s)) == -1) - { - puts ("1st wait failed"); -- exit (1); -+ return 1; - } - - errno = 0; - if (TEMP_FAILURE_RETRY (sem_trywait (s)) != -1) - { - puts ("trywait succeeded"); -- exit (1); -+ return 1; - } - else if (errno != EAGAIN) - { - puts ("trywait didn't return EAGAIN"); -- exit (1); -+ return 1; - } - - *p = 0; -@@ -101,7 +101,7 @@ main (void) - if (pid == -1) - { - puts ("fork failed"); -- exit (1); -+ return 1; - } - else if (pid == 0) - { -@@ -109,13 +109,13 @@ main (void) - if ((*p)++ != 0) - { - puts ("child: *p != 0"); -- exit (1); -+ return 1; - } - - if (sem_post (s) == -1) - { - puts ("child: 1st post failed"); -- exit (1); -+ return 1; - } - - puts ("child done"); -@@ -125,17 +125,20 @@ main (void) - if (TEMP_FAILURE_RETRY (sem_wait (s)) == -1) - { - printf ("parent: 2nd wait failed: %m\n"); -- exit (1); -+ return 1; - } - - if (*p != 1) - { - puts ("*p != 1"); -- exit (1); -+ return 1; - } - - puts ("parent done"); - } - -- exit (0); -+ return 0; - } -+ -+#define TEST_FUNCTION do_test () -+#include "../test-skeleton.c" -diff --git a/test/nptl/tst-sem4.c b/test/nptl/tst-sem4.c -index 125759b..72ed97d 100644 ---- a/test/nptl/tst-sem4.c -+++ b/test/nptl/tst-sem4.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2002 Free Software Foundation, Inc. -+/* Copyright (C) 2002-2014 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. - -@@ -32,7 +32,7 @@ remove_sem (int status, void *arg) - - - int --main (void) -+do_test (void) - { - sem_t *s; - sem_t *s2; -@@ -144,3 +144,6 @@ main (void) - - return 0; - } -+ -+#define TEST_FUNCTION do_test () -+#include "../test-skeleton.c" --- -1.8.5.2 (Apple Git-48) - |