From 990f4800f2228c94b23362016ddcb11401a8e5d6 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Wed, 14 May 2003 15:29:10 +0000 Subject: [PATCH] Makefile.in (LIBGCC_DEPS): Use $(srcdir) on gcov files * Makefile.in (LIBGCC_DEPS): Use $(srcdir) on gcov files (libgcov.a): Depend on libgcc.a. (gcov.o, gcov-dump.o): Add gcov-io.c. * mklibgcc.in (libgcov_c_dep): Use $(srcdir). From-SVN: r66804 --- gcc/ChangeLog | 5 +++++ gcc/Makefile.in | 9 +++++---- gcc/mklibgcc.in | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f5e7884edf7..b449645f8fc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2003-05-14 Nathan Sidwell + * Makefile.in (LIBGCC_DEPS): Use $(srcdir) on gcov files + (libgcov.a): Depend on libgcc.a. + (gcov.o, gcov-dump.o): Add gcov-io.c. + * mklibgcc.in (libgcov_c_dep): Use $(srcdir). + * loop.c (check_dbra_loop): Factor common test. 2003-05-14 Ben Elliston diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 5d9a8a761f7..044ec12ee00 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1113,9 +1113,10 @@ LIBGCC_DEPS = $(GCC_PASSES) $(LANGUAGES) stmp-int-hdrs $(STMP_FIXPROTO) \ $(MACHMODE_H) longlong.h gbl-ctors.h config.status stmp-int-hdrs \ tsystem.h $(FPBIT) $(DPBIT) $(TPBIT) $(LIB2ADD) \ $(LIB2ADD_ST) $(LIB2ADDEH) $(LIB2ADDEHDEP) $(EXTRA_PARTS) \ - $(srcdir)/config/$(LIB1ASMSRC) gcov-io.h gcov-io.c gcov-iov.h + $(srcdir)/config/$(LIB1ASMSRC) \ + $(srcdir)/gcov-io.h $(srcdir)/gcov-io.c gcov-iov.h -libgcov.a: $(LIBGCC_DEPS); @true +libgcov.a: libgcc.a; @true libgcc.a: $(LIBGCC_DEPS) $(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \ @@ -2440,8 +2441,8 @@ s-iov: gcov-iov$(build_exeext) $(srcdir)/move-if-change $(SHELL) $(srcdir)/move-if-change tmp-gcov-iov.h gcov-iov.h $(STAMP) s-iov -gcov.o: gcov.c gcov-io.h gcov-iov.h intl.h $(SYSTEM_H) coretypes.h $(TM_H) $(CONFIG_H) -gcov-dump.o: gcov-dump.c gcov-io.h gcov-iov.h $(SYSTEM_H) coretypes.h $(TM_H) $(CONFIG_H) +gcov.o: gcov.c gcov-io.h gcov-io.c gcov-iov.h intl.h $(SYSTEM_H) coretypes.h $(TM_H) $(CONFIG_H) +gcov-dump.o: gcov-dump.c gcov-io.h gcov-io.c gcov-iov.h $(SYSTEM_H) coretypes.h $(TM_H) $(CONFIG_H) # Only one of 'gcov' or 'gcov.exe' is actually built, depending # upon whether $(exeext) is empty or not. diff --git a/gcc/mklibgcc.in b/gcc/mklibgcc.in index 1fb34d79796..975726b45a9 100644 --- a/gcc/mklibgcc.in +++ b/gcc/mklibgcc.in @@ -75,7 +75,7 @@ make_compile='$(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \ libgcc2_c_dep='stmp-dirs $(srcdir)/libgcc2.c $(CONFIG_H) coretypes.h $(TM_H) $(MACHMODE_H) longlong.h gbl-ctors.h config.status stmp-int-hdrs tsystem.h'" $LIB2ADDEHDEP" # Dependencies for libgcov.c -libgcov_c_dep='stmp-dirs $(srcdir)/libgcov.c $(CONFIG_H) coretypes.h $(TM_H) $(MACHMODE_H) longlong.h gbl-ctors.h config.status stmp-int-hdrs tsystem.h gcov-io.h gcov-io.c gcov-iov.h' +libgcov_c_dep='stmp-dirs $(srcdir)/libgcov.c $(CONFIG_H) coretypes.h $(TM_H) $(MACHMODE_H) longlong.h gbl-ctors.h config.status stmp-int-hdrs tsystem.h $(srcdir)/gcov-io.h $(srcdir)/gcov-io.c gcov-iov.h' # Dependencies for fp-bit.c fpbit_c_dep='stmp-dirs config.status tsystem.h' -- 2.30.2