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

4 files changed, 10 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index af41ee87..66dcea1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-05  Frank Ch. Eigler  <fche@elastic.org>
+
+	* tapsets.cxx, translate.cxx: Set default elfutils debuginfo_path
+	to start with "+", to enable debuginfo<->stripped checksum checking.
+	* stap.1.in: Note this.
+
 2008-12-05  Kent Sebastian  <ksebasti@redhat.com>
 
 	PR7051
diff --git a/stap.1.in b/stap.1.in
index 2e954ec7..b7e9a818 100644
--- a/stap.1.in
+++ b/stap.1.in
@@ -1118,7 +1118,7 @@ The location of kernel debugging information when packaged into the
 RPM, unless overridden by the
 .I SYSTEMTAP_DEBUGINFO_PATH
 environment variable.  The default value for this variable is
-.IR \-:.debug:/usr/lib/debug .
+.IR \+:.debug:/usr/lib/debug .
 Elfutils searches vmlinux in this path and it interprets the path as a base
 directory of which various subdirectories will be searched for finding modules.
 .TP
diff --git a/tapsets.cxx b/tapsets.cxx
index 178d2465..d49ea39d 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -895,7 +895,7 @@ struct dwflpp
     if (! sess.module_cache)
       sess.module_cache = new module_cache ();
 
-    static const char *debuginfo_path_arr = "-:.debug:/usr/lib/debug:build";
+    static const char *debuginfo_path_arr = "+:.debug:/usr/lib/debug:build";
     static const char *debuginfo_env_arr = getenv("SYSTEMTAP_DEBUGINFO_PATH");
     static const char *debuginfo_path = (debuginfo_env_arr ?: debuginfo_path_arr );
 
@@ -957,7 +957,7 @@ struct dwflpp
 
   void setup_user(string module_name, bool debuginfo_needed = true)
   {
-    static const char *debuginfo_path_arr = "-:.debug:/usr/lib/debug:build";
+    static const char *debuginfo_path_arr = "+:.debug:/usr/lib/debug:build";
     static const char *debuginfo_env_arr = getenv("SYSTEMTAP_DEBUGINFO_PATH");
     // NB: kernel_build_tree doesn't enter into this, as it's for
     // kernel-side modules only.
diff --git a/translate.cxx b/translate.cxx
index 976bae10..3f847b48 100644
--- a/translate.cxx
+++ b/translate.cxx
@@ -4706,7 +4706,7 @@ emit_symbol_data (systemtap_session& s)
   unwindsym_dump_context ctx = { s, kallsyms_out, 0, s.unwindsym_modules };
 
   // XXX: copied from tapsets.cxx dwflpp::, sadly
-  static const char *debuginfo_path_arr = "-:.debug:/usr/lib/debug:build";
+  static const char *debuginfo_path_arr = "+:.debug:/usr/lib/debug:build";
   static const char *debuginfo_env_arr = getenv("SYSTEMTAP_DEBUGINFO_PATH");
   static const char *debuginfo_path = (debuginfo_env_arr ?: debuginfo_path_arr);