PR10228: fix non-utrace building regression - cont'd

* runtime/task_finder.c (non-UTRACE): Return 0 for
  stap_start_task_finder.
* translate.cxx (emit_module_init): Let vma tracker
  specific to utrace.

diff --git a/runtime/task_finder.c b/runtime/task_finder.c
index 5ef27eef5561b9d13fe9b77619f36f17e106be4d..d6b2b6dab14cf2c7035648a91d5a68315b69d6be 100644 (file)
--- a/runtime/task_finder.c
+++ b/runtime/task_finder.c
@@ -4,7 +4,7 @@
 #if ! defined(CONFIG_UTRACE)
 /* Dummy definitions for use in sym.c */
 struct stap_task_finder_target { };
-static int stap_start_task_finder(void) { return -EINVAL; }
+static int stap_start_task_finder(void) { return 0; }
 static void stap_stop_task_finder(void) { }
 
 #else

diff --git a/translate.cxx b/translate.cxx
index 1c6d4fdb8ceb0926b380f48f93fa21ac3966b4c7..7e0d9d969940f7ff697e77535b7d574c50a1fe37 100644 (file)
--- a/translate.cxx
+++ b/translate.cxx
@@ -1162,7 +1162,7 @@ c_unparser::emit_module_init ()
   o->newline() << "#endif";
 
   // PR10228: set up symbol table-related task finders
-  o->newline() << "#ifdef STP_NEED_VMA_TRACKER";
+  o->newline() << "#if defined(STP_NEED_VMA_TRACKER) && defined(CONFIG_UTRACE)";
   o->newline() << "_stp_sym_init();";
   o->newline() << "for (i=0; i<_stp_num_modules; i++) {";
   o->newline(1) << "if (_stp_modules[i]->vmcb) {";