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

diff --git a/coregrind/pub_core_options.h b/coregrind/pub_core_options.h
index 58d60d509cc96f2012d54ebab529c972147ae75e..aeb80add5cc1ac3c9568c760c12e85bdac040674 100644 (file)
--- 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 8266a3a57c4b05607d5cd9862c839ab122d5b00c..edd94e037e9f78afef8c1f9a04b222e2ff857e6a 100644 (file)
--- 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 @@ extern HChar* VG_(clo_xml_user_comment);
    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
 
 /*--------------------------------------------------------------------*/