From 43b3a5b10fe5e139b2fcf763022843f83ba07f2e Mon Sep 17 00:00:00 2001 From: Ziemowit Laski Date: Wed, 29 Jun 2005 03:01:27 +0000 Subject: [PATCH] c-common.c (flag_next_runtime): Move... [gcc/ChangeLog] 2006-06-28 Ziemowit Laski * 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. From-SVN: r101415 --- gcc/ChangeLog | 9 +++++++++ gcc/c-common.c | 8 -------- gcc/c-common.h | 4 ---- gcc/config/darwin-c.c | 1 + gcc/config/t-darwin | 2 +- gcc/flags.h | 4 ++++ gcc/toplev.c | 8 ++++++++ 7 files changed, 23 insertions(+), 13 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5f4fca86a07f..708f198e923b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2006-06-28 Ziemowit Laski + + * 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. + 2005-06-29 Kaz Kojima * config/sh/linux-unwind.h (shmedia_fallback_frame_state): diff --git a/gcc/c-common.c b/gcc/c-common.c index bcf280905544..2b13ad912ecd 100644 --- a/gcc/c-common.c +++ b/gcc/c-common.c @@ -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. */ diff --git a/gcc/c-common.h b/gcc/c-common.h index d3839b73d88b..fabb67e6b202 100644 --- a/gcc/c-common.h +++ b/gcc/c-common.h @@ -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. */ diff --git a/gcc/config/darwin-c.c b/gcc/config/darwin-c.c index 73d60f42fb99..9102ea2e67da 100644 --- a/gcc/config/darwin-c.c +++ b/gcc/config/darwin-c.c @@ -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" diff --git a/gcc/config/t-darwin b/gcc/config/t-darwin index fc8735bd9c06..df1b6320e5d2 100644 --- a/gcc/config/t-darwin +++ b/gcc/config/t-darwin @@ -6,7 +6,7 @@ darwin.o: $(srcdir)/config/darwin.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ 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 diff --git a/gcc/flags.h b/gcc/flags.h index e8da68456f60..84d5b39b6153 100644 --- a/gcc/flags.h +++ b/gcc/flags.h @@ -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 diff --git a/gcc/toplev.c b/gcc/toplev.c index 6107c0481820..17f75fe00f7b 100644 --- a/gcc/toplev.c +++ b/gcc/toplev.c @@ -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;