Merge the DARWIN branch onto the trunk.

I tried using 'svn merge' to do the merge but it did a terrible job and
there were bazillions of conflicts.  So instead I just took the diff between
the branch and trunk  at r10155, applied the diff to the trunk, 'svn add'ed
the added files (no files needed to be 'svn remove'd) and committed.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10156 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/drd/drd_main.c b/drd/drd_main.c
index 0dfb00a..3cc6348 100644
--- a/drd/drd_main.c
+++ b/drd/drd_main.c
@@ -607,8 +607,13 @@
 static
 void drd_pre_clo_init(void)
 {
-   // Basic tool stuff.
+#if defined(VGO_darwin)
+   // This makes the (all-failing) regtests run much faster.
+   VG_(printf)("DRD doesn't work on Darwin yet, sorry.\n");
+   VG_(exit)(1);
+#endif
 
+   // Basic tool stuff.
    VG_(details_name)            ("drd");
    VG_(details_version)         (NULL);
    VG_(details_description)     ("a thread error detector");