From: Bart Van Assche <bvanassche@acm.org>
Date: Wed, 19 Mar 2008 17:12:01 +0000 (+0000)
Subject: Should have been in last commit.
X-Git-Tag: svn/VALGRIND_3_4_0~833
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=534ff77943ef11d75bf73ee04312a564311b67dc;p=thirdparty%2Fvalgrind.git

Should have been in last commit.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7740
---

diff --git a/exp-drd/tests/Makefile.am b/exp-drd/tests/Makefile.am
index 00afada069..2b8b91be35 100644
--- a/exp-drd/tests/Makefile.am
+++ b/exp-drd/tests/Makefile.am
@@ -137,7 +137,7 @@ EXTRA_DIST =                                        \
 	tc23_bogus_condwait.vgtest                  \
 	tc24_nonzero_sem.stderr.exp                 \
 	tc24_nonzero_sem.vgtest                     \
-	trylock.c trylock.stderr.exp                \
+	trylock.c trylock.stderr.exp
 
 AM_CFLAGS   = $(WERROR) -Winline -Wall -Wshadow -g $(AM_FLAG_M3264_PRI)
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_builddir)/include
diff --git a/exp-drd/tests/supported_libpthread b/exp-drd/tests/supported_libpthread
new file mode 100755
index 0000000000..ec3cfe9855
--- /dev/null
+++ b/exp-drd/tests/supported_libpthread
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Exit with status 0 if a supported version of libpthread is found (NPTL or
+# non-Linux libpthread) and exit with status 1 if a non-supported version of
+# libpthread is found (LinuxThreads).
+
+if [ "$(uname)" = "Linux" ]; then
+  libpthread_version="$(/usr/bin/getconf GNU_LIBPTHREAD_VERSION 2>/dev/null)"
+  if [ "${libpthread_version#NPTL}" != "${libpthread_version}" ]; then
+    # NPTL
+    exit 0
+  fi
+  # configuration string is empty or does start with "linuxthreads".
+  exit 1
+fi
+
+# Another OS than Linux, which is also fine.
+exit 0