Make VG_(clo_vex_control) tool-visible so tools can control how
aggressive Vex is, if they need to do that.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4276 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/pub_core_options.h b/coregrind/pub_core_options.h
index 58d60d5..aeb80ad 100644
--- a/coregrind/pub_core_options.h
+++ b/coregrind/pub_core_options.h
@@ -42,8 +42,6 @@
/* The max number of suppression files. */
#define VG_CLO_MAX_SFILES 10
-/* Vex iropt control */
-extern VexControl VG_(clo_vex_control);
/* Should we stop collecting errors if too many appear? default: YES */
extern Bool VG_(clo_error_limit);
/* Enquire about whether to attach to a debugger at errors? default: NO */
diff --git a/include/pub_tool_options.h b/include/pub_tool_options.h
index 8266a3a..edd94e0 100644
--- a/include/pub_tool_options.h
+++ b/include/pub_tool_options.h
@@ -31,6 +31,9 @@
#ifndef __PUB_TOOL_OPTIONS_H
#define __PUB_TOOL_OPTIONS_H
+#include "libvex.h" // for VexControl
+
+
/* Use these for recognising tool command line options -- stops comparing
once whitespace is reached. */
#define VG_CLO_STREQ(s1,s2) (0==VG_(strcmp_ws)((s1),(s2)))
@@ -80,6 +83,10 @@
from VG_(tdict).tool_process_cmd_line_option) to indicate that. */
extern void VG_(bad_option) ( Char* opt );
+/* Vex iropt control. Tool-visible so tools can make Vex optimise
+ less aggressively if that is needed (callgrind needs this). */
+extern VexControl VG_(clo_vex_control);
+
#endif // __PUB_TOOL_OPTIONS_H
/*--------------------------------------------------------------------*/