From: Julian Seward <jseward@acm.org>
Date: Tue, 7 Aug 2012 14:46:34 +0000 (+0000)
Subject: Add a couple of useful examples to the --help text for
X-Git-Tag: svn/VALGRIND_3_8_0~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fae30e8323d08cf2039957f32aa45744faecc555;p=thirdparty%2Fvalgrind.git

Add a couple of useful examples to the --help text for
--soname-synonyms.


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

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index dde8e07088..61c7b9a327 100644
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -194,8 +194,10 @@ static void usage_NORETURN ( Bool debug_help )
 "                              stated shared object doesn't have the stated\n"
 "                              text symbol.  Patterns can contain ? and *.\n"
 "    --soname-synonyms=syn1=pattern1,syn2=pattern2,... synonym soname\n"
-"                              patterns for some Valgrind wrapping\n"
-"                              or replacement (such as malloc replacement)\n"
+"              specify patterns for function wrapping or replacement.\n"
+"              To use a non-libc malloc library that is\n"
+"                  in the main exe:  --soname-synonyms=somalloc=NONE\n"
+"                  in libxyzzy.so:   --soname-synonyms=somalloc=libxyzzy.so\n"
 "\n";
 
    Char* usage2 = 
diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp
index 4e113f38d1..e4cb9eb5b6 100644
--- a/none/tests/cmdline1.stdout.exp
+++ b/none/tests/cmdline1.stdout.exp
@@ -83,8 +83,10 @@ usage: valgrind [options] prog-and-args
                               stated shared object doesn't have the stated
                               text symbol.  Patterns can contain ? and *.
     --soname-synonyms=syn1=pattern1,syn2=pattern2,... synonym soname
-                              patterns for some Valgrind wrapping
-                              or replacement (such as malloc replacement)
+              specify patterns for function wrapping or replacement.
+              To use a non-libc malloc library that is
+                  in the main exe:  --soname-synonyms=somalloc=NONE
+                  in libxyzzy.so:   --soname-synonyms=somalloc=libxyzzy.so
 
   user options for Nulgrind:
     (none)
diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index 7897d590c5..f22643743b 100644
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -83,8 +83,10 @@ usage: valgrind [options] prog-and-args
                               stated shared object doesn't have the stated
                               text symbol.  Patterns can contain ? and *.
     --soname-synonyms=syn1=pattern1,syn2=pattern2,... synonym soname
-                              patterns for some Valgrind wrapping
-                              or replacement (such as malloc replacement)
+              specify patterns for function wrapping or replacement.
+              To use a non-libc malloc library that is
+                  in the main exe:  --soname-synonyms=somalloc=NONE
+                  in libxyzzy.so:   --soname-synonyms=somalloc=libxyzzy.so
 
   user options for Nulgrind:
     (none)