aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>2011-07-08 11:43:54 +0000
committerRainer Orth <ro@gcc.gnu.org>2011-07-08 11:43:54 +0000
commit2c50b2c366a178161e90caad85d9dd883b5bfa90 (patch)
tree15947f7a8e06d97901e184fa2cbbe501ea985dea
parenta039d7c2f17cf98af6f9fa796c550b7fdbefda58 (diff)
downloadgcc-2c50b2c366a178161e90caad85d9dd883b5bfa90.zip
gcc-2c50b2c366a178161e90caad85d9dd883b5bfa90.tar.gz
gcc-2c50b2c366a178161e90caad85d9dd883b5bfa90.tar.bz2
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
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/Makefile.in9
-rw-r--r--libgcc/ChangeLog6
-rw-r--r--libgcc/Makefile.in14
-rw-r--r--libgcc/libgcov.c (renamed from gcc/libgcov.c)0
5 files changed, 24 insertions, 11 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9f0a0e2..3c2c2ef 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
2011-07-08 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+ * Makefile.in (LIBGCOV): Remove.
+ (libgcc.mvars): Remove LIBGCOV.
+ * libgov.c: Move to ../libgcc.
+
+2011-07-08 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
* config/fixed-bit.c, config/fixed-bit.h: Move to ../libgcc.
2011-07-08 Martin Jambor <mjambor@suse.cz>
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 0f4a73e..f169a9a 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 091e674..a09b88a 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,5 +1,11 @@
2011-07-08 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+ * Makfile.in (LIBGCOV): New variable.
+ ($(libgcov-objects)): Use $(srcdir) to refer to libgcov.c.
+ * libgcov.c: New file.
+
+2011-07-08 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
* fixed-bit.c, fixed-bit.h: New files.
* fixed-obj.mk ($o$(objext), $(o)_s$(objext)): Use $(srcdir) to
refer to fixed-bit.c.
diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in
index d0a1d15..e204ef0 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
index b39ef49..b39ef49 100644
--- a/gcc/libgcov.c
+++ b/libgcc/libgcov.c