Rename "--kernel-variant=android-emulator-no-hw-tls" to

"=android-no-hw-tls" per suggestion from Philippe.

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

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 65928bf8cc9c5566b708105087a4a0f4dfcc440c..5d9baaacef140a6e5fe4938c7e80379a6c0c40f5 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -184,7 +184,7 @@ static void usage_NORETURN ( Bool debug_help )
 "    --kernel-variant=variant1,variant2,...\n"
 "         handle non-standard kernel variants [none]\n"
 "         where variant is one of:\n"
-"           bproc android-emulator-no-hw-tls\n"
+"           bproc android-no-hw-tls\n"
 "           android-gpu-sgx5xx android-gpu-adreno3xx none\n"
 "    --merge-recursive-frames=<number>  merge frames between identical\n"
 "           program counters in max <number> frames) [0]\n"
@@ -633,7 +633,7 @@ void main_process_cmd_line_options ( /*OUT*/Bool* logging_to_fd,
 
       else if VG_USETX_CLO (arg, "--kernel-variant",
                             "bproc,"
-                            "android-emulator-no-hw-tls,"
+                            "android-no-hw-tls,"
                             "android-gpu-sgx5xx,"
                             "android-gpu-adreno3xx",
                             VG_(clo_kernel_variant)) {}

diff --git a/coregrind/m_syswrap/syswrap-arm-linux.c b/coregrind/m_syswrap/syswrap-arm-linux.c
index 19466bc7715a63b45608bf5705fa3aa6a8afc58d..db17e1d945d641d1748f9c02a902f3aea585448a 100644 (file)
--- a/coregrind/m_syswrap/syswrap-arm-linux.c
+++ b/coregrind/m_syswrap/syswrap-arm-linux.c
@@ -279,7 +279,7 @@ static SysRes sys_set_tls ( ThreadId tid, Addr tlsptr )
 {
    assign_guest_tls(tid, tlsptr);
 
-   if (KernelVariantiS(KernelVariant_android_emulator_no_hw_tls,
+   if (KernelVariantiS(KernelVariant_android_no_hw_tls,
                        VG_(clo_kernel_variant))) {
       /* Android emulator does not provide an hw tls register.
          So, the tls register is emulated by the kernel.

diff --git a/coregrind/pub_core_options.h b/coregrind/pub_core_options.h
index 876d112f31c42ba6ea3453c390f8b60a72758f88..e44a30fa734c6fb179fd604c14eabfd02472977b 100644 (file)
--- a/coregrind/pub_core_options.h
+++ b/coregrind/pub_core_options.h
@@ -341,7 +341,7 @@ extern VgSmc VG_(clo_smc_check);
 typedef
    enum {
       KernelVariant_bproc,
-      KernelVariant_android_emulator_no_hw_tls,
+      KernelVariant_android_no_hw_tls,
       KernelVariant_android_gpu_sgx5xx,
       KernelVariant_android_gpu_adreno3xx
    }

diff --git a/docs/xml/manual-core.xml b/docs/xml/manual-core.xml
index 454bed4f67352543c5a80b6832f82701bf1d9db4..77a8d3bcbe32375224aef2209326dd86b9b999b9 100644 (file)
--- a/docs/xml/manual-core.xml
+++ b/docs/xml/manual-core.xml
@@ -2095,7 +2095,7 @@ need to use them.</para>
           </para>
         </listitem>
         <listitem>
-          <para><option>android-emulator-no-hw-tls</option>: some
+          <para><option>android-no-hw-tls</option>: some
           versions of the Android emulator for ARM do not provide a
           hardware TLS (thread-local state) register, and Valgrind
           crashes at startup.  Use this variant to select software

diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp
index c232ccaa5e9ed4d579fba223678643236d0eb9e2..88cbb928601603b9662c002b53134805350ccc7f 100644 (file)
--- a/none/tests/cmdline1.stdout.exp
+++ b/none/tests/cmdline1.stdout.exp
@@ -97,7 +97,7 @@ usage: valgrind [options] prog-and-args
     --kernel-variant=variant1,variant2,...
          handle non-standard kernel variants [none]
          where variant is one of:
-           bproc android-emulator-no-hw-tls
+           bproc android-no-hw-tls
            android-gpu-sgx5xx android-gpu-adreno3xx none
     --merge-recursive-frames=<number>  merge frames between identical
            program counters in max <number> frames) [0]

diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index 59414d79c27d17047b679d1249c3ebee1ce84f2f..6a7d7ba5de4ae2b45e2640833531da1d56a9c47e 100644 (file)
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -97,7 +97,7 @@ usage: valgrind [options] prog-and-args
     --kernel-variant=variant1,variant2,...
          handle non-standard kernel variants [none]
          where variant is one of:
-           bproc android-emulator-no-hw-tls
+           bproc android-no-hw-tls
            android-gpu-sgx5xx android-gpu-adreno3xx none
     --merge-recursive-frames=<number>  merge frames between identical
            program counters in max <number> frames) [0]