Merge branch 'master' of git://sources.redhat.com/git/systemtap

Conflicts:

	main.cxx

1 files changed, 3 insertions, 0 deletions

diff --git a/session.h b/session.h
index 84cc6b01..611d97a2 100644
--- a/session.h
+++ b/session.h
@@ -136,6 +136,9 @@ struct systemtap_session
   // Skip bad $ vars
   bool skip_badvars;
 
+  // Optimization flag passed to gcc -O[0123s]
+  std::string gcc_flags;
+
   // NB: It is very important for all of the above (and below) fields
   // to be cleared in the systemtap_session ctor (elaborate.cxx)
   // and/or main.cxx(main).