Get rid of --support-elan3=. This flag wasn't doing anything since

the Elan3 user-space driver now works on unmodified Valgrind.

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

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index f3dc4da559e61592adf63f7c06af95a22390d05b..6c81e835660d52386b3baf964bac865493bbcc75 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -1268,7 +1268,6 @@ static void usage ( Bool debug_help )
 "    --run-libc-freeres=no|yes free up glibc memory at exit? [yes]\n"
 "    --weird-hacks=hack1,hack2,...  recognised hacks: lax-ioctls,ioctl-mmap [none]\n"
 "    --pointercheck=no|yes     enforce client address space limits [yes]\n"
-"    --support-elan3=no|yes    hacks for Quadrics Elan3 support [no]\n"
 "    --show-emwarns=no|yes     show warnings about emulation limits? [no]\n"
 "    --smc-check=none|stack|all  checks for self-modifying code: none,\n"
 "                              only for code found in stacks, or all [stack]\n"
@@ -1481,7 +1480,6 @@ static void process_cmd_line_options( UInt* client_auxv, const char* toolname )
       else VG_BOOL_CLO(arg, "--demangle",         VG_(clo_demangle))
       else VG_BOOL_CLO(arg, "--error-limit",      VG_(clo_error_limit))
       else VG_BOOL_CLO(arg, "--pointercheck",     VG_(clo_pointercheck))
-      else VG_BOOL_CLO(arg, "--support-elan3",    VG_(clo_support_elan3))
       else VG_BOOL_CLO(arg, "--show-emwarns",     VG_(clo_show_emwarns))
       else VG_NUM_CLO (arg, "--max-stackframe",   VG_(clo_max_stackframe))
       else VG_BOOL_CLO(arg, "--profile",          VG_(clo_profile))

diff --git a/coregrind/m_options.c b/coregrind/m_options.c
index 0621d5053fc55586a738d1194805b3fc2d74351f..c0980fc8865dc9a68938accaa2ea386fe1b7198a 100644 (file)
--- a/coregrind/m_options.c
+++ b/coregrind/m_options.c
@@ -72,7 +72,6 @@ Bool   VG_(clo_run_libc_freeres) = True;
 Bool   VG_(clo_track_fds)      = False;
 Bool   VG_(clo_show_below_main)= False;
 Bool   VG_(clo_pointercheck)   = True;
-Bool   VG_(clo_support_elan3)  = False;
 Bool   VG_(clo_branchpred)     = False;
 Bool   VG_(clo_model_pthreads) = False;
 Bool   VG_(clo_show_emwarns)   = False;

diff --git a/coregrind/m_syswrap/syswrap-x86-linux.c b/coregrind/m_syswrap/syswrap-x86-linux.c
index 8e7d2d4238505be53bb3b437d15fa2bd5f2f98e7..d83d2c6e2b168ee4c5855c5a3cbf23b08b5ba4e0 100644 (file)
--- a/coregrind/m_syswrap/syswrap-x86-linux.c
+++ b/coregrind/m_syswrap/syswrap-x86-linux.c
@@ -419,11 +419,11 @@ static SysRes do_clone ( ThreadId ptid,
       If the clone call specifies a NULL esp for the new thread, then
       it actually gets a copy of the parent's esp.
    */
-   /* HACK: The clone call done by the Quadrics Elan3 driver specifies
+   /* Note: the clone call done by the Quadrics Elan3 driver specifies
       clone flags of 0xF00, and it seems to rely on the assumption
-      that the child inherits a copy of the parent's GDT. Hence that
-      is passed as an arg to setup_child. */
-   setup_child( &ctst->arch, &ptst->arch, True /*VG_(clo_support_elan3)*/ );
+      that the child inherits a copy of the parent's GDT.  
+      setup_child takes care of setting that up. */
+   setup_child( &ctst->arch, &ptst->arch, True );
 
    /* Make sys_clone appear to have returned Success(0) in the
       child. */
@@ -1124,12 +1124,6 @@ PRE(sys_clone)
       VG_(message)(Vg_UserMsg, "");
       VG_(message)(Vg_UserMsg, "Unsupported clone() flags: 0x%x", ARG1);
       VG_(message)(Vg_UserMsg, "");
-      VG_(message)(Vg_UserMsg, "NOTE: if this happened when attempting "
-                               "to run code using");
-      VG_(message)(Vg_UserMsg, "      Quadrics Elan3 user-space drivers,"
-                               " you should re-run ");
-      VG_(message)(Vg_UserMsg, "      with --support-elan3=yes.");
-      VG_(message)(Vg_UserMsg, "");
       VG_(message)(Vg_UserMsg, "The only supported clone() uses are:");
       VG_(message)(Vg_UserMsg, " - via a threads library (LinuxThreads or NPTL)");
       VG_(message)(Vg_UserMsg, " - via the implementation of fork or vfork");

diff --git a/coregrind/pub_core_options.h b/coregrind/pub_core_options.h
index 108e01c68dad32d4cbd47107cff68eabf9b8d618..4bbf84467ac4538bc4f6862822f66cd8c3c20a8c 100644 (file)
--- a/coregrind/pub_core_options.h
+++ b/coregrind/pub_core_options.h
@@ -145,9 +145,6 @@ extern Bool VG_(clo_pointercheck);
 /* Model the pthread library */
 extern Bool VG_(clo_model_pthreads);
 
-/* HACK: Use hacked version of clone for Quadrics Elan3 drivers */
-extern Bool VG_(clo_support_elan3);
-
 /* Should we show VEX emulation warnings?  Default: NO */
 extern Bool VG_(clo_show_emwarns);
 

diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp
index a6f8b8d1c97a8f749f940d25ada37b0198c73b10..d4b1d8a14d106b55c2411461b194948afeae7ff7 100644 (file)
--- a/none/tests/cmdline1.stdout.exp
+++ b/none/tests/cmdline1.stdout.exp
@@ -15,7 +15,6 @@ usage: valgrind --tool=<toolname> [options] prog-and-args
     --run-libc-freeres=no|yes free up glibc memory at exit? [yes]
     --weird-hacks=hack1,hack2,...  recognised hacks: lax-ioctls,ioctl-mmap [none]
     --pointercheck=no|yes     enforce client address space limits [yes]
-    --support-elan3=no|yes    hacks for Quadrics Elan3 support [no]
     --show-emwarns=no|yes     show warnings about emulation limits? [no]
     --smc-check=none|stack|all  checks for self-modifying code: none,
                               only for code found in stacks, or all [stack]

diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index ca620faaf51f061885b5c2647d149cbdb16faded..316d9fa6d424af565c1a94488b279dd5e650c8cd 100644 (file)
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -15,7 +15,6 @@ usage: valgrind --tool=<toolname> [options] prog-and-args
     --run-libc-freeres=no|yes free up glibc memory at exit? [yes]
     --weird-hacks=hack1,hack2,...  recognised hacks: lax-ioctls,ioctl-mmap [none]
     --pointercheck=no|yes     enforce client address space limits [yes]
-    --support-elan3=no|yes    hacks for Quadrics Elan3 support [no]
     --show-emwarns=no|yes     show warnings about emulation limits? [no]
     --smc-check=none|stack|all  checks for self-modifying code: none,
                               only for code found in stacks, or all [stack]