rm debug printing

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

diff --git a/coregrind/m_stacktrace.c b/coregrind/m_stacktrace.c
index d9c76135a1d71c535a9aab78a7ffa225e19e27cd..d5a7f6668a615f30a91e8c5fb2b40ff404b4ca6b 100644 (file)
--- a/coregrind/m_stacktrace.c
+++ b/coregrind/m_stacktrace.c
@@ -145,7 +145,7 @@ UInt VG_(get_StackTrace) ( ThreadId tid, StackTrace ips, UInt n_ips )
    Addr sp                 = STACK_PTR(tst->arch);
    Addr stack_highest_word = tst->client_stack_highest_word;
 
-#ifdef __x86__
+#if defined(VGP_x86_linux)
    /* Nasty little hack to deal with sysinfo syscalls - if libc is
       using the sysinfo page for syscalls (the TLS version does), then
       ip will always appear to be in that page when doing a syscall,

diff --git a/coregrind/vg_symtab2.c b/coregrind/vg_symtab2.c
index 057ebd6a12c9704d2217f061e299ce32c17a7493..3efafe6ed5fa15582b4b26af793f3481759a28ad 100644 (file)
--- a/coregrind/vg_symtab2.c
+++ b/coregrind/vg_symtab2.c
@@ -844,8 +844,11 @@ void canonicaliseCfiSI ( SegInfo* si )
       if (here_max > si->cfisi_maxaddr)
          si->cfisi_maxaddr = here_max;
    }
-   VG_(printf)("%d entries, %p .. %p\n", si->cfisi_used,
-              si->cfisi_minaddr, si->cfisi_maxaddr);
+
+   if (VG_(clo_trace_cfi))
+      VG_(printf)("canonicaliseCfiSI: %d entries, %p .. %p\n", 
+                  si->cfisi_used,
+                 si->cfisi_minaddr, si->cfisi_maxaddr);
 
    /* Sort the cfisi array by base address. */
    VG_(ssort)(si->cfisi, si->cfisi_used, sizeof(*si->cfisi), compare_CfiSI);