Merge r6159 (parts of):

Minor build-system adjustments, mostly.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6289 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/pub_core_libcassert.h b/coregrind/pub_core_libcassert.h
index b38853c..fdedfef 100644
--- a/coregrind/pub_core_libcassert.h
+++ b/coregrind/pub_core_libcassert.h
@@ -71,6 +71,9 @@
 extern void VG_(unimplemented) ( Char* msg )
             __attribute__((__noreturn__));
 
+/* Show the state of all threads.  Mostly for debugging V. */
+extern void VG_(show_sched_status) ( void );
+
 #endif   // __PUB_CORE_LIBCASSERT_H
 
 /*--------------------------------------------------------------------*/