From 81e80ddaa918d80abefd529f8c1e8b2a01c240db Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 25 Aug 2008 04:38:45 +0000 Subject: [PATCH] * gmon_io.h: Don't include sysdep.h here. (O_BINARY, SET_BINARY): Don't define here. * gmon_io.c: Include "binary-io.h". (gmon_out_read): Remove #ifdef SET_BINARY. * Makefile.am: Run "make dep-am" * Makefile.in: Regenerate. --- gprof/ChangeLog | 11 +++- gprof/Makefile.am | 164 +++++++++++++++++++++------------------------- gprof/Makefile.in | 164 +++++++++++++++++++++------------------------- gprof/gmon_io.c | 5 +- gprof/gmon_io.h | 21 +----- 5 files changed, 164 insertions(+), 201 deletions(-) diff --git a/gprof/ChangeLog b/gprof/ChangeLog index 9f9975c641c..b75005804e7 100644 --- a/gprof/ChangeLog +++ b/gprof/ChangeLog @@ -1,6 +1,15 @@ +2008-08-25 Alan Modra + + * gmon_io.h: Don't include sysdep.h here. + (O_BINARY, SET_BINARY): Don't define here. + * gmon_io.c: Include "binary-io.h". + (gmon_out_read): Remove #ifdef SET_BINARY. + * Makefile.am: Run "make dep-am" + * Makefile.in: Regenerate. + 2008-08-24 Alan Modra - *configure.in: Update a number of obsolete autoconf macros. + * configure.in: Update a number of obsolete autoconf macros. 2008-08-15 Alan Modra diff --git a/gprof/Makefile.am b/gprof/Makefile.am index 0b9bc278240..7bdbba0a187 100644 --- a/gprof/Makefile.am +++ b/gprof/Makefile.am @@ -193,120 +193,106 @@ endif # DO NOT DELETE THIS LINE -- mkdep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -basic_blocks.o: basic_blocks.c $(INCDIR)/libiberty.h \ - $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - gconfig.h basic_blocks.h corefile.h gmon_io.h gmon_out.h \ - search_list.h source.h symtab.h sym_ids.h +basic_blocks.o: basic_blocks.c gprof.h $(BFDDIR)/sysdep.h \ + ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \ + gconfig.h $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ + basic_blocks.h corefile.h gmon_io.h gmon_out.h search_list.h \ + source.h symtab.h sym_ids.h call_graph.o: call_graph.c gprof.h $(BFDDIR)/sysdep.h \ ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \ - $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/symcat.h gconfig.h search_list.h source.h \ - symtab.h cg_arcs.h call_graph.h corefile.h gmon_io.h \ - gmon_out.h sym_ids.h -cg_arcs.o: cg_arcs.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ - gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \ - $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h search_list.h \ - source.h symtab.h call_graph.h cg_arcs.h cg_dfn.h cg_print.h \ - utils.h sym_ids.h -cg_dfn.o: cg_dfn.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ - gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \ - $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h search_list.h \ - source.h symtab.h cg_arcs.h cg_dfn.h utils.h -cg_print.o: cg_print.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ - gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \ - $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h search_list.h \ - source.h symtab.h cg_arcs.h cg_print.h hist.h utils.h \ - corefile.h -corefile.o: corefile.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ - gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \ - $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h search_list.h \ - source.h symtab.h hist.h corefile.h $(INCDIR)/safe-ctype.h + $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \ + gconfig.h search_list.h source.h symtab.h cg_arcs.h \ + call_graph.h corefile.h gmon_io.h gmon_out.h sym_ids.h +cg_arcs.o: cg_arcs.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ + $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \ + $(INCDIR)/ansidecl.h search_list.h source.h symtab.h \ + call_graph.h cg_arcs.h cg_dfn.h cg_print.h utils.h \ + sym_ids.h +cg_dfn.o: cg_dfn.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ + $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \ + $(INCDIR)/ansidecl.h search_list.h source.h symtab.h \ + cg_arcs.h cg_dfn.h utils.h +cg_print.o: cg_print.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ + $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \ + $(INCDIR)/ansidecl.h search_list.h source.h symtab.h \ + cg_arcs.h cg_print.h hist.h utils.h corefile.h +corefile.o: corefile.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ + $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \ + $(INCDIR)/ansidecl.h search_list.h source.h symtab.h \ + hist.h corefile.h $(INCDIR)/safe-ctype.h gmon_io.o: gmon_io.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - gconfig.h search_list.h source.h symtab.h cg_arcs.h \ - basic_blocks.h corefile.h call_graph.h gmon_io.h gmon_out.h \ - gmon.h hertz.h hist.h $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h -gprof.o: gprof.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ - gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \ - $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h ../bfd/bfdver.h \ - search_list.h source.h symtab.h basic_blocks.h call_graph.h \ - cg_arcs.h cg_print.h corefile.h gmon_io.h hertz.h hist.h \ - sym_ids.h $(INCDIR)/demangle.h $(INCDIR)/libiberty.h + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/binary-io.h \ + search_list.h source.h symtab.h cg_arcs.h basic_blocks.h \ + corefile.h call_graph.h gmon_io.h gmon_out.h gmon.h \ + hertz.h hist.h $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h +gprof.o: gprof.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ + $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \ + $(INCDIR)/ansidecl.h ../bfd/bfdver.h search_list.h \ + source.h symtab.h basic_blocks.h call_graph.h cg_arcs.h \ + cg_print.h corefile.h gmon_io.h hertz.h hist.h sym_ids.h \ + $(INCDIR)/demangle.h $(INCDIR)/libiberty.h hertz.o: hertz.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - gconfig.h hertz.h -hist.o: hist.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ - gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \ - $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h search_list.h \ - source.h symtab.h corefile.h gmon_io.h gmon_out.h hist.h \ - sym_ids.h utils.h + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h hertz.h +hist.o: hist.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ + $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \ + $(INCDIR)/ansidecl.h search_list.h source.h symtab.h \ + corefile.h gmon_io.h gmon_out.h hist.h sym_ids.h utils.h source.o: source.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \ + $(INCDIR)/ansidecl.h search_list.h source.h +search_list.o: search_list.c gprof.h $(BFDDIR)/sysdep.h \ + ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \ gconfig.h $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/filenames.h search_list.h source.h -search_list.o: search_list.c $(INCDIR)/libiberty.h \ - $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - gconfig.h search_list.h + search_list.h symtab.o: symtab.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - gconfig.h search_list.h source.h symtab.h cg_arcs.h \ - corefile.h -sym_ids.o: sym_ids.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/safe-ctype.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \ + source.h symtab.h cg_arcs.h corefile.h +sym_ids.o: sym_ids.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - gconfig.h search_list.h source.h symtab.h cg_arcs.h \ - sym_ids.h corefile.h -utils.o: utils.c $(INCDIR)/demangle.h $(INCDIR)/libiberty.h \ - $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \ + $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h search_list.h \ + source.h symtab.h cg_arcs.h sym_ids.h corefile.h +utils.o: utils.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - gconfig.h search_list.h source.h symtab.h cg_arcs.h \ - utils.h corefile.h + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/demangle.h \ + $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h search_list.h \ + source.h symtab.h cg_arcs.h utils.h corefile.h i386.o: i386.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - gconfig.h search_list.h source.h symtab.h cg_arcs.h \ - corefile.h hist.h + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \ + source.h symtab.h cg_arcs.h corefile.h hist.h alpha.o: alpha.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - gconfig.h search_list.h source.h symtab.h cg_arcs.h \ - corefile.h hist.h + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \ + source.h symtab.h cg_arcs.h corefile.h hist.h vax.o: vax.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - gconfig.h search_list.h source.h symtab.h cg_arcs.h \ - corefile.h hist.h + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \ + source.h symtab.h cg_arcs.h corefile.h hist.h tahoe.o: tahoe.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - gconfig.h search_list.h source.h symtab.h cg_arcs.h \ - corefile.h hist.h + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \ + source.h symtab.h cg_arcs.h corefile.h hist.h sparc.o: sparc.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - gconfig.h search_list.h source.h symtab.h cg_arcs.h \ - corefile.h hist.h + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \ + source.h symtab.h cg_arcs.h corefile.h hist.h mips.o: mips.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - gconfig.h search_list.h source.h symtab.h cg_arcs.h \ - corefile.h hist.h + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \ + source.h symtab.h cg_arcs.h corefile.h hist.h flat_bl.o: flat_bl.c $(INCDIR)/ansidecl.h bsd_callg_bl.o: bsd_callg_bl.c $(INCDIR)/ansidecl.h fsf_callg_bl.o: fsf_callg_bl.c $(INCDIR)/ansidecl.h diff --git a/gprof/Makefile.in b/gprof/Makefile.in index 03329f86eff..bfaf48518a5 100644 --- a/gprof/Makefile.in +++ b/gprof/Makefile.in @@ -942,120 +942,106 @@ dep-am: DEP # DO NOT DELETE THIS LINE -- mkdep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -basic_blocks.o: basic_blocks.c $(INCDIR)/libiberty.h \ - $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - gconfig.h basic_blocks.h corefile.h gmon_io.h gmon_out.h \ - search_list.h source.h symtab.h sym_ids.h +basic_blocks.o: basic_blocks.c gprof.h $(BFDDIR)/sysdep.h \ + ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \ + gconfig.h $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ + basic_blocks.h corefile.h gmon_io.h gmon_out.h search_list.h \ + source.h symtab.h sym_ids.h call_graph.o: call_graph.c gprof.h $(BFDDIR)/sysdep.h \ ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \ - $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/symcat.h gconfig.h search_list.h source.h \ - symtab.h cg_arcs.h call_graph.h corefile.h gmon_io.h \ - gmon_out.h sym_ids.h -cg_arcs.o: cg_arcs.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ - gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \ - $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h search_list.h \ - source.h symtab.h call_graph.h cg_arcs.h cg_dfn.h cg_print.h \ - utils.h sym_ids.h -cg_dfn.o: cg_dfn.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ - gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \ - $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h search_list.h \ - source.h symtab.h cg_arcs.h cg_dfn.h utils.h -cg_print.o: cg_print.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ - gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \ - $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h search_list.h \ - source.h symtab.h cg_arcs.h cg_print.h hist.h utils.h \ - corefile.h -corefile.o: corefile.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ - gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \ - $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h search_list.h \ - source.h symtab.h hist.h corefile.h $(INCDIR)/safe-ctype.h + $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \ + gconfig.h search_list.h source.h symtab.h cg_arcs.h \ + call_graph.h corefile.h gmon_io.h gmon_out.h sym_ids.h +cg_arcs.o: cg_arcs.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ + $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \ + $(INCDIR)/ansidecl.h search_list.h source.h symtab.h \ + call_graph.h cg_arcs.h cg_dfn.h cg_print.h utils.h \ + sym_ids.h +cg_dfn.o: cg_dfn.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ + $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \ + $(INCDIR)/ansidecl.h search_list.h source.h symtab.h \ + cg_arcs.h cg_dfn.h utils.h +cg_print.o: cg_print.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ + $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \ + $(INCDIR)/ansidecl.h search_list.h source.h symtab.h \ + cg_arcs.h cg_print.h hist.h utils.h corefile.h +corefile.o: corefile.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ + $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \ + $(INCDIR)/ansidecl.h search_list.h source.h symtab.h \ + hist.h corefile.h $(INCDIR)/safe-ctype.h gmon_io.o: gmon_io.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - gconfig.h search_list.h source.h symtab.h cg_arcs.h \ - basic_blocks.h corefile.h call_graph.h gmon_io.h gmon_out.h \ - gmon.h hertz.h hist.h $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h -gprof.o: gprof.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ - gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \ - $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h ../bfd/bfdver.h \ - search_list.h source.h symtab.h basic_blocks.h call_graph.h \ - cg_arcs.h cg_print.h corefile.h gmon_io.h hertz.h hist.h \ - sym_ids.h $(INCDIR)/demangle.h $(INCDIR)/libiberty.h + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/binary-io.h \ + search_list.h source.h symtab.h cg_arcs.h basic_blocks.h \ + corefile.h call_graph.h gmon_io.h gmon_out.h gmon.h \ + hertz.h hist.h $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h +gprof.o: gprof.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ + $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \ + $(INCDIR)/ansidecl.h ../bfd/bfdver.h search_list.h \ + source.h symtab.h basic_blocks.h call_graph.h cg_arcs.h \ + cg_print.h corefile.h gmon_io.h hertz.h hist.h sym_ids.h \ + $(INCDIR)/demangle.h $(INCDIR)/libiberty.h hertz.o: hertz.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - gconfig.h hertz.h -hist.o: hist.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ - gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \ - $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h search_list.h \ - source.h symtab.h corefile.h gmon_io.h gmon_out.h hist.h \ - sym_ids.h utils.h + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h hertz.h +hist.o: hist.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ + $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \ + $(INCDIR)/ansidecl.h search_list.h source.h symtab.h \ + corefile.h gmon_io.h gmon_out.h hist.h sym_ids.h utils.h source.o: source.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \ + $(INCDIR)/ansidecl.h search_list.h source.h +search_list.o: search_list.c gprof.h $(BFDDIR)/sysdep.h \ + ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \ + $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \ gconfig.h $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/filenames.h search_list.h source.h -search_list.o: search_list.c $(INCDIR)/libiberty.h \ - $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ - $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - gconfig.h search_list.h + search_list.h symtab.o: symtab.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - gconfig.h search_list.h source.h symtab.h cg_arcs.h \ - corefile.h -sym_ids.o: sym_ids.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/safe-ctype.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \ + source.h symtab.h cg_arcs.h corefile.h +sym_ids.o: sym_ids.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - gconfig.h search_list.h source.h symtab.h cg_arcs.h \ - sym_ids.h corefile.h -utils.o: utils.c $(INCDIR)/demangle.h $(INCDIR)/libiberty.h \ - $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \ + $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h search_list.h \ + source.h symtab.h cg_arcs.h sym_ids.h corefile.h +utils.o: utils.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - gconfig.h search_list.h source.h symtab.h cg_arcs.h \ - utils.h corefile.h + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/demangle.h \ + $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h search_list.h \ + source.h symtab.h cg_arcs.h utils.h corefile.h i386.o: i386.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - gconfig.h search_list.h source.h symtab.h cg_arcs.h \ - corefile.h hist.h + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \ + source.h symtab.h cg_arcs.h corefile.h hist.h alpha.o: alpha.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - gconfig.h search_list.h source.h symtab.h cg_arcs.h \ - corefile.h hist.h + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \ + source.h symtab.h cg_arcs.h corefile.h hist.h vax.o: vax.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - gconfig.h search_list.h source.h symtab.h cg_arcs.h \ - corefile.h hist.h + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \ + source.h symtab.h cg_arcs.h corefile.h hist.h tahoe.o: tahoe.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - gconfig.h search_list.h source.h symtab.h cg_arcs.h \ - corefile.h hist.h + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \ + source.h symtab.h cg_arcs.h corefile.h hist.h sparc.o: sparc.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - gconfig.h search_list.h source.h symtab.h cg_arcs.h \ - corefile.h hist.h + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \ + source.h symtab.h cg_arcs.h corefile.h hist.h mips.o: mips.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \ $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - gconfig.h search_list.h source.h symtab.h cg_arcs.h \ - corefile.h hist.h + ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \ + source.h symtab.h cg_arcs.h corefile.h hist.h flat_bl.o: flat_bl.c $(INCDIR)/ansidecl.h bsd_callg_bl.o: bsd_callg_bl.c $(INCDIR)/ansidecl.h fsf_callg_bl.o: fsf_callg_bl.c $(INCDIR)/ansidecl.h diff --git a/gprof/gmon_io.c b/gprof/gmon_io.c index 8d1071a7a52..bf74c263bd0 100644 --- a/gprof/gmon_io.c +++ b/gprof/gmon_io.c @@ -1,6 +1,6 @@ /* gmon_io.c - Input and output from/to gmon.out files. - Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007 + Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -21,6 +21,7 @@ 02110-1301, USA. */ #include "gprof.h" +#include "binary-io.h" #include "search_list.h" #include "source.h" #include "symtab.h" @@ -300,9 +301,7 @@ gmon_out_read (const char *filename) if (strcmp (filename, "-") == 0) { ifp = stdin; -#ifdef SET_BINARY SET_BINARY (fileno (stdin)); -#endif } else { diff --git a/gprof/gmon_io.h b/gprof/gmon_io.h index 20e59b56120..29d608d08a3 100644 --- a/gprof/gmon_io.h +++ b/gprof/gmon_io.h @@ -1,6 +1,7 @@ /* gmon_io.h - Copyright 2000, 2001, 2002, 2004, 2007 Free Software Foundation, Inc. + Copyright 2000, 2001, 2002, 2004, 2007, 2008 + Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -22,24 +23,6 @@ #ifndef gmon_io_h #define gmon_io_h -/* Some platforms need to put stdin into binary mode, to read - binary files. */ -#include "sysdep.h" -#ifdef HAVE_SETMODE -#ifndef O_BINARY -#ifdef _O_BINARY -#define O_BINARY _O_BINARY -#define setmode _setmode -#else -#define O_BINARY 0 -#endif -#endif -#if O_BINARY -#include -#define SET_BINARY(f) do { if (!isatty(f)) setmode(f,O_BINARY); } while (0) -#endif -#endif - #define INPUT_HISTOGRAM (1 << 0) #define INPUT_CALL_GRAPH (1 << 1) #define INPUT_BB_COUNTS (1 << 2) -- 2.30.2