Move env variables out of core_asm.h into core.h, where they should be.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2662 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/core.h b/coregrind/core.h
index 0eaabf4..656e81e 100644
--- a/coregrind/core.h
+++ b/coregrind/core.h
@@ -181,6 +181,31 @@
#define PGROUNDDN(p) ROUNDDN(p, VKI_BYTES_PER_PAGE)
#define PGROUNDUP(p) ROUNDUP(p, VKI_BYTES_PER_PAGE)
+/* ---------------------------------------------------------------------
+ Environment variables
+ ------------------------------------------------------------------ */
+
+/* The directory we look for all our auxillary files in */
+#define VALGRINDLIB "VALGRINDLIB"
+
+/* Additional command-line arguments; they are overridden by actual
+ command-line option. Each argument is separated by spaces. There
+ is no quoting mechanism.
+ */
+#define VALGRINDOPTS "VALGRIND_OPTS"
+
+/* If this variable is present in the environment, then valgrind will
+ not parse the command line for options at all; all options come
+ from this variable. Arguments are terminated by ^A (\001). There
+ is no quoting mechanism.
+
+ This variable is not expected to be set by anything other than
+ Valgrind itself, as part of its handling of execve with
+ --trace-children=yes. This variable should not be present in the
+ client environment.
+ */
+#define VALGRINDCLO "_VALGRIND_CLO"
+
/* ---------------------------------------------------------------------
Command-line-settable options