Merge in changes from the 2.4.0 line.  This basically brings in the
overhaul of the thread support.  Many things are now probably broken,
but at least with --tool=none, simple and not-so-simple threaded and
non-thread programs work.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3265 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index 614689a..51409ed 100644
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -1,7 +1,7 @@
 usage: valgrind --tool=<toolname> [options] prog-and-args
 
   common user options for all Valgrind tools, with defaults in [ ]:
-    --tool=<name>             use the Valgrind tool named <name>
+    --tool=<name>             use the Valgrind tool named <name> [memcheck]
     -h --help                 show this message
     --help-debug              show this message, plus debugging options
     --version                 show version
@@ -13,10 +13,7 @@
 
   uncommon user options for all Valgrind tools:
     --run-libc-freeres=no|yes free up glibc memory at exit? [yes]
-    --weird-hacks=hack1,hack2,...  recognised hacks: lax-ioctls [none]
-    --signal-polltime=<time>  signal poll period (mS) for older kernels [50]
-    --lowlat-signals=no|yes   improve thread signal wake-up latency [no]
-    --lowlat-syscalls=no|yes  improve thread syscall wake-up latency [no]
+    --weird-hacks=hack1,hack2,...  recognised hacks: lax-ioctls,ioctl-mmap [none]
     --pointercheck=no|yes     enforce client address space limits [yes]
     --support-elan3=no|yes    hacks for Quadrics Elan3 support [no]
 
@@ -51,9 +48,8 @@
     --trace-signals=no|yes    show signal handling details? [no]
     --trace-symtab=no|yes     show symbol table details? [no]
     --trace-sched=no|yes      show thread scheduler details? [no]
-    --trace-pthread=none|some|all  show pthread event details? [none]
     --wait-for-gdb=yes|no     pause on startup to wait for gdb attach
-
+    --command-line-only=no|yes  only use command line options [no]
     --vex-iropt-verbosity             0 .. 9 [0]
     --vex-iropt-level                 0 .. 2 [2]
     --vex-iropt-precise-memory-exns   [no]