test are in tls dir, not nptl

6 files changed, 19 insertions, 19 deletions

diff --git a/toolchain/uclibc/patches/0.9.34-git/0001-test-disable-posix_fallocate64-for-small-embedded-sy.patch b/toolchain/uclibc/patches/0.9.34-git/0001-test-disable-posix_fallocate64-for-small-embedded-sy.patch
index 9765e8bbc..7b635f799 100644
--- a/toolchain/uclibc/patches/0.9.34-git/0001-test-disable-posix_fallocate64-for-small-embedded-sy.patch
+++ b/toolchain/uclibc/patches/0.9.34-git/0001-test-disable-posix_fallocate64-for-small-embedded-sy.patch
@@ -1,4 +1,4 @@
-From 54cef0956a1e85add7c6998f95abffa9362be85e Mon Sep 17 00:00:00 2001
+From 943ef39519a3a4aa514f1fe9431565bf691f01f2 Mon Sep 17 00:00:00 2001
 From: Waldemar Brodkorb <wbx@openadk.org>
 Date: Mon, 1 Sep 2014 21:02:19 +0200
 Subject: [PATCH 1/6] test: disable posix_fallocate64 for small embedded
@@ -10,10 +10,10 @@ Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
  1 file changed, 2 insertions(+)
 
 diff --git a/test/unistd/Makefile.in b/test/unistd/Makefile.in
-index cfef22e..911c8e8 100644
+index ed33d9a..c884a39 100644
 --- a/test/unistd/Makefile.in
 +++ b/test/unistd/Makefile.in
-@@ -15,6 +15,8 @@ else
+@@ -25,6 +25,8 @@ else
  # reordering is not supported, behaves as if POSIXLY_CORRECT would be set
  OPTS_tstgetopt   := -a -b -cfoobar --required foobar --optional=bazbug --none --colou --color --colour random
  endif
diff --git a/toolchain/uclibc/patches/0.9.34-git/0002-nptl-remove-duplicate-vfork-in-libpthread.patch b/toolchain/uclibc/patches/0.9.34-git/0002-nptl-remove-duplicate-vfork-in-libpthread.patch
index 779498832..d6a49484c 100644
--- a/toolchain/uclibc/patches/0.9.34-git/0002-nptl-remove-duplicate-vfork-in-libpthread.patch
+++ b/toolchain/uclibc/patches/0.9.34-git/0002-nptl-remove-duplicate-vfork-in-libpthread.patch
@@ -1,4 +1,4 @@
-From d4ebeb637a050717642a0f270b3b0dd61f046705 Mon Sep 17 00:00:00 2001
+From c0cdfbcfd4ca6f86eae5f189290cbc1be891a398 Mon Sep 17 00:00:00 2001
 From: Waldemar Brodkorb <wbx@openadk.org>
 Date: Thu, 4 Sep 2014 15:23:36 +0200
 Subject: [PATCH 2/6] nptl: remove duplicate vfork() in libpthread
diff --git a/toolchain/uclibc/patches/0.9.34-git/0003-linuxthreads-remove-unused-s390-code.patch b/toolchain/uclibc/patches/0.9.34-git/0003-linuxthreads-remove-unused-s390-code.patch
index cbefd471a..b5712393d 100644
--- a/toolchain/uclibc/patches/0.9.34-git/0003-linuxthreads-remove-unused-s390-code.patch
+++ b/toolchain/uclibc/patches/0.9.34-git/0003-linuxthreads-remove-unused-s390-code.patch
@@ -1,4 +1,4 @@
-From d72e888957d32984c56e19e43a3c3b41263c7bb4 Mon Sep 17 00:00:00 2001
+From 0072d1730591edbbcee79f93d54b66ffbd57a02b Mon Sep 17 00:00:00 2001
 From: Waldemar Brodkorb <wbx@openadk.org>
 Date: Sat, 6 Sep 2014 14:45:42 +0200
 Subject: [PATCH 3/6] linuxthreads: remove unused s390 code
diff --git a/toolchain/uclibc/patches/0.9.34-git/0004-disable-tests-if-HAVE_SHARED-is-not-set.patch b/toolchain/uclibc/patches/0.9.34-git/0004-disable-tests-if-HAVE_SHARED-is-not-set.patch
index 166884f09..2f008929f 100644
--- a/toolchain/uclibc/patches/0.9.34-git/0004-disable-tests-if-HAVE_SHARED-is-not-set.patch
+++ b/toolchain/uclibc/patches/0.9.34-git/0004-disable-tests-if-HAVE_SHARED-is-not-set.patch
@@ -1,4 +1,4 @@
-From c6f378032f50fe7c531368111743a94015c6949d Mon Sep 17 00:00:00 2001
+From 743a46b7b12f07065465d9e49729043cf6f00394 Mon Sep 17 00:00:00 2001
 From: Waldemar Brodkorb <wbx@openadk.org>
 Date: Sun, 7 Sep 2014 16:38:14 +0200
 Subject: [PATCH 4/6] disable tests if HAVE_SHARED is not set
diff --git a/toolchain/uclibc/patches/0.9.34-git/0005-disable-tests-for-arc-as-long-as-binutils-is-buggy.patch b/toolchain/uclibc/patches/0.9.34-git/0005-disable-tests-for-arc-as-long-as-binutils-is-buggy.patch
index 258cc3e96..b7af276fc 100644
--- a/toolchain/uclibc/patches/0.9.34-git/0005-disable-tests-for-arc-as-long-as-binutils-is-buggy.patch
+++ b/toolchain/uclibc/patches/0.9.34-git/0005-disable-tests-for-arc-as-long-as-binutils-is-buggy.patch
@@ -1,28 +1,28 @@
-From 01ba5566cd878ae5e2183e1a89729922bfa80fa0 Mon Sep 17 00:00:00 2001
+From b46e40edc326638336adc91ccc2aad74c94c764b Mon Sep 17 00:00:00 2001
 From: Waldemar Brodkorb <wbx@openadk.org>
 Date: Tue, 9 Sep 2014 18:40:22 +0200
 Subject: [PATCH 5/6] disable tests for arc as long as binutils is buggy
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 ---
- test/nptl/Makefile.in | 4 ++++
+ test/tls/Makefile.in | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/test/nptl/Makefile.in b/test/nptl/Makefile.in
-index d20d2c1..12119e2 100644
---- a/test/nptl/Makefile.in
-+++ b/test/nptl/Makefile.in
-@@ -53,6 +53,10 @@ TESTS += tst-clock tst-clock_nanosleep tst-cpuclock1 tst-cpuclock2	\
- 	tst-mqueue7 tst-mqueue8 tst-mqueue9 tst-timer2 tst-timer3	\
- 	tst-timer4 tst-timer5
+diff --git a/test/tls/Makefile.in b/test/tls/Makefile.in
+index 7ab4e2a..0a98337 100644
+--- a/test/tls/Makefile.in
++++ b/test/tls/Makefile.in
+@@ -12,6 +12,10 @@ ifeq ($(HAVE_SHARED),)
+ TESTS_DISABLED := $(TESTS)
+ endif
  
 +ifeq ($(TARGET_ARCH),arc)
 +TESTS_DISABLED += tst-tls12 tst-tls-at-ctor
 +endif
 +
- ifeq ($(UCLIBC_HAS_OBSOLETE_BSD_SIGNAL),)
- TESTS_DISABLED += tst-exec2 tst-exec3 tst-exec4
- endif
+ # All these tests need tls.h, which is not installed with glibc
+ GLIBC_TESTS_DISABLED := $(addsuffix _glibc,$(filter-out $(TESTS_DISABLED),$(TESTS)))
+ 
 -- 
 1.8.5.2 (Apple Git-48)
 
diff --git a/toolchain/uclibc/patches/0.9.34-git/0006-arm-add-RESET_PID-in-the-clone-impl.patch b/toolchain/uclibc/patches/0.9.34-git/0006-arm-add-RESET_PID-in-the-clone-impl.patch
index 05341e7ff..1c746dd08 100644
--- a/toolchain/uclibc/patches/0.9.34-git/0006-arm-add-RESET_PID-in-the-clone-impl.patch
+++ b/toolchain/uclibc/patches/0.9.34-git/0006-arm-add-RESET_PID-in-the-clone-impl.patch
@@ -1,4 +1,4 @@
-From b516d8b113e479254d114c17cb51f2687098149c Mon Sep 17 00:00:00 2001
+From 60f9eaa155d0f7ff935da37ecdf253c5c744a3ce Mon Sep 17 00:00:00 2001
 From: Wang Yufen <wangyufen@huawei.com>
 Date: Fri, 5 Sep 2014 15:19:21 +0800
 Subject: [PATCH 6/6] arm: add RESET_PID in the clone impl