Make the wait-for-gdb delay loop somewhat more modern-compiler-proof.

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

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index a3d21be9a883d3af1f9eda7204a96e4a14afff1d..d724d53e1f4cecb7b3d87884059443e220aae5c5 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -1841,8 +1841,7 @@ Int valgrind_main ( Int argc, HChar **argv, HChar **envp )
    /* Hook to delay things long enough so we can get the pid and
       attach GDB in another shell. */
    if (VG_(clo_wait_for_gdb)) {
-      Long iters;
-      volatile Long q;
+      ULong iters, q;
       VG_(debugLog)(1, "main", "Wait for GDB\n");
       VG_(printf)("pid=%d, entering delay loop\n", VG_(getpid)());
 
@@ -1862,9 +1861,9 @@ Int valgrind_main ( Int argc, HChar **argv, HChar **envp )
 #       error "Unknown plat"
 #     endif
 
-      iters *= 1000*1000*1000;
+      iters *= 1000ULL * 1000 * 1000;
       for (q = 0; q < iters; q++) 
-         ;
+         __asm__ __volatile__("" ::: "memory","cc");
    }
 
    //--------------------------------------------------------------