correction for dependencies of libgcc unwind code

["Jan Beulich" <JBeulich at novell dot com>]

Built and tested on i686-pc-linux-gnu.

Jan

2004-08-10 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.

---
/home/jbeulich/src/gcc/mainline/2004-08-09.09.08/gcc/Makefile.in	2004-08-09
09:06:34.000000000 +0200
+++ 2004-08-09.09.08/gcc/Makefile.in	2004-08-10 09:09:54.000000000
+0200
@@ -530,7 +530,7 @@ CRTSTUFF_CFLAGS = -O2 $(GCC_CFLAGS) $(IN
 # 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
---
/home/jbeulich/src/gcc/mainline/2004-08-09.09.08/gcc/mklibgcc.in	2004-08-05
08:52:20.000000000 +0200
+++ 2004-08-09.09.08/gcc/mklibgcc.in	2004-08-10 09:04:19.000000000
+0200
@@ -71,11 +71,14 @@ make_compile='$(MAKE) 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}"
---
/home/jbeulich/src/gcc/mainline/2004-08-09.09.08/gcc/tsystem.h	2003-11-05
06:17:16.000000000 +0100
+++ 2004-08-09.09.08/gcc/tsystem.h	2004-08-06 10:23:30.000000000
+0200
@@ -66,6 +66,14 @@ extern void abort (void) __attribute__ (
 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.  */

Attachment: gcc-mainline-unwind.patch
Description: Binary data