338499 --sim-hints parsing broken due to wrong order in tokens (after introduction...

Fix the token order in m_main.c

Somewhat retested by running the regression tests
(testing no-nptl-pthread-stackcache) and testing in an outer/inner setup
(testing enable-outer,no-inner-prefix).
It seems there is no regtest for the 2 other flags (lax-ioctls,fuse-compatible)

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

diff --git a/NEWS b/NEWS
index 09103fe8921cf7243bf896ad296ad1c04b795ac8..2078d006fd5540ce3c8fd50ad7c2144e9dd47414 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -215,6 +215,7 @@ where XXXXXX is the bug number as listed below.
 338160  implement display of thread local storage in gdbsrv
 338205  configure.ac and check for -Wno-tautological-compare
 338445  amd64 vbit-test fails with unknown opcodes used by arm64 VEX
+338499  --sim-hints parsing broken due to wrong order in tokens
 n-i-bz  Fix KVM_CREATE_IRQCHIP ioctl handling
 n-i-bz  s390x: Fix memory corruption for multithreaded applications
 n-i-bz  vex arm->IR: allow PC as basereg in some LDRD cases

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index d0093f1c31dc794b13f099a81f560a83b8e2f769..796c9ebf60b13d572fdf931e6d8722c471f31fa8 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -379,8 +379,8 @@ static void early_process_cmd_line_options ( /*OUT*/Int* need_help,
       // running in an outer, to have "no-inner-prefix" enabled
       // as early as possible.
       else if VG_USETX_CLO (str, "--sim-hints",
-                            "no-inner-prefix,fuse-compatible,"
-                            "lax-ioctls,enable-outer,"
+                            "lax-ioctls,fuse-compatible,"
+                            "enable-outer,no-inner-prefix,"
                             "no-nptl-pthread-stackcache",
                             VG_(clo_sim_hints)) {}
    }