15 files changed, 12 insertions, 3 deletions
diff --git a/nptl/Makefile b/nptl/Makefile
index 8e53ff6a49..80e293209c 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -249,9 +249,7 @@ tests = tst-attr2 tst-attr3 tst-default-attr \
 	tst-rwlock9 tst-rwlock10 tst-rwlock11 tst-rwlock12 \
 	tst-rwlock14 tst-rwlock15 tst-rwlock17 tst-rwlock18 \
 	tst-once5 \
-	tst-sem1 tst-sem2 tst-sem3 tst-sem4 tst-sem5 tst-sem6 tst-sem7 \
-	tst-sem8 tst-sem9 tst-sem10 tst-sem14 \
-	tst-sem15 tst-sem16 tst-sem17 \
+	tst-sem5 tst-sem17 \
 	tst-barrier1 tst-barrier2 tst-barrier3 tst-barrier4 \
 	tst-align tst-align3 \
 	tst-kill1 tst-kill2 tst-kill3 tst-kill4 tst-kill5 tst-kill6 \
diff --git a/sysdeps/mach/hurd/i386/Makefile b/sysdeps/mach/hurd/i386/Makefile
index e303945b2a..a5ccab0956 100644
--- a/sysdeps/mach/hurd/i386/Makefile
+++ b/sysdeps/mach/hurd/i386/Makefile
@@ -111,6 +111,7 @@ test-xfail-tst-cond13 = yes
 test-xfail-tst-cond23 = yes
 test-xfail-tst-rwlock4 = yes
 test-xfail-tst-rwlock12 = yes
+test-xfail-tst-sem3 = yes
 endif
 
 # For bug 25522
@@ -119,6 +120,14 @@ test-xfail-tst-cond24 = yes
 test-xfail-tst-cond25 = yes
 endif
 
+# For bug 25524
+ifeq ($(subdir),htl)
+test-xfail-tst-sem4 = yes
+test-xfail-tst-sem7 = yes
+test-xfail-tst-sem8 = yes
+test-xfail-tst-sem9 = yes
+endif
+
 ifeq ($(subdir),elf)
 # We do use nested functions involving creation of trampolines, notably for
 # callbacks whose parameters don't permit to get the context parameters.
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile
index 8143eeb1ad..2f07c0cfe6 100644
--- a/sysdeps/pthread/Makefile
+++ b/sysdeps/pthread/Makefile
@@ -55,6 +55,8 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \
 	 tst-once1 tst-once2 tst-once3 tst-once4 \
 	 tst-rwlock1 tst-rwlock4 tst-rwlock5 tst-rwlock13 tst-rwlock16 \
 	 tst-rwlock-tryrdlock-stall tst-rwlock-trywrlock-stall \
+	 tst-sem1 tst-sem2 tst-sem3 tst-sem4 tst-sem6 tst-sem7 \
+	 tst-sem8 tst-sem9 tst-sem10 tst-sem14 tst-sem15 tst-sem16 \
 	 tst-spin1 tst-spin2 tst-spin3 tst-spin4
 
 tests += tst-oncex3 tst-oncex4
diff --git a/nptl/tst-sem1.c b/sysdeps/pthread/tst-sem1.c
index ba46e77fbd..ba46e77fbd 100644
--- a/nptl/tst-sem1.c
+++ b/sysdeps/pthread/tst-sem1.c
diff --git a/nptl/tst-sem10.c b/sysdeps/pthread/tst-sem10.c
index 2f1505003e..2f1505003e 100644
--- a/nptl/tst-sem10.c
+++ b/sysdeps/pthread/tst-sem10.c
diff --git a/nptl/tst-sem14.c b/sysdeps/pthread/tst-sem14.c
index a2461a6a90..a2461a6a90 100644
--- a/nptl/tst-sem14.c
+++ b/sysdeps/pthread/tst-sem14.c
diff --git a/nptl/tst-sem15.c b/sysdeps/pthread/tst-sem15.c
index 9a9a93eb32..9a9a93eb32 100644
--- a/nptl/tst-sem15.c
+++ b/sysdeps/pthread/tst-sem15.c
diff --git a/nptl/tst-sem16.c b/sysdeps/pthread/tst-sem16.c
index 315a92581a..315a92581a 100644
--- a/nptl/tst-sem16.c
+++ b/sysdeps/pthread/tst-sem16.c
diff --git a/nptl/tst-sem2.c b/sysdeps/pthread/tst-sem2.c
index 659c1c81f0..659c1c81f0 100644
--- a/nptl/tst-sem2.c
+++ b/sysdeps/pthread/tst-sem2.c
diff --git a/nptl/tst-sem3.c b/sysdeps/pthread/tst-sem3.c
index 6568840112..6568840112 100644
--- a/nptl/tst-sem3.c
+++ b/sysdeps/pthread/tst-sem3.c
diff --git a/nptl/tst-sem4.c b/sysdeps/pthread/tst-sem4.c
index 7286627643..7286627643 100644
--- a/nptl/tst-sem4.c
+++ b/sysdeps/pthread/tst-sem4.c
diff --git a/nptl/tst-sem6.c b/sysdeps/pthread/tst-sem6.c
index 7f74437b06..7f74437b06 100644
--- a/nptl/tst-sem6.c
+++ b/sysdeps/pthread/tst-sem6.c
diff --git a/nptl/tst-sem7.c b/sysdeps/pthread/tst-sem7.c
index 80f566f787..80f566f787 100644
--- a/nptl/tst-sem7.c
+++ b/sysdeps/pthread/tst-sem7.c
diff --git a/nptl/tst-sem8.c b/sysdeps/pthread/tst-sem8.c
index ebe1ac6fa3..ebe1ac6fa3 100644
--- a/nptl/tst-sem8.c
+++ b/sysdeps/pthread/tst-sem8.c
diff --git a/nptl/tst-sem9.c b/sysdeps/pthread/tst-sem9.c
index d5a4d8b3b6..d5a4d8b3b6 100644
--- a/nptl/tst-sem9.c
+++ b/sysdeps/pthread/tst-sem9.c