Merge branch 'master' into pr6866

1 files changed, 21 insertions, 14 deletions

diff --git a/buildrun.cxx b/buildrun.cxx
index 0e9e0e17..6a266bd2 100644
--- a/buildrun.cxx
+++ b/buildrun.cxx
@@ -329,7 +329,10 @@ run_pass (systemtap_session& s)
     staprun_cmd += "-u ";
 
   if (s.load_only)
-    staprun_cmd += "-L ";
+    staprun_cmd += (s.output_file.empty() ? "-L " : "-D ");
+
+  if (!s.size_option.empty())
+    staprun_cmd += "-S " + s.size_option + " ";
 
   staprun_cmd += s.tmpdir + "/" + s.module_name + ".ko";
 
@@ -381,21 +384,25 @@ make_tracequery(systemtap_session& s, string& name)
 
   // dynamically pull in all tracepoint headers from include/trace/
   glob_t trace_glob;
-  string glob_str(s.kernel_build_tree + "/include/trace/*.h");
-  glob(glob_str.c_str(), 0, NULL, &trace_glob);
-  for (unsigned i = 0; i < trace_glob.gl_pathc; ++i)
+  string globs[2] = { "/include/trace/*.h", "/source/include/trace/*.h" };
+  for (unsigned z=0; z<2; z++)
     {
-      string header(basename(trace_glob.gl_pathv[i]));
-
-      // filter out a few known "internal-only" headers
-      if (header == "trace_events.h")
-        continue;
-      if (header.find("_event_types.h") != string::npos)
-        continue;
-
-      osrc << "#include <trace/" << header << ">" << endl;
+      string glob_str(s.kernel_build_tree + globs[z]);
+      glob(glob_str.c_str(), 0, NULL, &trace_glob);
+      for (unsigned i = 0; i < trace_glob.gl_pathc; ++i)
+        {
+          string header(basename(trace_glob.gl_pathv[i]));
+
+          // filter out a few known "internal-only" headers
+          if (header == "trace_events.h")
+            continue;
+          if (header.find("_event_types.h") != string::npos)
+            continue;
+
+          osrc << "#include <trace/" << header << ">" << endl;
+        }
+      globfree(&trace_glob);
     }
-  globfree(&trace_glob);
 
   // finish up the module source
   osrc << "#endif /* CONFIG_TRACEPOINTS */" << endl;