From 440aabf8657a9f818f755f768f80f65f205b5077 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Thu, 26 Jul 2001 06:56:13 +0000 Subject: [PATCH] toplev.c, [...]: Include xcoffout.h if appropriate. * toplev.c, varasm.c, final.c: Include xcoffout.h if appropriate. * dbxout.c (dbxout_global_decl): Move outside #ifdef. * Makefile.in (varasm.o, final.o, toplev.o): Update dependencies. From-SVN: r44382 --- gcc/ChangeLog | 6 ++++++ gcc/Makefile.in | 7 ++++--- gcc/dbxout.c | 24 ++++++++++++------------ gcc/final.c | 5 +++++ gcc/toplev.c | 5 +++++ gcc/varasm.c | 5 +++++ 6 files changed, 37 insertions(+), 15 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 35835ab6817..aad462cc72a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2001-07-26 Neil Booth + + * toplev.c, varasm.c, final.c: Include xcoffout.h if appropriate. + * dbxout.c (dbxout_global_decl): Move outside #ifdef. + * Makefile.in (varasm.o, final.o, toplev.o): Update dependencies. + 2001-07-26 Neil Booth * cpphash.h (struct_lexer_state): Delete was_skipping. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 380e1cd6767..6e619d9b372 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1339,7 +1339,7 @@ diagnostic.o : diagnostic.c diagnostic.h diagnostic.def \ $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(RTL_H) $(TM_P_H) flags.h \ $(GGC_H) input.h $(INSN_ATTR_H) insn-config.h toplev.h intl.h toplev.o : toplev.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(RTL_H) function.h \ - flags.h input.h $(INSN_ATTR_H) output.h diagnostic.h \ + flags.h xcoffout.h input.h $(INSN_ATTR_H) output.h diagnostic.h \ debug.h insn-config.h intl.h $(RECOG_H) Makefile toplev.h \ dwarf2out.h sdbout.h dbxout.h $(EXPR_H) hard-reg-set.h $(BASIC_BLOCK_H) \ graph.h $(LOOP_H) except.h $(REGS_H) $(TIMEVAR_H) $(lang_options_files) \ @@ -1362,7 +1362,8 @@ errors.o : errors.c $(GCONFIG_H) $(SYSTEM_H) errors.h varasm.o : varasm.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(RTL_H) flags.h \ function.h $(EXPR_H) hard-reg-set.h $(REGS_H) $(OBSTACK_H) \ - output.h c-pragma.h toplev.h debug.h $(GGC_H) $(TM_P_H) $(HASHTAB_H) + output.h c-pragma.h toplev.h xcoffout.h debug.h $(GGC_H) $(TM_P_H) \ + $(HASHTAB_H) function.o : function.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) $(TREE_H) flags.h \ function.h $(EXPR_H) $(REGS_H) hard-reg-set.h \ insn-config.h $(RECOG_H) output.h toplev.h except.h hash.h $(GGC_H) $(TM_P_H) @@ -1523,7 +1524,7 @@ sched-vis.o : sched-vis.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) sched-int.h \ hard-reg-set.h $(BASIC_BLOCK_H) $(INSN_ATTR_H) $(REGS_H) $(TM_P_H) final.o : final.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) $(TREE_H) flags.h intl.h \ $(REGS_H) $(RECOG_H) conditions.h insn-config.h $(INSN_ATTR_H) function.h \ - real.h output.h hard-reg-set.h except.h debug.h \ + real.h output.h hard-reg-set.h except.h debug.h xcoffout.h \ toplev.h reload.h dwarf2out.h $(BASIC_BLOCK_H) $(TM_P_H) $(TARGET_H) recog.o : recog.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) function.h $(BASIC_BLOCK_H) \ $(REGS_H) $(RECOG_H) $(EXPR_H) hard-reg-set.h flags.h insn-config.h \ diff --git a/gcc/dbxout.c b/gcc/dbxout.c index 7589f69f6b0..0d330c22653 100644 --- a/gcc/dbxout.c +++ b/gcc/dbxout.c @@ -625,18 +625,6 @@ dbxout_end_block (line, n) ASM_OUTPUT_INTERNAL_LABEL (asmfile, "LBE", n); } -/* Debug information for a global DECL. Called from toplev.c after - compilation proper has finished. */ -static void -dbxout_global_decl (decl) - tree decl; -{ - if (TREE_CODE (decl) == VAR_DECL - && ! DECL_EXTERNAL (decl) - && DECL_RTL_SET_P (decl)) /* Not necessary? */ - dbxout_symbol (decl, 0); -} - /* Output dbx data for a function definition. This includes a definition of the function name itself (a symbol), definitions of the parameters (locating them in the parameter list) @@ -666,6 +654,18 @@ dbxout_function_decl (decl) #endif /* DBX_DEBUGGING_INFO */ +/* Debug information for a global DECL. Called from toplev.c after + compilation proper has finished. */ +static void +dbxout_global_decl (decl) + tree decl; +{ + if (TREE_CODE (decl) == VAR_DECL + && ! DECL_EXTERNAL (decl) + && DECL_RTL_SET_P (decl)) /* Not necessary? */ + dbxout_symbol (decl, 0); +} + /* At the end of compilation, finish writing the symbol table. Unless you define DBX_OUTPUT_MAIN_SOURCE_FILE_END, the default is to do nothing. */ diff --git a/gcc/final.c b/gcc/final.c index 55a7c7dcf22..1529251686e 100644 --- a/gcc/final.c +++ b/gcc/final.c @@ -68,6 +68,11 @@ Boston, MA 02111-1307, USA. */ #include "target.h" #include "debug.h" +#ifdef XCOFF_DEBUGGING_INFO +#include "xcoffout.h" /* Needed for external data + declarations for e.g. AIX 4.x. */ +#endif + #if defined (DWARF2_UNWIND_INFO) || defined (DWARF2_DEBUGGING_INFO) #include "dwarf2out.h" #endif diff --git a/gcc/toplev.c b/gcc/toplev.c index 02bb24ab6a7..a28b38e8704 100644 --- a/gcc/toplev.c +++ b/gcc/toplev.c @@ -79,6 +79,11 @@ Boston, MA 02111-1307, USA. */ #ifdef SDB_DEBUGGING_INFO #include "sdbout.h" #endif + +#ifdef XCOFF_DEBUGGING_INFO +#include "xcoffout.h" /* Needed for external data + declarations for e.g. AIX 4.x. */ +#endif #ifdef VMS /* The extra parameters substantially improve the I/O performance. */ diff --git a/gcc/varasm.c b/gcc/varasm.c index cced6623c5e..e739784cf17 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -47,6 +47,11 @@ Boston, MA 02111-1307, USA. */ #include "tm_p.h" #include "debug.h" +#ifdef XCOFF_DEBUGGING_INFO +#include "xcoffout.h" /* Needed for external data + declarations for e.g. AIX 4.x. */ +#endif + #ifndef TRAMPOLINE_ALIGNMENT #define TRAMPOLINE_ALIGNMENT FUNCTION_BOUNDARY #endif