Author: sewardj
Date: Sat Sep 6 14:45:12 2014
New Revision: 14479
Log:
Rename "--kernel-variant=android-emulator-no-hw-tls" to
"=android-no-hw-tls" per suggestion from Philippe.
Modified:
trunk/coregrind/m_main.c
trunk/coregrind/m_syswrap/syswrap-arm-linux.c
trunk/coregrind/pub_core_options.h
trunk/docs/xml/manual-core.xml
trunk/none/tests/cmdline1.stdout.exp
trunk/none/tests/cmdline2.stdout.exp
Modified: trunk/coregrind/m_main.c
==============================================================================
--- trunk/coregrind/m_main.c (original)
+++ trunk/coregrind/m_main.c Sat Sep 6 14:45:12 2014
@@ -184,7 +184,7 @@
" --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 @@
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)) {}
Modified: trunk/coregrind/m_syswrap/syswrap-arm-linux.c
==============================================================================
--- trunk/coregrind/m_syswrap/syswrap-arm-linux.c (original)
+++ trunk/coregrind/m_syswrap/syswrap-arm-linux.c Sat Sep 6 14:45:12 2014
@@ -279,7 +279,7 @@
{
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.
Modified: trunk/coregrind/pub_core_options.h
==============================================================================
--- trunk/coregrind/pub_core_options.h (original)
+++ trunk/coregrind/pub_core_options.h Sat Sep 6 14:45:12 2014
@@ -341,7 +341,7 @@
typedef
enum {
KernelVariant_bproc,
- KernelVariant_android_emulator_no_hw_tls,
+ KernelVariant_android_no_hw_tls,
KernelVariant_android_gpu_sgx5xx,
KernelVariant_android_gpu_adreno3xx
}
Modified: trunk/docs/xml/manual-core.xml
==============================================================================
--- trunk/docs/xml/manual-core.xml (original)
+++ trunk/docs/xml/manual-core.xml Sat Sep 6 14:45:12 2014
@@ -2095,7 +2095,7 @@
</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
Modified: trunk/none/tests/cmdline1.stdout.exp
==============================================================================
--- trunk/none/tests/cmdline1.stdout.exp (original)
+++ trunk/none/tests/cmdline1.stdout.exp Sat Sep 6 14:45:12 2014
@@ -97,7 +97,7 @@
--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]
Modified: trunk/none/tests/cmdline2.stdout.exp
==============================================================================
--- trunk/none/tests/cmdline2.stdout.exp (original)
+++ trunk/none/tests/cmdline2.stdout.exp Sat Sep 6 14:45:12 2014
@@ -97,7 +97,7 @@
--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]
|