Makefile.in (LIB2ADDEHDEP): Add unwind.h and unwind-pe.h.

        * Makefile.in (LIB2ADDEHDEP): Add unwind.h and unwind-pe.h.
        * mklibgcc.in (libgcc_dep): New, covering general dependencies, but
        not unwind code specific ones.
        (libgcc2_c_dep): Replace general dependencies with use of libgcc_dep.
        Remove unwind code specific dependencies.
        (libgcov_c_dep): Replace general dependencies with use of libgcc_dep.
        Remove gbl-ctors.h.
        Add libgcc_dep to output generated for LIB2ADD, LIB2ADDEH, and
        LIB2ADD_ST. Add LIB2ADDEHDEP to output generated for LIB2ADDEH.

From-SVN: r87026

4 files changed, 33 insertions, 9 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9fff478..a9c847e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,16 @@
+2004-09-02  Jan Beulich  <jbeulich@novell.com>
+
+	* Makefile.in (LIB2ADDEHDEP): Add unwind.h and unwind-pe.h.
+	* mklibgcc.in (libgcc_dep): New, covering general dependencies, but
+	not unwind code specific ones.
+	(libgcc2_c_dep): Replace general dependencies with use of libgcc_dep.
+	Remove unwind code specific dependencies.
+	(libgcov_c_dep): Replace general dependencies with use of libgcc_dep.
+	Remove gbl-ctors.h.
+	Add libgcc_dep to output generated for LIB2ADD, LIB2ADDEH, and
+	LIB2ADD_ST. Add LIB2ADDEHDEP to output generated for LIB2ADDEH.
+	* tsystem.h: Declare memcpy and memset when inhibit_libc.
+
 2004-09-02  Roman Zippel  <zippel@linux-m68k.org>
  
 	* combine.c (try_combine): Delay modifying of insns which cannot
@@ -178,7 +191,7 @@
 2004-09-01  Roger Sayle  <roger@eyesopen.com>
 
 	* expmed.c (enum alg_code): Remove long unused enumeration values.
-        (struct mult_cost): New structure to hold the "score" of a synthetic
+	(struct mult_cost): New structure to hold the "score" of a synthetic
 	multiply sequence, including both a rtx_cost and a latency field.
 	(MULT_COST_LESS): New macro to compare mult_cost to a constant.
 	(CHEAPER_MULT_COST): New macro to compare two mult_costs.
@@ -301,8 +314,8 @@
 
 2004-09-01  Richard Henderson  <rth@redhat.com>
 
-        * config/ns32k/ns32k.h (TRANSFER_FROM_TRAMPOLINE): Remove.
-        (TRAMPOLINE_TEMPLATE): Merge code from __trampoline inline.
+	* config/ns32k/ns32k.h (TRANSFER_FROM_TRAMPOLINE): Remove.
+	(TRAMPOLINE_TEMPLATE): Merge code from __trampoline inline.
 
 2004-09-01  Jakub Jelinek  <jakub@redhat.com>
 
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 80af8c5..19ce160 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -532,7 +532,7 @@ CRTSTUFF_CFLAGS = -O2 $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \
 # Additional sources to handle exceptions; overridden by targets as needed.
 LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde.c \
    $(srcdir)/unwind-sjlj.c $(srcdir)/gthr-gnat.c $(srcdir)/unwind-c.c
-LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h unwind-dw2.h
+LIB2ADDEHDEP = unwind.h unwind-pe.h unwind.inc unwind-dw2-fde.h unwind-dw2.h
 
 # nm flags to list global symbols in libgcc object files.
 SHLIB_NM_FLAGS = -pg
diff --git a/gcc/mklibgcc.in b/gcc/mklibgcc.in
index d5f7937..891e474 100644
--- a/gcc/mklibgcc.in
+++ b/gcc/mklibgcc.in
@@ -71,11 +71,14 @@ make_compile='$(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \
 	  BUILD_PREFIX_1="$(BUILD_PREFIX_1)" \
 	  LANGUAGES="$(LANGUAGES)"'
 
+# Generic dependencies for libgcc
+libgcc_dep='$(CONFIG_H) coretypes.h $(TM_H) $(MACHMODE_H) longlong.h config.status stmp-int-hdrs tsystem.h'
+
 # Dependencies for libgcc2.c
-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"
+libgcc2_c_dep='stmp-dirs $(srcdir)/libgcc2.c gbl-ctors.h'" $libgcc_dep"
 
 # 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 $(srcdir)/gcov-io.h $(srcdir)/gcov-io.c gcov-iov.h'
+libgcov_c_dep='stmp-dirs $(srcdir)/libgcov.c $(srcdir)/gcov-io.h $(srcdir)/gcov-io.c gcov-iov.h'" $libgcc_dep"
 
 # Dependencies for fp-bit.c
 fpbit_c_dep='stmp-dirs config.status tsystem.h'
@@ -212,7 +215,7 @@ for file in $LIB2ADD; do
       flags="$flags -xassembler-with-cpp"
     fi
 
-    echo $out: stmp-dirs $file
+    echo $out: stmp-dirs $file $libgcc_dep
     echo "	$gcc_compile" $flags -c $file -o $out
   done
   libgcc2_objs="$libgcc2_objs ${oname}${objext}"
@@ -230,7 +233,7 @@ for file in $LIB2ADDEH; do
       flags="$flags -xassembler-with-cpp"
     fi
 
-    echo $out: stmp-dirs $file
+    echo $out: stmp-dirs $file $LIB2ADDEHDEP $libgcc_dep
     echo "	$gcc_compile" $flags -fexceptions -c $file -o $out
   done
   if [ "$SHLIB_LINK" ]; then
@@ -252,7 +255,7 @@ for file in $LIB2ADD_ST; do
       flags="$flags -xassembler-with-cpp"
     fi
 
-    echo $out: stmp-dirs $file
+    echo $out: stmp-dirs $file $libgcc_dep
     echo "	$gcc_compile" $flags -c $file -o $out
   done
   libgcc2_st_objs="$libgcc2_st_objs ${oname}${objext}"
diff --git a/gcc/tsystem.h b/gcc/tsystem.h
index d7f1ebc..7928b31 100644
--- a/gcc/tsystem.h
+++ b/gcc/tsystem.h
@@ -69,6 +69,14 @@ extern void abort (void) __attribute__ ((__noreturn__));
 extern size_t strlen (const char *);
 #endif
 
+#ifndef memcpy
+extern void *memcpy (void *, const void *, size_t);
+#endif
+
+#ifndef memset
+extern void *memset (void *, int, size_t);
+#endif
+
 #else /* ! inhibit_libc */
 /* We disable this when inhibit_libc, so that gcc can still be built without
    needing header files first.  */