Sat Sep 20 09:37:18 2008 Google Inc. <opensource@google.com>

	* google-perftools: version 0.99.1 release
	* BUG FIX: look for nm, etc in /usr/bin, not /usr/crosstool (csilvers)


git-svn-id: http://gperftools.googlecode.com/svn/trunk@56 6b5cf1ce-ec42-a296-1ba9-69fdba395a50

5 files changed, 30 insertions, 51 deletions

diff --git a/ChangeLog b/ChangeLog
index 85dfdca..cf1338c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Sep 20 09:37:18 2008  Google Inc. <opensource@google.com>
+
+	* google-perftools: version 0.99.1 release
+	* BUG FIX: look for nm, etc in /usr/bin, not /usr/crosstool (csilvers)
+
 Thu Sep 18 16:00:27 2008  Google Inc. <opensource@google.com>
 
 	* google-perftools: version 0.99 release
diff --git a/configure b/configure
index 5fb3c82..ee970ac 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for google-perftools 0.99.
+# Generated by GNU Autoconf 2.59 for google-perftools 0.99.1.
 #
 # Report bugs to <opensource@google.com>.
 #
@@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='google-perftools'
 PACKAGE_TARNAME='google-perftools'
-PACKAGE_VERSION='0.99'
-PACKAGE_STRING='google-perftools 0.99'
+PACKAGE_VERSION='0.99.1'
+PACKAGE_STRING='google-perftools 0.99.1'
 PACKAGE_BUGREPORT='opensource@google.com'
 
 ac_unique_file="README"
@@ -954,7 +954,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures google-perftools 0.99 to adapt to many kinds of systems.
+\`configure' configures google-perftools 0.99.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1021,7 +1021,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of google-perftools 0.99:";;
+     short | recursive ) echo "Configuration of google-perftools 0.99.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1162,7 +1162,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-google-perftools configure 0.99
+google-perftools configure 0.99.1
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1176,7 +1176,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by google-perftools $as_me 0.99, which was
+It was created by google-perftools $as_me 0.99.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1904,7 +1904,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='google-perftools'
- VERSION='0.99'
+ VERSION='0.99.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -24323,7 +24323,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by google-perftools $as_me 0.99, which was
+This file was extended by google-perftools $as_me 0.99.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -24386,7 +24386,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-google-perftools config.status 0.99
+google-perftools config.status 0.99.1
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 059450b..13dde67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 # make sure we're interpreted by some minimal autoconf
 AC_PREREQ(2.57)
 
-AC_INIT(google-perftools, 0.99, opensource@google.com)
+AC_INIT(google-perftools, 0.99.1, opensource@google.com)
 # The argument here is just something that should be in the current directory
 # (for sanity checking)
 AC_CONFIG_SRCDIR(README)
diff --git a/packages/deb/changelog b/packages/deb/changelog
index 8828607..ec6d054 100644
--- a/packages/deb/changelog
+++ b/packages/deb/changelog
@@ -1,3 +1,9 @@
+google-perftools (0.99.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Google Inc. <opensource@google.com>  Sat, 20 Sep 2008 09:37:18 -0700
+	
 google-perftools (0.99-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/src/pprof b/src/pprof
index 4ec230d..1a8878e 100755
--- a/src/pprof
+++ b/src/pprof
@@ -72,18 +72,11 @@ use strict;
 use warnings;
 use Getopt::Long;
 
-my $PPROF_VERSION = "0.99";
+my $PPROF_VERSION = "0.99.1";
 
 # These are the object tools we use which can come from a
 # user-specified location using --tools, from the PPROF_TOOLS
-# environment variable, or from the latest installed crosstool under
-# /usr/crosstool.  We avoid using the system versions for more
-# predictable behavior.  System versions may not support 64-bit
-# binaries and older object tools may have difficulties with binaries
-# produced with the latest crosstool versions.  For example,
-# name-mangling changed with GCC 4.3 which can cause problems with
-# demangling in the object tools.  See ConfigureObjTools near the
-# bottom of this script for how the tool paths are determined.
+# environment variable, or from the environment.
 my %obj_tool_map = (
   "objdump" => "objdump",
   "nm" => "nm",
@@ -3107,9 +3100,7 @@ sub ShortFunctionName {
 # is determined by considering the following options in this order:
 #   1) --tools option, if set
 #   2) PPROF_TOOLS environment variable, if set
-#   3) otherwise, the latest installed crosstool under /usr/crosstool
-# It is a fatal error if --tools and PPROF_TOOLS are not specified and no
-# tools exist under /usr/crosstool.
+#   3) the environment
 sub ConfigureObjTools {
   my $prog_file = shift;
 
@@ -3129,36 +3120,16 @@ sub ConfigureObjTools {
 
   # Go fill in %obj_tool_map with the pathnames to use:
   foreach my $tool (keys %obj_tool_map) {
-    $obj_tool_map{$tool} = ConfigureTool($obj_tool_map{$tool}, 
-                                         LatestCrosstoolPrefix());
+    $obj_tool_map{$tool} = ConfigureTool($obj_tool_map{$tool});
   }
 }
 
-# Return the prefix of the latest 64-bit crosstool available in
-# /usr/crosstool.  64-bit (x86_64) utilities are used because they
-# handle both 32-bit and 64-bit binaries.
-sub LatestCrosstoolPrefix {
-  my $prefix = "";
-  my $latest_version = 0;
-  for my $gcc (glob("/usr/crosstool/v*/gcc-*/x86_64*/bin/*-gcc")) {
-    if (($gcc =~ m{/usr/crosstool/v([0-9]+)}) &&
-        ($1 > $latest_version)) {
-      $latest_version = $1;
-      $prefix = $gcc;
-      $prefix =~ s/gcc$//;
-    }
-  }
-  return $prefix;
-}
-
 # Returns the path of a caller-specified object tool.  If --tools or
 # PPROF_TOOLS are specified, then returns the full path to the tool
-# with that prefix.  Otherwise, returns the path of the tool in the
-# latest installed crosstool version.  Raises a fatal error if the
-# tool cannot be found in these directories.
+# with that prefix.  Otherwise, returns the path unmodified (which
+# means we will look for it on PATH).
 sub ConfigureTool {
   my $tool = shift;
-  my $crosstool_prefix = shift;
   my $path;
 
   if ($main::opt_tools ne "") {
@@ -3175,11 +3146,8 @@ sub ConfigureTool {
       error("No '$tool' found with prefix specified by PPROF_TOOLS=$ENV{PPROF_TOOLS}\n");
     }
   } else {
-    # ... otherwise use the latest crosstool.
-    $path = $crosstool_prefix . $tool;
-    if ($crosstool_prefix eq "" || !-x $path) {
-      error("No '$tool' found in /usr/crosstool.  Specify prefix for object tool pathnames with --tools.\n");
-    }
+    # ... otherwise use $PATH
+    $path = $tool;
   }
   if ($main::opt_debug) { print STDERR "Using '$path' for '$tool'.\n"; }
   return $path;