Command line help - demangling isn't just for C++

Make the first line generic and add a list of languages
that are suppoted.

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 85e744d1575395f9a767a7e80569a621a79bda5d..3eba026cc53381a5014c6d8c0039e4b5650373fe 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -130,7 +130,8 @@ static void usage_NORETURN ( int need_help )
 "    --xml-file=<file>         XML output to <file>\n"
 "    --xml-socket=ipaddr:port  XML output to socket ipaddr:port\n"
 "    --xml-user-comment=STR    copy STR verbatim into XML output\n"
-"    --demangle=no|yes         automatically demangle C++ names? [yes]\n"
+"    --demangle=no|yes         automatically demangle decorated names? [yes]\n"
+"                              supported languages: C++, D, Rust, Java, Ada\n"
 "    --num-callers=<number>    show <number> callers in stack traces [12]\n"
 "    --error-limit=no|yes      stop showing new errors if too many? [yes]\n"
 "    --exit-on-first-error=no|yes exit code on the first error found? [no]\n"

diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp
index f88e63d24d13d5b173addaaabe8355a1982613b9..c7b7536856c3be70b4cea82f3baf31dc12dbcc85 100644 (file)
--- a/none/tests/cmdline1.stdout.exp
+++ b/none/tests/cmdline1.stdout.exp
@@ -43,7 +43,8 @@ usage: valgrind [options] prog-and-args
     --xml-file=<file>         XML output to <file>
     --xml-socket=ipaddr:port  XML output to socket ipaddr:port
     --xml-user-comment=STR    copy STR verbatim into XML output
-    --demangle=no|yes         automatically demangle C++ names? [yes]
+    --demangle=no|yes         automatically demangle decorated names? [yes]
+                              supported languages: C++, D, Rust, Java, Ada
     --num-callers=<number>    show <number> callers in stack traces [12]
     --error-limit=no|yes      stop showing new errors if too many? [yes]
     --exit-on-first-error=no|yes exit code on the first error found? [no]

diff --git a/none/tests/cmdline1.stdout.exp-non-linux b/none/tests/cmdline1.stdout.exp-non-linux
index 6449dc15b63315cdabb0d972dcf173646e341691..6650cc5b9011fb065e7af5a5afecca84bdd09e3c 100644 (file)
--- a/none/tests/cmdline1.stdout.exp-non-linux
+++ b/none/tests/cmdline1.stdout.exp-non-linux
@@ -41,7 +41,8 @@ usage: valgrind [options] prog-and-args
     --xml-file=<file>         XML output to <file>
     --xml-socket=ipaddr:port  XML output to socket ipaddr:port
     --xml-user-comment=STR    copy STR verbatim into XML output
-    --demangle=no|yes         automatically demangle C++ names? [yes]
+    --demangle=no|yes         automatically demangle decorated names? [yes]
+                              supported languages: C++, D, Rust, Java, Ada
     --num-callers=<number>    show <number> callers in stack traces [12]
     --error-limit=no|yes      stop showing new errors if too many? [yes]
     --exit-on-first-error=no|yes exit code on the first error found? [no]

diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index c4dc05f1875962f062fafe2923aedbfe7641c399..24ca407f806dc95b9a1487bdc92bd302d6a679c9 100644 (file)
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -43,7 +43,8 @@ usage: valgrind [options] prog-and-args
     --xml-file=<file>         XML output to <file>
     --xml-socket=ipaddr:port  XML output to socket ipaddr:port
     --xml-user-comment=STR    copy STR verbatim into XML output
-    --demangle=no|yes         automatically demangle C++ names? [yes]
+    --demangle=no|yes         automatically demangle decorated names? [yes]
+                              supported languages: C++, D, Rust, Java, Ada
     --num-callers=<number>    show <number> callers in stack traces [12]
     --error-limit=no|yes      stop showing new errors if too many? [yes]
     --exit-on-first-error=no|yes exit code on the first error found? [no]

diff --git a/none/tests/cmdline2.stdout.exp-non-linux b/none/tests/cmdline2.stdout.exp-non-linux
index 034f63d580bbddd5677f229bfbc74e7ba8165654..e13d196954e694c806322629c3629fccca32aada 100644 (file)
--- a/none/tests/cmdline2.stdout.exp-non-linux
+++ b/none/tests/cmdline2.stdout.exp-non-linux
@@ -41,7 +41,8 @@ usage: valgrind [options] prog-and-args
     --xml-file=<file>         XML output to <file>
     --xml-socket=ipaddr:port  XML output to socket ipaddr:port
     --xml-user-comment=STR    copy STR verbatim into XML output
-    --demangle=no|yes         automatically demangle C++ names? [yes]
+    --demangle=no|yes         automatically demangle decorated names? [yes]
+                              supported languages: C++, D, Rust, Java, Ada
     --num-callers=<number>    show <number> callers in stack traces [12]
     --error-limit=no|yes      stop showing new errors if too many? [yes]
     --exit-on-first-error=no|yes exit code on the first error found? [no]