* toplev.c (flag_no_inline, flag_really_no_inline): Default to 2.

        (parse_options_and_default_flags): Set them appropriately.
        * c-common.c (c_common_post_options): Don't set flag_really_no_inline.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 98e4138..6c451f9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-06  Jason Merrill  <jason@redhat.com>
+
+       * toplev.c (flag_no_inline, flag_really_no_inline): Default to 2.
+       (parse_options_and_default_flags): Set them appropriately.
+       * c-common.c (c_common_post_options): Don't set flag_really_no_inline.
+
 2002-04-06  Hans-Peter Nilsson  <hp@bitrange.com>
 
        * config/mmix/t-mmix (TARGET_LIBGCC2_CFLAGS): Don't -Dinhibit_libc

diff --git a/gcc/c-common.c b/gcc/c-common.c
index 1c9f4a0..e5661c3 100644 (file)
--- a/gcc/c-common.c
+++ b/gcc/c-common.c
@@ -4112,9 +4112,6 @@ c_common_post_options ()
 {
   cpp_post_options (parse_in);
 
-  /* Save no-inline information we may clobber below.  */
-  flag_really_no_inline = flag_no_inline;
-
   flag_inline_trees = 1;
 
   /* Use tree inlining if possible.  Function instrumentation is only

diff --git a/gcc/toplev.c b/gcc/toplev.c
index b62aae3..94b2a35 100644 (file)
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -636,12 +636,12 @@ int flag_keep_inline_functions;
 
 /* Nonzero means that functions will not be inlined.  */
 
-int flag_no_inline;
+int flag_no_inline = 2;
 
 /* Nonzero means that we don't want inlining by virtue of -fno-inline,
    not just because the tree inliner turned us off.  */
 
-int flag_really_no_inline;
+int flag_really_no_inline = 2;
 
 /* Nonzero means that we should emit static const variables
    regardless of whether or not optimization is turned on.  */
@@ -4716,6 +4716,11 @@ parse_options_and_default_flags (argc, argv)
        }
     }
 
+  if (flag_no_inline == 2)
+    flag_no_inline = 0;
+  else
+    flag_really_no_inline = flag_no_inline;
+
   /* Set flag_no_inline before the post_options () hook.  The C front
      ends use it to determine tree inlining defaults.  FIXME: such
      code should be lang-independent when all front ends use tree
@@ -4735,6 +4740,9 @@ parse_options_and_default_flags (argc, argv)
        warning ("-Wuninitialized is not supported without -O");
     }
 
+  if (flag_really_no_inline == 2)
+    flag_really_no_inline = flag_no_inline;
+
   /* All command line options have been parsed; allow the front end to
      perform consistency checks, etc.  */
   (*lang_hooks.post_options) ();