PR debug/4252

	* c-opts.c (c_common_handle_option): Pass -fdump argument suffix
	to dump_switch_p().
	* tree-dump.c (dump_switch_p): Remove redundant 'dump-' prefix
	from static strings in dump_files.
cp:
	* optimize.c (dump_function): Form complete flag name by
	prefixing 'fdump-' to string returned by dump_flag_name().
java:
	* lang.c (java_handle_option): Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@68137 138bc75d-0d04-0410-961f-82ee72b054a4

7 files changed, 26 insertions, 9 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 98ee56c1f27..c92cd9dfae3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-17  Robert Abeles  <rabeles@archaelogic.com>
+
+	PR debug/4252
+	* c-opts.c (c_common_handle_option): Pass -fdump argument suffix
+	to dump_switch_p().
+	* tree-dump.c (dump_switch_p): Remove redundant 'dump-' prefix
+	from static strings in dump_files.
+
 2003-06-17  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* system.h (ANSI_PROTOTYPES, PTR_CONST, LONG_DOUBLE, VPARAMS,
diff --git a/gcc/c-opts.c b/gcc/c-opts.c
index 9f0cde5e4d6..4d6ccd2932a 100644
--- a/gcc/c-opts.c
+++ b/gcc/c-opts.c
@@ -740,7 +740,7 @@ c_common_handle_option (size_t scode, const char *arg, int value)
       break;
 
     case OPT_fdump_:
-      if (!dump_switch_p (option->opt_text + strlen ("f")))
+      if (!dump_switch_p (arg))
 	result = 0;
       break;
 
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 60c4cd7c9d4..96b21ffd3ed 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-17  Robert Abeles  <rabeles@archaelogic.com>
+
+	* optimize.c (dump_function): Form complete flag name by
+	prefixing 'fdump-' to string returned by dump_flag_name().
+
 2003-06-17  Mark Mitchell  <mark@codesourcery.com>
 
 	* mangle.c (mangle_conv_op_name_for_type): Correct sprintf format
diff --git a/gcc/cp/optimize.c b/gcc/cp/optimize.c
index 2c1c15d003e..b5d0f8f28de 100644
--- a/gcc/cp/optimize.c
+++ b/gcc/cp/optimize.c
@@ -288,7 +288,7 @@ dump_function (enum tree_dump_index phase, tree fn)
 	       decl_as_string (fn, TFF_DECL_SPECIFIERS));
       fprintf (stream, " (%s)\n",
 	       decl_as_string (DECL_ASSEMBLER_NAME (fn), 0));
-      fprintf (stream, ";; enabled by -%s\n", dump_flag_name (phase));
+      fprintf (stream, ";; enabled by -fdump-%s\n", dump_flag_name (phase));
       fprintf (stream, "\n");
       
       dump_node (fn, TDF_SLIM | flags, stream);
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 634aca69617..b370870e7c9 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-17  Robert Abeles  <rabeles@archaelogic.com>
+
+	* lang.c (java_handle_option): Likewise.
+
 2003-06-16  Neil Booth  <neil@daikokuya.co.uk>
 
 	* lang.c (java_handle_option): Special-casing of optional
diff --git a/gcc/java/lang.c b/gcc/java/lang.c
index 07d5647ed32..e389ddc6650 100644
--- a/gcc/java/lang.c
+++ b/gcc/java/lang.c
@@ -376,7 +376,7 @@ java_handle_option (size_t scode, const char *arg, int value)
       break;
 
     case OPT_fdump_:
-      if (!dump_switch_p (option->opt_text + strlen ("f")))
+      if (!dump_switch_p (arg))
 	return 0;
       break;
 
diff --git a/gcc/tree-dump.c b/gcc/tree-dump.c
index b9854469ded..c6e92e65c1f 100644
--- a/gcc/tree-dump.c
+++ b/gcc/tree-dump.c
@@ -646,11 +646,11 @@ struct dump_file_info
    TREE_DUMP_INDEX enumeration in tree.h */
 static struct dump_file_info dump_files[TDI_end] =
 {
-  {".tu", "dump-translation-unit", 0, 0},
-  {".class", "dump-class-hierarchy", 0, 0},
-  {".original", "dump-tree-original", 0, 0},
-  {".optimized", "dump-tree-optimized", 0, 0},
-  {".inlined", "dump-tree-inlined", 0, 0},
+  {".tu", "translation-unit", 0, 0},
+  {".class", "class-hierarchy", 0, 0},
+  {".original", "tree-original", 0, 0},
+  {".optimized", "tree-optimized", 0, 0},
+  {".inlined", "tree-inlined", 0, 0},
 };
 
 /* Define a name->number mapping for a dump flag value.  */
@@ -758,7 +758,7 @@ dump_switch_p (const char *arg)
 		  flags |= option_ptr->value;
 		  goto found;
 		}
-	    warning ("ignoring unknown option `%.*s' in `-f%s'",
+	    warning ("ignoring unknown option `%.*s' in `-fdump-%s'",
 		     length, ptr, dump_files[ix].swtch);
 	  found:;
 	    ptr = end_ptr;