toplev.c (independent_decode_option): Require `=' between `-aux-info' and filename...

* toplev.c (independent_decode_option): Require `=' between
`-aux-info' and filename in the same argument.
* gcc.c: Don't pass -aux-info=filename twice.

From-SVN: r43123

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3c0d4a524a20be5f41514da1f589bf9bd0a849b8..a0142e3179d64e7955ce6b0eeda4018c90480cea 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-09  Alexandre Oliva  <aoliva@redhat.com>
+
+       * toplev.c (independent_decode_option): Require `=' between
+       `-aux-info' and filename in the same argument.
+       * gcc.c: Don't pass -aux-info=filename twice.
+
 2001-06-09  Mark Mitchell  <mark@codesourcery.com>
 
        * expr.c (expand_expr, case ARRAY_REF): Do not replace

diff --git a/gcc/gcc.c b/gcc/gcc.c
index 505f9ab5dba77b7bf2f87e3f7a03a0e311a66f1c..5f851e208638d8caa47b80ae9a390ab9a092dd1e 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -663,7 +663,7 @@ static const char *cc1_options =
  %1 %{!Q:-quiet} -dumpbase %B %{d*} %{m*} %{a*}\
  %{g*} %{O*} %{W*} %{w} %{pedantic*} %{std*} %{ansi}\
  %{traditional} %{v:-version} %{pg:-p} %{p} %{f*}\
- %{aux-info*} %{Qn:-fno-ident} %{--help:--help}\
+ %{Qn:-fno-ident} %{--help:--help}\
  %{--target-help:--target-help}\
  %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}}\
  %{fsyntax-only:-o %j} %{-param*}";

diff --git a/gcc/toplev.c b/gcc/toplev.c
index 2b75aa20a58a87d8c991b9eb75d88b94a0eccf9c..2f803aa44bb5ced4e352d55049dd12fa684079be 100644 (file)
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -3932,7 +3932,7 @@ display_help ()
                debug_args[i].arg, _(debug_args[i].description));
     }
 
-  printf (_("  -aux-info <file>        Emit declaration info into <file>.X\n"));
+  printf (_("  -aux-info <file>        Emit declaration info into <file>\n"));
   printf (_("  -quiet                  Do not display functions compiled or elapsed time\n"));
   printf (_("  -version                Display the compiler's version\n"));
   printf (_("  -d[letters]             Enable dumps from specific passes of the compiler\n"));
@@ -4567,17 +4567,22 @@ independent_decode_option (argc, argv)
        }
       else if (!strncmp (arg, "aux-info", 8))
        {
-         flag_gen_aux_info = 1;
          if (arg[8] == '\0')
            {
              if (argc == 1)
                return 0;
 
              aux_info_file_name = argv[1];
+             flag_gen_aux_info = 1;
              return 2;
            }
+         else if (arg[8] == '=')
+           {
+             aux_info_file_name = arg + 9;
+             flag_gen_aux_info = 1;
+           }
          else
-           aux_info_file_name = arg + 8;
+           return 0;
        }
       else
        return 0;