6 files changed, 13 insertions, 12 deletions
diff --git a/gprofng/src/CallStack.cc b/gprofng/src/CallStack.cc
index 6df4112..9a3a15d 100644
--- a/gprofng/src/CallStack.cc
+++ b/gprofng/src/CallStack.cc
@@ -527,14 +527,10 @@ CallStackP::add_stack (DataDescriptor *dDscr, long idx, FramePacket *frp,
 
       Vaddr va = frp->getFromStack (index);
       DbeInstr *cur_instr = experiment->map_Vaddr_to_PC (va, tstamp);
-#if ARCH(Intel)// TBR? FIXUP_XXX_SPARC_LINUX: switch should be on experiment ARCH, not dbe ARCH
       // We need to adjust return addresses on intel
-      // in order to attribute inclusive metrics to
-      // proper call instructions.
-      if (experiment->exp_maj_version <= 9)
-	if (!leaf && cur_instr->addr != 0)
-	  cur_instr = cur_instr->func->find_dbeinstr (0, cur_instr->addr - 1);
-#endif
+      // in order to attribute inclusive metrics to proper instructions.
+      if (experiment->platform == Intel && cur_instr->addr != 0)
+	cur_instr = cur_instr->func->find_dbeinstr (0, cur_instr->addr - 1);
 
       // Skip PC's from PLT, update leaf and state accordingly
       if ((cur_instr->func->flags & FUNC_FLAG_PLT)
diff --git a/gprofng/src/gp-archive.cc b/gprofng/src/gp-archive.cc
index 4e68336..ee9f917 100644
--- a/gprofng/src/gp-archive.cc
+++ b/gprofng/src/gp-archive.cc
@@ -140,7 +140,8 @@ er_archive::usage ()
     "See also:\n"
     "\n"
     "gprofng(1), gprofng-collect-app(1), gprofng-display-html(1), "
-    "gprofng-display-src(1), gprofng-display-text(1)\n"));
+    "gprofng-display-src(1), gprofng-display-text(1)\n"
+    "\nReport bugs to <https://sourceware.org/bugzilla/>\n"));
   exit (1);
 }
 
diff --git a/gprofng/src/gp-collect-app.cc b/gprofng/src/gp-collect-app.cc
index bf146d9..b94f410 100644
--- a/gprofng/src/gp-collect-app.cc
+++ b/gprofng/src/gp-collect-app.cc
@@ -1481,7 +1481,8 @@ collect::usage ()
     "See also:\n"
     "\n"
     "gprofng(1), gprofng-archive(1), gprofng-display-html(1), "
-    "gpgprofng-display-src(1), gprofng-display-text(1)\n"));
+    "gpgprofng-display-src(1), gprofng-display-text(1)\n"
+    "\nReport bugs to <https://sourceware.org/bugzilla/>\n"));
 }
 
 void
diff --git a/gprofng/src/gp-display-src.cc b/gprofng/src/gp-display-src.cc
index 7eb6b33..5475f27 100644
--- a/gprofng/src/gp-display-src.cc
+++ b/gprofng/src/gp-display-src.cc
@@ -172,7 +172,8 @@ er_src::usage ()
     "See also:\n"
     "\n"
     "gprofng(1), gprofng-archive(1), gprofng-collect-app(1), "
-    "gprofng-display-html(1), gprofng-display-text(1)\n"));
+    "gprofng-display-html(1), gprofng-display-text(1)\n"
+    "\nReport bugs to <https://sourceware.org/bugzilla/>\n"));
 /*
   printf (GTXT ("Usage: %s [OPTION] a.out/.so/.o/.class\n\n"), whoami);
   printf (GTXT ("    -func                     List all the functions from the given object\n"
diff --git a/gprofng/src/gp-display-text.cc b/gprofng/src/gp-display-text.cc
index 4fcd639..32bda49 100644
--- a/gprofng/src/gp-display-text.cc
+++ b/gprofng/src/gp-display-text.cc
@@ -254,7 +254,8 @@ er_print::usage ()
     "See also:\n"
     "\n"
     "gprofng(1), gprofng-archive(1), gprofng-collect-app(1), "
-    "gprofng-display-html(1), gprofng-display-src(1)\n"));
+    "gprofng-display-html(1), gprofng-display-src(1)\n"
+    "\nReport bugs to <https://sourceware.org/bugzilla/>\n"));
 }
 
 int // returns count of experiments read
diff --git a/gprofng/src/gprofng.cc b/gprofng/src/gprofng.cc
index 99f904a..4364d97 100644
--- a/gprofng/src/gprofng.cc
+++ b/gprofng/src/gprofng.cc
@@ -155,7 +155,8 @@ Gprofng::usage ()
     "See also:\n"
     "\n"
     "gprofng-archive(1), gprofng-collect-app(1), gprofng-display-html(1), "
-    "gprofng-display-src(1), gprofng-display-text(1)\n"));
+    "gprofng-display-src(1), gprofng-display-text(1)\n"
+    "\nReport bugs to <https://sourceware.org/bugzilla/>\n"));
 
 /*
   printf ( GTXT (