X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gprof%2Fgprof.c;h=b2d6bafdef1671d969d2601ca230b82a20a113e6;hb=afb175693a07fa4adcc0656b1598dd51d48123b2;hp=dbb8cca20ffd1a7ca0a0693b71eee5e50744ae81;hpb=2ef8a0a8c2d6b1c34557b0f96e2c81b32f5d1a25;p=deliverable%2Fbinutils-gdb.git

diff --git a/gprof/gprof.c b/gprof/gprof.c
index dbb8cca20f..b2d6bafdef 100644
--- a/gprof/gprof.c
+++ b/gprof/gprof.c
@@ -77,8 +77,6 @@ char copyright[] =
 
 static char *gmon_name = GMONNAME;	/* profile filename */
 
-bfd *abfd;
-
 /*
  * Functions that get excluded by default:
  */
@@ -169,7 +167,7 @@ Usage: %s [-[abcDhilLsTvwxyz]] [-[ACeEfFJnNOpPqQZ][name]] [-I dirs]\n\
 	[--no-static] [--print-path] [--separate-files]\n\
 	[--static-call-graph] [--sum] [--table-length=len] [--traditional]\n\
 	[--version] [--width=n] [--ignore-non-functions]\n\
-	[--demangle[=STYLE]] [--no-demangle]\n\
+	[--demangle[=STYLE]] [--no-demangle] [@FILE]\n\
 	[image-file] [profile-file...]\n"),
 	   whoami);
   if (status == 0)
@@ -191,12 +189,16 @@ main (int argc, char **argv)
 #if defined (HAVE_SETLOCALE)
   setlocale (LC_CTYPE, "");
 #endif
+#ifdef ENABLE_NLS
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   whoami = argv[0];
   xmalloc_set_program_name (whoami);
 
+  expandargv (&argc, &argv);
+
   while ((ch = getopt_long (argc, argv,
 	"aA::bBcCd::De:E:f:F:hiI:J::k:lLm:n::N::O:p::P::q::Q::st:Tvw:xyzZ::",
 			    long_options, 0))
@@ -543,7 +545,12 @@ This program is free software.  This program has absolutely no warranty.\n"));
   if (output_style == 0)
     {
       if (gmon_input & (INPUT_HISTOGRAM | INPUT_CALL_GRAPH))
-	output_style = STYLE_FLAT_PROFILE | STYLE_CALL_GRAPH;
+	{
+	  if (gmon_input & INPUT_HISTOGRAM)
+	    output_style |= STYLE_FLAT_PROFILE;
+	  if (gmon_input & INPUT_CALL_GRAPH)
+	    output_style |= STYLE_CALL_GRAPH;
+	}
       else
 	output_style = STYLE_EXEC_COUNTS;