|
From: <sv...@va...> - 2007-09-17 09:55:00
|
Author: sewardj
Date: 2007-09-17 10:54:57 +0100 (Mon, 17 Sep 2007)
New Revision: 6849
Log:
Minimal glibc-2.3 support.
Modified:
branches/THRCHECK/glibc-2.3.supp
branches/THRCHECK/thrcheck/tests/tc10_rec_lock.c
Modified: branches/THRCHECK/glibc-2.3.supp
===================================================================
--- branches/THRCHECK/glibc-2.3.supp 2007-09-17 07:42:15 UTC (rev 6848)
+++ branches/THRCHECK/glibc-2.3.supp 2007-09-17 09:54:57 UTC (rev 6849)
@@ -610,3 +610,39 @@
obj:/lib/libpthread-0.10.so
fun:pthread_create
}
+
+##----------------------------------------------------------------------##
+# Suppressions for the Thrcheck tool
+
+###--- ld.so stuff ---###
+{
+ thrcheck-glibc23-ldso-1
+ Thrcheck:Race
+ fun:_dl_lookup_symbol_x
+ fun:fixup
+ fun:_dl_runtime_resolve
+}
+
+###--- pthread_join ---###
+{
+ thrcheck-glibc23-pthjoin-1
+ Thrcheck:Race
+ fun:pthread_join
+ fun:pthread_join
+}
+
+###--- pthread_mutex_lock ---###
+{
+ thrcheck-glibc23-pthmxlock-1
+ Thrcheck:Race
+ fun:pthread_mutex_lock
+ fun:pthread_mutex_lock
+}
+
+###--- pthread_create ---###
+{
+ thrcheck-glibc23-pthcreate-1
+ Thrcheck:Race
+ fun:pthread_create@@GLIBC_*
+ fun:pthread_create@*
+}
Modified: branches/THRCHECK/thrcheck/tests/tc10_rec_lock.c
===================================================================
--- branches/THRCHECK/thrcheck/tests/tc10_rec_lock.c 2007-09-17 07:42:15 UTC (rev 6848)
+++ branches/THRCHECK/thrcheck/tests/tc10_rec_lock.c 2007-09-17 09:54:57 UTC (rev 6849)
@@ -5,6 +5,20 @@
#include <stdlib.h>
#include <assert.h>
+
+
+/* glibc 2.3 doesn't appear to supply PTHREAD_MUTEX_RECURSIVE.
+ We have to give up. */
+#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)
+int main ( void ) {
+ printf("This program does not compile on systems "
+ "using glibc 2.3 or earlier.\n");
+ return 0;
+}
+#else
+
+
+
#define __USE_UNIX98 1
#include <pthread.h>
@@ -44,3 +58,6 @@
nearly_main();
return 0;
}
+
+
+#endif /* !(glibc 2.3 or earlier) */
|