improve --help for --main-stacksize and supported ARM cpu

If the command line option --main-stacksize is not used,
the current ulimit value is used, with a min of 1MB
and a max of 16MB. Document this min/max default formula
in the --help.

Also indicate that Valgrind supports ARMv7

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13426

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 1bb7e1fabe33053941f168040e9d5e5cebc5bad2..89c8edad592264443c65bca56a201205598996dd 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -159,7 +159,7 @@ static void usage_NORETURN ( Bool debug_help )
 "    --max-stackframe=<number> assume stack switch for SP changes larger\n"
 "                              than <number> bytes [2000000]\n"
 "    --main-stacksize=<number> set size of main thread's stack (in bytes)\n"
-"                              [use current 'ulimit' value]\n"
+"                              [min(max(current 'ulimit' value,1MB),16MB)]\n"
 "\n"
 "  user options for Valgrind tools that replace malloc:\n"
 "    --alignment=<number>      set minimum alignment of heap allocations [%s]\n"
@@ -1700,6 +1700,7 @@ Int valgrind_main ( Int argc, HChar **argv, HChar **envp )
         VG_(printf)("   * x86 (practically any; Pentium-I or above), "
                     "AMD Athlon or above)\n");
         VG_(printf)("   * AMD Athlon64/Opteron\n");
+        VG_(printf)("   * ARM (armv7)\n");
         VG_(printf)("   * PowerPC (most; ppc405 and above)\n");
         VG_(printf)("   * System z (64bit only - s390x; z900 and above)\n");
         VG_(printf)("\n");

diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp
index ed662fbf6f2d8049f622e3e8c512d0d94e50c7e8..4ba4633501352873ac9d2b51c689c6a2bdbf4d00 100644 (file)
--- a/none/tests/cmdline1.stdout.exp
+++ b/none/tests/cmdline1.stdout.exp
@@ -47,7 +47,7 @@ usage: valgrind [options] prog-and-args
     --max-stackframe=<number> assume stack switch for SP changes larger
                               than <number> bytes [2000000]
     --main-stacksize=<number> set size of main thread's stack (in bytes)
-                              [use current 'ulimit' value]
+                              [min(max(current 'ulimit' value,1MB),16MB)]
 
   user options for Valgrind tools that replace malloc:
     --alignment=<number>      set minimum alignment of heap allocations [not used by this tool]

diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index bc5a1e1c63736744f863229f19473ca94e902353..2bb5a1a2e2b7e84b5d0eb770baa93f9493da2dcd 100644 (file)
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -47,7 +47,7 @@ usage: valgrind [options] prog-and-args
     --max-stackframe=<number> assume stack switch for SP changes larger
                               than <number> bytes [2000000]
     --main-stacksize=<number> set size of main thread's stack (in bytes)
-                              [use current 'ulimit' value]
+                              [min(max(current 'ulimit' value,1MB),16MB)]
 
   user options for Valgrind tools that replace malloc:
     --alignment=<number>      set minimum alignment of heap allocations [not used by this tool]