|
From: Dirk M. <mu...@kd...> - 2004-04-07 01:32:25
|
CVS commit by mueller:
fix NPTL detection for SUSE 9.1
M +0 -40 configure.in 1.93.2.7
M +2 -3 coregrind/valgrind.in 1.28.2.4
--- valgrind/configure.in #1.93.2.6:1.93.2.7
@@ -297,44 +297,4 @@
)
-
-
-AC_MSG_CHECKING([if this is an NPTL-based system])
-safe_LIBS="$LIBS"
-LIBS="$LIBS -lpthread"
-AC_TRY_RUN([
-#include <pthread.h>
-#include <stdio.h>
-int main (int argc, char * argv [])
-{
- int ret;
- pthread_mutexattr_t mutexattr;
- ret = pthread_mutexattr_init (&mutexattr);
- if (ret == 0) {
- ret = pthread_mutexattr_setpshared(&mutexattr, PTHREAD_PROCESS_SHARED);
- if (ret == 0) /* nptl */
- return 0;
- else /* not nptl */
- return 1;
- }
- return 1;
-}
-],
-[
- NPTL_THREADING="yes"
- AC_MSG_RESULT([yes])
-],
-[
- NPTL_THREADING="no"
- AC_MSG_RESULT([no])
-],
-[
- AC_MSG_RESULT([couldn't run test program])
- NPTL_THREADING="no"
-])
-LIBS=$safe_LIBS
-
-AC_SUBST(NPTL_THREADING)
-
-
# does this compiler support -mpreferred-stack-boundary=2 ?
AC_MSG_CHECKING([if gcc accepts -mpreferred-stack-boundary])
--- valgrind/coregrind/valgrind.in #1.28.2.3:1.28.2.4
@@ -32,5 +32,4 @@
exec_prefix="@exec_prefix@"
VALGRIND="@libdir@/valgrind"
-nptl_threading="@NPTL_THREADING@"
# Other stuff ...
@@ -106,6 +105,6 @@
# an environment variable.
-if [ z"$nptl_threading" = zyes ]; then
- LD_ASSUME_KERNEL=2.2.5
+if getconf GNU_LIBPTHREAD_VERSION | grep -qi NPTL 2>/dev/null; then
+ LD_ASSUME_KERNEL=2.4.1
export LD_ASSUME_KERNEL
fi
|