PATCH: Hoist up flag_next_runtime

[Ziemowit Laski]

Actually, a few more tweaks were needed, so here is what I'm 
committing...

[gcc/ChangeLog]
2006-06-28  Ziemowit Laski  <zlaski@apple.com>

        * c-common.c (flag_next_runtime): Move...
        * toplev.c (flag_next_runtime): ... here.
        * c-common.h (flag_next_runtime): Move...
        * flags.h (flag_next_runtime): ... here.
        * config/darwin-c.c: Include flags.h.
        * config/t-darwin (darwin-c.o): Depend on flags.h.

Index: gcc/c-common.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/c-common.c,v
retrieving revision 1.640
diff -u -3 -p -r1.640 c-common.c
--- gcc/c-common.c      27 Jun 2005 12:17:19 -0000      1.640
+++ gcc/c-common.c      29 Jun 2005 02:58:49 -0000
@@ -334,14 +334,6 @@ int warn_main;

  int flag_gen_declaration;

-/* Generate code for GNU or NeXT runtime environment.  */
-
-#ifdef NEXT_OBJC_RUNTIME
-int flag_next_runtime = 1;
-#else
-int flag_next_runtime = 0;
-#endif
-
  /* Tells the compiler that this is a special run.  Do not perform any
     compiling, instead we are to test some platform dependent features
     and output a C header file with appropriate definitions.  */
Index: gcc/c-common.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/c-common.h,v
retrieving revision 1.297
diff -u -3 -p -r1.297 c-common.h
--- gcc/c-common.h      26 Jun 2005 21:54:14 -0000      1.297
+++ gcc/c-common.h      29 Jun 2005 02:58:49 -0000
@@ -449,10 +449,6 @@ extern int warn_main;

  extern int flag_gen_declaration;

-/* Generate code for GNU or NeXT runtime environment.  */
-
-extern int flag_next_runtime;
-
  /* Tells the compiler that this is a special run.  Do not perform any
     compiling, instead we are to test some platform dependent features
     and output a C header file with appropriate definitions.  */
Index: gcc/flags.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/flags.h,v
retrieving revision 1.154
diff -u -3 -p -r1.154 flags.h
--- gcc/flags.h 25 Jun 2005 01:59:54 -0000      1.154
+++ gcc/flags.h 29 Jun 2005 02:58:49 -0000
@@ -181,6 +181,10 @@ extern int flag_shlib;

  extern int flag_debug_asm;

+/* Generate code for GNU or NeXT Objective-C runtime environment.  */
+
+extern int flag_next_runtime;
+
  extern int flag_dump_rtl_in_asm;

  /* If one, renumber instruction UIDs to reduce the number of
Index: gcc/toplev.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/toplev.c,v
retrieving revision 1.963
diff -u -3 -p -r1.963 toplev.c
--- gcc/toplev.c        27 Jun 2005 08:05:27 -0000      1.963
+++ gcc/toplev.c        29 Jun 2005 02:58:49 -0000
@@ -289,6 +289,14 @@ const char *aux_info_file_name;

  int flag_shlib;

+/* Generate code for GNU or NeXT Objective-C runtime environment.  */
+
+#ifdef NEXT_OBJC_RUNTIME
+int flag_next_runtime = 1;
+#else
+int flag_next_runtime = 0;
+#endif
+
  /* Set to the default thread-local storage (tls) model to use.  */

  enum tls_model flag_tls_default = TLS_MODEL_GLOBAL_DYNAMIC;
Index: gcc/config/darwin-c.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/darwin-c.c,v
retrieving revision 1.21
diff -u -3 -p -r1.21 darwin-c.c
--- gcc/config/darwin-c.c       25 Jun 2005 01:20:43 -0000      1.21
+++ gcc/config/darwin-c.c       29 Jun 2005 02:58:51 -0000
@@ -29,6 +29,7 @@ Boston, MA 02110-1301, USA.  */
  #include "c-tree.h"
  #include "c-incpath.h"
  #include "toplev.h"
+#include "flags.h"
  #include "tm_p.h"
  #include "cppdefault.h"
  #include "prefix.h"
Index: gcc/config/t-darwin
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/t-darwin,v
retrieving revision 1.9
diff -u -3 -p -r1.9 t-darwin
--- gcc/config/t-darwin 2 Apr 2005 09:48:31 -0000       1.9
+++ gcc/config/t-darwin 29 Jun 2005 02:58:51 -0000
@@ -6,7 +6,7 @@ darwin.o: $(srcdir)/config/darwin.c $(CO

  darwin-c.o: $(srcdir)/config/darwin-c.c $(CONFIG_H) $(SYSTEM_H) 
coretypes.h \
    $(TM_H) $(CPPLIB_H) tree.h c-pragma.h $(C_TREE_H) toplev.h $(TM_P_H) 
\
-  c-incpath.h
+  c-incpath.h flags.h
         $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) 
$(srcdir)/config/darwin-c.c $(PREPROCESSOR_DEFINES)

  gt-darwin.h : s-gtype ; @true

On 28 Jun 2005, at 14.48, Ziemowit Laski wrote:

> Per preceding discussion with RTH.  Will commit as obvious after doing
> a sanity build.  Afterwards, will similarly sanity-check and commit
> my ObjC constant string patch from 21 Jun 2005.
--------------------------------------------------------------
Ziemowit Laski                 1 Infinite Loop, MS 301-2K
Mac OS X Compiler Group        Cupertino, CA USA  95014-2083
Apple Computer, Inc.           +1.408.974.6229  Fax .5477