From 2c50b2c366a178161e90caad85d9dd883b5bfa90 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Fri, 8 Jul 2011 11:43:54 +0000 Subject: [PATCH] Makefile.in (LIBGCOV): Remove. gcc: * Makefile.in (LIBGCOV): Remove. (libgcc.mvars): Remove LIBGCOV. * libgov.c: Move to ../libgcc. libgcc: * Makfile.in (LIBGCOV): New variable. ($(libgcov-objects)): Use $(srcdir) to refer to libgcov.c. * libgcov.c: New file. From-SVN: r176037 --- gcc/ChangeLog | 6 ++++++ gcc/Makefile.in | 9 --------- libgcc/ChangeLog | 6 ++++++ libgcc/Makefile.in | 14 ++++++++++++-- {gcc => libgcc}/libgcov.c | 0 5 files changed, 24 insertions(+), 11 deletions(-) rename {gcc => libgcc}/libgcov.c (100%) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9f0a0e2cab8..3c2c2efaba5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2011-07-08 Rainer Orth + + * Makefile.in (LIBGCOV): Remove. + (libgcc.mvars): Remove LIBGCOV. + * libgov.c: Move to ../libgcc. + 2011-07-08 Rainer Orth * config/fixed-bit.c, config/fixed-bit.h: Move to ../libgcc. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 0f4a73e7dba..f169a9a3574 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1540,14 +1540,6 @@ MOSTLYCLEANFILES = insn-flags.h insn-config.h insn-codes.h \ # Defined in libgcc2.c, included only in the static library. LIB2FUNCS_ST = _eprintf __gcc_bcmp -# Defined in libgcov.c, included only in gcov library -LIBGCOV = _gcov _gcov_merge_add _gcov_merge_single _gcov_merge_delta \ - _gcov_fork _gcov_execl _gcov_execlp _gcov_execle \ - _gcov_execv _gcov_execvp _gcov_execve \ - _gcov_interval_profiler _gcov_pow2_profiler _gcov_one_value_profiler \ - _gcov_indirect_call_profiler _gcov_average_profiler _gcov_ior_profiler \ - _gcov_merge_ior - FPBIT_FUNCS = _pack_sf _unpack_sf _addsub_sf _mul_sf _div_sf \ _fpcmp_parts_sf _compare_sf _eq_sf _ne_sf _gt_sf _ge_sf \ _lt_sf _le_sf _unord_sf _si_to_sf _sf_to_si _negate_sf _make_sf \ @@ -1933,7 +1925,6 @@ libgcc.mvars: config.status Makefile $(LIB2ADD) $(LIB2ADD_ST) specs \ echo LIB1ASMSRC = '$(LIB1ASMSRC)' >> tmp-libgcc.mvars echo LIB2FUNCS_ST = '$(LIB2FUNCS_ST)' >> tmp-libgcc.mvars echo LIB2FUNCS_EXCLUDE = '$(LIB2FUNCS_EXCLUDE)' >> tmp-libgcc.mvars - echo LIBGCOV = '$(LIBGCOV)' >> tmp-libgcc.mvars echo LIB2ADD = '$(call srcdirify,$(LIB2ADD))' >> tmp-libgcc.mvars echo LIB2ADD_ST = '$(call srcdirify,$(LIB2ADD_ST))' >> tmp-libgcc.mvars echo LIB2ADDEH = '$(call srcdirify,$(LIB2ADDEH) $(srcdir)/emutls.c)' >> tmp-libgcc.mvars diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 091e674b188..a09b88a8c38 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,9 @@ +2011-07-08 Rainer Orth + + * Makfile.in (LIBGCOV): New variable. + ($(libgcov-objects)): Use $(srcdir) to refer to libgcov.c. + * libgcov.c: New file. + 2011-07-08 Rainer Orth * fixed-bit.c, fixed-bit.h: New files. diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in index d0a1d1582ee..e204ef02ac1 100644 --- a/libgcc/Makefile.in +++ b/libgcc/Makefile.in @@ -747,9 +747,19 @@ iter-items := $(LIBUNWIND) include $(iterator) # Build libgcov components. + +# Defined in libgcov.c, included only in gcov library +LIBGCOV = _gcov _gcov_merge_add _gcov_merge_single _gcov_merge_delta \ + _gcov_fork _gcov_execl _gcov_execlp _gcov_execle \ + _gcov_execv _gcov_execvp _gcov_execve \ + _gcov_interval_profiler _gcov_pow2_profiler _gcov_one_value_profiler \ + _gcov_indirect_call_profiler _gcov_average_profiler _gcov_ior_profiler \ + _gcov_merge_ior + libgcov-objects = $(patsubst %,%$(objext),$(LIBGCOV)) -$(libgcov-objects): %$(objext): $(gcc_srcdir)/libgcov.c - $(gcc_compile) -DL$* -c $(gcc_srcdir)/libgcov.c + +$(libgcov-objects): %$(objext): $(srcdir)/libgcov.c + $(gcc_compile) -DL$* -c $(srcdir)/libgcov.c # Static libraries. diff --git a/gcc/libgcov.c b/libgcc/libgcov.c similarity index 100% rename from gcc/libgcov.c rename to libgcc/libgcov.c -- 2.30.2