Module Name:    src
Committed By:   bouyer
Date:           Sun Mar 18 13:27:41 UTC 2012

Modified Files:
        src/gnu/dist/gcc4/gcc [netbsd-5]: crtstuff.c gcc.c
        src/gnu/dist/gcc4/gcc/config [netbsd-5]: netbsd-elf.h t-netbsd
        src/gnu/lib/libgcc4/arch [netbsd-5]: alpha.mk arm.mk armeb.mk hppa.mk
            i386.mk m68000.mk m68k.mk mipseb.mk mipsel.mk powerpc.mk
            powerpc64.mk sh3eb.mk sh3el.mk sparc.mk sparc64.mk vax.mk x86_64.mk
        src/gnu/usr.bin/gcc4/arch/alpha [netbsd-5]: defs.mk
        src/gnu/usr.bin/gcc4/arch/arm [netbsd-5]: defs.mk
        src/gnu/usr.bin/gcc4/arch/armeb [netbsd-5]: defs.mk
        src/gnu/usr.bin/gcc4/arch/hppa [netbsd-5]: defs.mk
        src/gnu/usr.bin/gcc4/arch/i386 [netbsd-5]: defs.mk
        src/gnu/usr.bin/gcc4/arch/m68000 [netbsd-5]: defs.mk
        src/gnu/usr.bin/gcc4/arch/m68k [netbsd-5]: defs.mk
        src/gnu/usr.bin/gcc4/arch/mipseb [netbsd-5]: defs.mk
        src/gnu/usr.bin/gcc4/arch/mipsel [netbsd-5]: defs.mk
        src/gnu/usr.bin/gcc4/arch/powerpc [netbsd-5]: defs.mk
        src/gnu/usr.bin/gcc4/arch/powerpc64 [netbsd-5]: defs.mk
        src/gnu/usr.bin/gcc4/arch/sh3eb [netbsd-5]: defs.mk
        src/gnu/usr.bin/gcc4/arch/sh3el [netbsd-5]: defs.mk
        src/gnu/usr.bin/gcc4/arch/sparc [netbsd-5]: defs.mk
        src/gnu/usr.bin/gcc4/arch/sparc64 [netbsd-5]: defs.mk
        src/gnu/usr.bin/gcc4/arch/vax [netbsd-5]: defs.mk
        src/gnu/usr.bin/gcc4/arch/x86_64 [netbsd-5]: defs.mk
Added Files:
        src/gnu/dist/gcc4/gcc [netbsd-5]: unwind-dw2-fde-phdr.c

Log Message:
Apply patch, requested by skrll in ticket #1725
        gnu/dist/gcc4/gcc/crtstuff.c                    patch
        gnu/dist/gcc4/gcc/gcc.c                         patch
        gnu/dist/gcc4/gcc/config/netbsd-elf.h           patch
        gnu/dist/gcc4/gcc/config/t-netbsd               patch
        gnu/lib/libgcc4/arch/alpha.mk                   patch
        gnu/lib/libgcc4/arch/arm.mk                     patch
        gnu/lib/libgcc4/arch/armeb.mk                   patch
        gnu/lib/libgcc4/arch/hppa.mk                    patch
        gnu/lib/libgcc4/arch/i386.mk                    patch
        gnu/lib/libgcc4/arch/m68000.mk                  patch
        gnu/lib/libgcc4/arch/m68k.mk                    patch
        gnu/lib/libgcc4/arch/mipseb.mk                  patch
        gnu/lib/libgcc4/arch/mipsel.mk                  patch
        gnu/lib/libgcc4/arch/powerpc.mk                 patch
        gnu/lib/libgcc4/arch/powerpc64.mk               patch
        gnu/lib/libgcc4/arch/sh3eb.mk                   patch
        gnu/lib/libgcc4/arch/sh3el.mk                   patch
        gnu/lib/libgcc4/arch/sparc.mk                   patch
        gnu/lib/libgcc4/arch/sparc64.mk                 patch
        gnu/lib/libgcc4/arch/vax.mk                     patch
        gnu/lib/libgcc4/arch/x86_64.mk                  patch
        gnu/usr.bin/gcc4/arch/alpha/defs.mk             patch
        gnu/usr.bin/gcc4/arch/arm/defs.mk               patch
        gnu/usr.bin/gcc4/arch/armeb/defs.mk             patch
        gnu/usr.bin/gcc4/arch/hppa/defs.mk              patch
        gnu/usr.bin/gcc4/arch/i386/defs.mk              patch
        gnu/usr.bin/gcc4/arch/m68000/defs.mk            patch
        gnu/usr.bin/gcc4/arch/m68k/defs.mk              patch
        gnu/usr.bin/gcc4/arch/mipseb/defs.mk            patch
        gnu/usr.bin/gcc4/arch/mipsel/defs.mk            patch
        gnu/usr.bin/gcc4/arch/powerpc/defs.mk           patch
        gnu/usr.bin/gcc4/arch/powerpc64/defs.mk         patch
        gnu/usr.bin/gcc4/arch/sh3eb/defs.mk             patch
        gnu/usr.bin/gcc4/arch/sh3el/defs.mk             patch
        gnu/usr.bin/gcc4/arch/sparc/defs.mk             patch
        gnu/usr.bin/gcc4/arch/sparc64/defs.mk           patch
        gnu/usr.bin/gcc4/arch/vax/defs.mk               patch
        gnu/usr.bin/gcc4/arch/x86_64/defs.mk            patch
        gnu/dist/gcc4/gcc/unwind-dw2-fde-phdr.c         patch

Instruct gcc to use dl_iterate_phdr to find exception unwind frames.
This avoids the registration/deregistration of frames that can
screwed up if the right set of libraries isn't linked together.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.26.1 src/gnu/dist/gcc4/gcc/crtstuff.c
cvs rdiff -u -r1.4 -r1.4.18.1 src/gnu/dist/gcc4/gcc/gcc.c
cvs rdiff -u -r0 -r1.1.2.1 src/gnu/dist/gcc4/gcc/unwind-dw2-fde-phdr.c
cvs rdiff -u -r1.2 -r1.2.26.1 src/gnu/dist/gcc4/gcc/config/netbsd-elf.h
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.26.1 src/gnu/dist/gcc4/gcc/config/t-netbsd
cvs rdiff -u -r1.3 -r1.3.18.1 src/gnu/lib/libgcc4/arch/alpha.mk \
    src/gnu/lib/libgcc4/arch/x86_64.mk
cvs rdiff -u -r1.3 -r1.3.12.1 src/gnu/lib/libgcc4/arch/arm.mk \
    src/gnu/lib/libgcc4/arch/hppa.mk src/gnu/lib/libgcc4/arch/mipseb.mk \
    src/gnu/lib/libgcc4/arch/mipsel.mk src/gnu/lib/libgcc4/arch/sh3eb.mk \
    src/gnu/lib/libgcc4/arch/sh3el.mk src/gnu/lib/libgcc4/arch/sparc.mk
cvs rdiff -u -r1.4 -r1.4.12.1 src/gnu/lib/libgcc4/arch/armeb.mk \
    src/gnu/lib/libgcc4/arch/sparc64.mk
cvs rdiff -u -r1.5 -r1.5.12.1 src/gnu/lib/libgcc4/arch/i386.mk \
    src/gnu/lib/libgcc4/arch/powerpc.mk
cvs rdiff -u -r1.3 -r1.3.4.1 src/gnu/lib/libgcc4/arch/m68000.mk
cvs rdiff -u -r1.4 -r1.4.4.1 src/gnu/lib/libgcc4/arch/m68k.mk
cvs rdiff -u -r1.2 -r1.2.26.1 src/gnu/lib/libgcc4/arch/powerpc64.mk
cvs rdiff -u -r1.2 -r1.2.12.1 src/gnu/lib/libgcc4/arch/vax.mk
cvs rdiff -u -r1.6 -r1.6.18.1 src/gnu/usr.bin/gcc4/arch/alpha/defs.mk
cvs rdiff -u -r1.5 -r1.5.18.1 src/gnu/usr.bin/gcc4/arch/arm/defs.mk
cvs rdiff -u -r1.6 -r1.6.18.1 src/gnu/usr.bin/gcc4/arch/armeb/defs.mk
cvs rdiff -u -r1.5 -r1.5.18.1 src/gnu/usr.bin/gcc4/arch/hppa/defs.mk
cvs rdiff -u -r1.7 -r1.7.18.1 src/gnu/usr.bin/gcc4/arch/i386/defs.mk
cvs rdiff -u -r1.5 -r1.5.4.1 src/gnu/usr.bin/gcc4/arch/m68000/defs.mk
cvs rdiff -u -r1.6 -r1.6.4.1 src/gnu/usr.bin/gcc4/arch/m68k/defs.mk
cvs rdiff -u -r1.5 -r1.5.18.1 src/gnu/usr.bin/gcc4/arch/mipseb/defs.mk
cvs rdiff -u -r1.6 -r1.6.18.1 src/gnu/usr.bin/gcc4/arch/mipsel/defs.mk
cvs rdiff -u -r1.7 -r1.7.18.1 src/gnu/usr.bin/gcc4/arch/powerpc/defs.mk
cvs rdiff -u -r1.4 -r1.4.18.1 src/gnu/usr.bin/gcc4/arch/powerpc64/defs.mk
cvs rdiff -u -r1.5 -r1.5.18.1 src/gnu/usr.bin/gcc4/arch/sh3eb/defs.mk
cvs rdiff -u -r1.5 -r1.5.18.1 src/gnu/usr.bin/gcc4/arch/sh3el/defs.mk
cvs rdiff -u -r1.5 -r1.5.18.1 src/gnu/usr.bin/gcc4/arch/sparc/defs.mk
cvs rdiff -u -r1.6 -r1.6.18.1 src/gnu/usr.bin/gcc4/arch/sparc64/defs.mk
cvs rdiff -u -r1.5 -r1.5.18.1 src/gnu/usr.bin/gcc4/arch/vax/defs.mk
cvs rdiff -u -r1.5 -r1.5.18.1 src/gnu/usr.bin/gcc4/arch/x86_64/defs.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/gnu/dist/gcc4/gcc/crtstuff.c
diff -u src/gnu/dist/gcc4/gcc/crtstuff.c:1.1.1.1 src/gnu/dist/gcc4/gcc/crtstuff.c:1.1.1.1.26.1
--- src/gnu/dist/gcc4/gcc/crtstuff.c:1.1.1.1	Thu Apr 20 08:44:58 2006
+++ src/gnu/dist/gcc4/gcc/crtstuff.c	Sun Mar 18 13:27:39 2012
@@ -88,10 +88,12 @@ call_ ## FUNC (void)					\
 
 #if defined(OBJECT_FORMAT_ELF) && defined(HAVE_LD_EH_FRAME_HDR) \
     && !defined(inhibit_libc) && !defined(CRTSTUFFT_O) \
-    && defined(__GLIBC__) && __GLIBC__ >= 2
+    && ((defined(__GLIBC__) && __GLIBC__ >= 2) \
+       || defined(__NetBSD__))
 #include <link.h>
 # if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-     || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
+     || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)) \
+     || defined(__NetBSD__))
 #  define USE_PT_GNU_EH_FRAME
 # endif
 #endif

Index: src/gnu/dist/gcc4/gcc/gcc.c
diff -u src/gnu/dist/gcc4/gcc/gcc.c:1.4 src/gnu/dist/gcc4/gcc/gcc.c:1.4.18.1
--- src/gnu/dist/gcc4/gcc/gcc.c:1.4	Thu Jan 11 06:59:53 2007
+++ src/gnu/dist/gcc4/gcc/gcc.c	Sun Mar 18 13:27:39 2012
@@ -1620,14 +1620,15 @@ init_gcc_specs (struct obstack *obstack,
 		"%{!shared:%{!shared-libgcc:", static_name, " ",
 		eh_name, "}%{shared-libgcc:", shared_name, " ",
 		static_name, "}}%{shared:",
-/* XXX NH XXX */
-#if defined(LINK_EH_SPEC) || 1
-		"%{shared-libgcc:", shared_name, "} ",
-		static_name, 
+#ifdef LINK_EH_SPEC
+		"%{shared-libgcc:", shared_name,
+		"}%{!shared-libgcc:", static_name,
 #ifdef LIBGCC_PICSUFFIX
 		LIBGCC_PICSUFFIX ,
 #endif
+		"}"
 #else
+NO NO NO!!!!
 		shared_name,
 #endif
 #endif

Index: src/gnu/dist/gcc4/gcc/config/netbsd-elf.h
diff -u src/gnu/dist/gcc4/gcc/config/netbsd-elf.h:1.2 src/gnu/dist/gcc4/gcc/config/netbsd-elf.h:1.2.26.1
--- src/gnu/dist/gcc4/gcc/config/netbsd-elf.h:1.2	Fri May 12 00:42:13 2006
+++ src/gnu/dist/gcc4/gcc/config/netbsd-elf.h	Sun Mar 18 13:27:39 2012
@@ -93,3 +93,7 @@ Boston, MA 02110-1301, USA.  */
        %{rdynamic:-export-dynamic} \
        %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.elf_so}} \
      %{static:-static}}"
+
+#if defined(HAVE_LD_EH_FRAME_HDR)
+#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
+#endif

Index: src/gnu/dist/gcc4/gcc/config/t-netbsd
diff -u src/gnu/dist/gcc4/gcc/config/t-netbsd:1.1.1.1 src/gnu/dist/gcc4/gcc/config/t-netbsd:1.1.1.1.26.1
--- src/gnu/dist/gcc4/gcc/config/t-netbsd:1.1.1.1	Thu Apr 20 09:39:54 2006
+++ src/gnu/dist/gcc4/gcc/config/t-netbsd	Sun Mar 18 13:27:39 2012
@@ -1,2 +1,7 @@
 # Always build crtstuff with PIC.
 CRTSTUFF_T_CFLAGS = -fPIC
+
+# Use unwind-dw2-fde-phdr
+LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde-phdr.c \
+  $(srcdir)/unwind-sjlj.c $(srcdir)/gthr-gnat.c $(srcdir)/unwind-c.c
+LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h unwind-dw2-fde.c

Index: src/gnu/lib/libgcc4/arch/alpha.mk
diff -u src/gnu/lib/libgcc4/arch/alpha.mk:1.3 src/gnu/lib/libgcc4/arch/alpha.mk:1.3.18.1
--- src/gnu/lib/libgcc4/arch/alpha.mk:1.3	Wed Feb  7 16:52:31 2007
+++ src/gnu/lib/libgcc4/arch/alpha.mk	Sun Mar 18 13:27:39 2012
@@ -4,7 +4,7 @@
 #
 G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I${GNUHOSTDIST}/gcc/../libcpp/include 
 G_LIB2ADD=${GNUHOSTDIST}/gcc/config/alpha/qrnnd.asm
-G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
+G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde-phdr.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
 G_LIB1ASMFUNCS=
 G_LIB1ASMSRC=
 G_LIB2_DIVMOD_FUNCS=_divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
Index: src/gnu/lib/libgcc4/arch/x86_64.mk
diff -u src/gnu/lib/libgcc4/arch/x86_64.mk:1.3 src/gnu/lib/libgcc4/arch/x86_64.mk:1.3.18.1
--- src/gnu/lib/libgcc4/arch/x86_64.mk:1.3	Mon Feb 26 11:57:53 2007
+++ src/gnu/lib/libgcc4/arch/x86_64.mk	Sun Mar 18 13:27:40 2012
@@ -4,7 +4,7 @@
 #
 G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I${GNUHOSTDIST}/gcc/../libcpp/include 
 G_LIB2ADD=
-G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
+G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde-phdr.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
 G_LIB1ASMFUNCS=
 G_LIB1ASMSRC=
 G_LIB2_DIVMOD_FUNCS=_divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4

Index: src/gnu/lib/libgcc4/arch/arm.mk
diff -u src/gnu/lib/libgcc4/arch/arm.mk:1.3 src/gnu/lib/libgcc4/arch/arm.mk:1.3.12.1
--- src/gnu/lib/libgcc4/arch/arm.mk:1.3	Fri Sep 21 10:51:05 2007
+++ src/gnu/lib/libgcc4/arch/arm.mk	Sun Mar 18 13:27:39 2012
@@ -4,7 +4,7 @@
 #
 G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I${GNUHOSTDIST}/gcc/../libcpp/include 
 G_LIB2ADD=
-G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
+G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde-phdr.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
 G_LIB1ASMFUNCS=
 G_LIB1ASMSRC=
 G_LIB2_DIVMOD_FUNCS=_divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
Index: src/gnu/lib/libgcc4/arch/hppa.mk
diff -u src/gnu/lib/libgcc4/arch/hppa.mk:1.3 src/gnu/lib/libgcc4/arch/hppa.mk:1.3.12.1
--- src/gnu/lib/libgcc4/arch/hppa.mk:1.3	Fri Sep 21 10:51:05 2007
+++ src/gnu/lib/libgcc4/arch/hppa.mk	Sun Mar 18 13:27:39 2012
@@ -4,7 +4,7 @@
 #
 G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I${GNUHOSTDIST}/gcc/../libcpp/include 
 G_LIB2ADD=${GNUHOSTDIST}/gcc/config/pa/fptr.c
-G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
+G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde-phdr.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
 G_LIB1ASMFUNCS=_divI _divU _remI _remU _div_const _mulI _dyncall
 G_LIB1ASMSRC=pa/milli64.S
 G_LIB2_DIVMOD_FUNCS=_divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
Index: src/gnu/lib/libgcc4/arch/mipseb.mk
diff -u src/gnu/lib/libgcc4/arch/mipseb.mk:1.3 src/gnu/lib/libgcc4/arch/mipseb.mk:1.3.12.1
--- src/gnu/lib/libgcc4/arch/mipseb.mk:1.3	Fri Sep 21 10:51:06 2007
+++ src/gnu/lib/libgcc4/arch/mipseb.mk	Sun Mar 18 13:27:39 2012
@@ -4,7 +4,7 @@
 #
 G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I${GNUHOSTDIST}/gcc/../libcpp/include 
 G_LIB2ADD=
-G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
+G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde-phdr.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
 G_LIB1ASMFUNCS=
 G_LIB1ASMSRC=
 G_LIB2_DIVMOD_FUNCS=_divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
Index: src/gnu/lib/libgcc4/arch/mipsel.mk
diff -u src/gnu/lib/libgcc4/arch/mipsel.mk:1.3 src/gnu/lib/libgcc4/arch/mipsel.mk:1.3.12.1
--- src/gnu/lib/libgcc4/arch/mipsel.mk:1.3	Fri Sep 21 10:51:06 2007
+++ src/gnu/lib/libgcc4/arch/mipsel.mk	Sun Mar 18 13:27:39 2012
@@ -4,7 +4,7 @@
 #
 G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I${GNUHOSTDIST}/gcc/../libcpp/include 
 G_LIB2ADD=
-G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
+G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde-phdr.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
 G_LIB1ASMFUNCS=
 G_LIB1ASMSRC=
 G_LIB2_DIVMOD_FUNCS=_divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
Index: src/gnu/lib/libgcc4/arch/sh3eb.mk
diff -u src/gnu/lib/libgcc4/arch/sh3eb.mk:1.3 src/gnu/lib/libgcc4/arch/sh3eb.mk:1.3.12.1
--- src/gnu/lib/libgcc4/arch/sh3eb.mk:1.3	Fri Sep 21 10:51:06 2007
+++ src/gnu/lib/libgcc4/arch/sh3eb.mk	Sun Mar 18 13:27:39 2012
@@ -4,7 +4,7 @@
 #
 G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I${GNUHOSTDIST}/gcc/../libcpp/include 
 G_LIB2ADD=
-G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
+G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde-phdr.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
 G_LIB1ASMFUNCS=_ashiftrt _ashiftrt_n _ashiftlt _lshiftrt _movmem _movmem_i4 _mulsi3 _sdivsi3 _sdivsi3_i4 _udivsi3 _udivsi3_i4 _set_fpscr 
 G_LIB1ASMSRC=sh/lib1funcs.asm
 G_LIB2_DIVMOD_FUNCS=_divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
Index: src/gnu/lib/libgcc4/arch/sh3el.mk
diff -u src/gnu/lib/libgcc4/arch/sh3el.mk:1.3 src/gnu/lib/libgcc4/arch/sh3el.mk:1.3.12.1
--- src/gnu/lib/libgcc4/arch/sh3el.mk:1.3	Fri Sep 21 10:51:06 2007
+++ src/gnu/lib/libgcc4/arch/sh3el.mk	Sun Mar 18 13:27:39 2012
@@ -4,7 +4,7 @@
 #
 G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I${GNUHOSTDIST}/gcc/../libcpp/include 
 G_LIB2ADD=
-G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
+G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde-phdr.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
 G_LIB1ASMFUNCS=_ashiftrt _ashiftrt_n _ashiftlt _lshiftrt _movmem _movmem_i4 _mulsi3 _sdivsi3 _sdivsi3_i4 _udivsi3 _udivsi3_i4 _set_fpscr 
 G_LIB1ASMSRC=sh/lib1funcs.asm
 G_LIB2_DIVMOD_FUNCS=_divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
Index: src/gnu/lib/libgcc4/arch/sparc.mk
diff -u src/gnu/lib/libgcc4/arch/sparc.mk:1.3 src/gnu/lib/libgcc4/arch/sparc.mk:1.3.12.1
--- src/gnu/lib/libgcc4/arch/sparc.mk:1.3	Fri Sep 21 10:51:07 2007
+++ src/gnu/lib/libgcc4/arch/sparc.mk	Sun Mar 18 13:27:39 2012
@@ -4,7 +4,7 @@
 #
 G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I${GNUHOSTDIST}/gcc/../libcpp/include 
 G_LIB2ADD=
-G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
+G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde-phdr.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
 G_LIB1ASMFUNCS=
 G_LIB1ASMSRC=
 G_LIB2_DIVMOD_FUNCS=_divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4

Index: src/gnu/lib/libgcc4/arch/armeb.mk
diff -u src/gnu/lib/libgcc4/arch/armeb.mk:1.4 src/gnu/lib/libgcc4/arch/armeb.mk:1.4.12.1
--- src/gnu/lib/libgcc4/arch/armeb.mk:1.4	Fri Sep 21 10:51:05 2007
+++ src/gnu/lib/libgcc4/arch/armeb.mk	Sun Mar 18 13:27:39 2012
@@ -4,7 +4,7 @@
 #
 G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I${GNUHOSTDIST}/gcc/../libcpp/include 
 G_LIB2ADD=
-G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
+G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde-phdr.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
 G_LIB1ASMFUNCS=
 G_LIB1ASMSRC=
 G_LIB2_DIVMOD_FUNCS=_divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
Index: src/gnu/lib/libgcc4/arch/sparc64.mk
diff -u src/gnu/lib/libgcc4/arch/sparc64.mk:1.4 src/gnu/lib/libgcc4/arch/sparc64.mk:1.4.12.1
--- src/gnu/lib/libgcc4/arch/sparc64.mk:1.4	Fri Sep 21 10:51:07 2007
+++ src/gnu/lib/libgcc4/arch/sparc64.mk	Sun Mar 18 13:27:39 2012
@@ -4,7 +4,7 @@
 #
 G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I${GNUHOSTDIST}/gcc/../libcpp/include 
 G_LIB2ADD=
-G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
+G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde-phdr.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
 G_LIB1ASMFUNCS=
 G_LIB1ASMSRC=
 G_LIB2_DIVMOD_FUNCS=_divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4

Index: src/gnu/lib/libgcc4/arch/i386.mk
diff -u src/gnu/lib/libgcc4/arch/i386.mk:1.5 src/gnu/lib/libgcc4/arch/i386.mk:1.5.12.1
--- src/gnu/lib/libgcc4/arch/i386.mk:1.5	Fri Sep 21 10:51:05 2007
+++ src/gnu/lib/libgcc4/arch/i386.mk	Sun Mar 18 13:27:39 2012
@@ -4,7 +4,7 @@
 #
 G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I${GNUHOSTDIST}/gcc/../libcpp/include 
 G_LIB2ADD=
-G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
+G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde-phdr.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
 G_LIB1ASMFUNCS=
 G_LIB1ASMSRC=
 G_LIB2_DIVMOD_FUNCS=_divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
Index: src/gnu/lib/libgcc4/arch/powerpc.mk
diff -u src/gnu/lib/libgcc4/arch/powerpc.mk:1.5 src/gnu/lib/libgcc4/arch/powerpc.mk:1.5.12.1
--- src/gnu/lib/libgcc4/arch/powerpc.mk:1.5	Fri Sep 21 10:51:06 2007
+++ src/gnu/lib/libgcc4/arch/powerpc.mk	Sun Mar 18 13:27:39 2012
@@ -4,7 +4,7 @@
 #
 G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I${GNUHOSTDIST}/gcc/../libcpp/include 
 G_LIB2ADD=${GNUHOSTDIST}/gcc/config/rs6000/tramp.asm
-G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
+G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde-phdr.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
 G_LIB1ASMFUNCS=
 G_LIB1ASMSRC=
 G_LIB2_DIVMOD_FUNCS=_divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4

Index: src/gnu/lib/libgcc4/arch/m68000.mk
diff -u src/gnu/lib/libgcc4/arch/m68000.mk:1.3 src/gnu/lib/libgcc4/arch/m68000.mk:1.3.4.1
--- src/gnu/lib/libgcc4/arch/m68000.mk:1.3	Mon Sep  1 23:52:24 2008
+++ src/gnu/lib/libgcc4/arch/m68000.mk	Sun Mar 18 13:27:39 2012
@@ -4,7 +4,7 @@
 #
 G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I${GNUHOSTDIST}/gcc/../libcpp/include 
 G_LIB2ADD=fpgnulib.c xfgnulib.c
-G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
+G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde-phdr.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
 G_LIB1ASMFUNCS=_mulsi3 _udivsi3 _divsi3 _umodsi3 _modsi3 _double _float _floatex _eqdf2 _nedf2 _gtdf2 _gedf2 _ltdf2 _ledf2 _eqsf2 _nesf2 _gtsf2 _gesf2 _ltsf2 _lesf2
 G_LIB1ASMSRC=m68k/lb1sf68.asm
 G_LIB2_DIVMOD_FUNCS=_divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4

Index: src/gnu/lib/libgcc4/arch/m68k.mk
diff -u src/gnu/lib/libgcc4/arch/m68k.mk:1.4 src/gnu/lib/libgcc4/arch/m68k.mk:1.4.4.1
--- src/gnu/lib/libgcc4/arch/m68k.mk:1.4	Sun Aug 24 08:51:11 2008
+++ src/gnu/lib/libgcc4/arch/m68k.mk	Sun Mar 18 13:27:39 2012
@@ -4,7 +4,7 @@
 #
 G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I${GNUHOSTDIST}/gcc/../libcpp/include 
 G_LIB2ADD=
-G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
+G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde-phdr.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
 G_LIB1ASMFUNCS=
 G_LIB1ASMSRC=
 G_LIB2_DIVMOD_FUNCS=_divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4

Index: src/gnu/lib/libgcc4/arch/powerpc64.mk
diff -u src/gnu/lib/libgcc4/arch/powerpc64.mk:1.2 src/gnu/lib/libgcc4/arch/powerpc64.mk:1.2.26.1
--- src/gnu/lib/libgcc4/arch/powerpc64.mk:1.2	Sun Jul  2 22:12:09 2006
+++ src/gnu/lib/libgcc4/arch/powerpc64.mk	Sun Mar 18 13:27:39 2012
@@ -4,7 +4,7 @@
 #
 G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I${GNUHOSTDIST}/gcc/../libcpp/include 
 G_LIB2ADD=${GNUHOSTDIST}/gcc/config/rs6000/tramp.asm ${GNUHOSTDIST}/gcc/config/rs6000/ppc64-fp.c ${GNUHOSTDIST}/gcc/config/rs6000/darwin-ldouble.c
-G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
+G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde-phdr.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
 G_LIB1ASMFUNCS=
 G_LIB1ASMSRC=
 G_LIB2_DIVMOD_FUNCS=_divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4

Index: src/gnu/lib/libgcc4/arch/vax.mk
diff -u src/gnu/lib/libgcc4/arch/vax.mk:1.2 src/gnu/lib/libgcc4/arch/vax.mk:1.2.12.1
--- src/gnu/lib/libgcc4/arch/vax.mk:1.2	Fri Sep 21 10:51:07 2007
+++ src/gnu/lib/libgcc4/arch/vax.mk	Sun Mar 18 13:27:39 2012
@@ -4,7 +4,7 @@
 #
 G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I${GNUHOSTDIST}/gcc/../libcpp/include 
 G_LIB2ADD=
-G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
+G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde-phdr.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
 G_LIB1ASMFUNCS=
 G_LIB1ASMSRC=
 G_LIB2_DIVMOD_FUNCS=_divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4

Index: src/gnu/usr.bin/gcc4/arch/alpha/defs.mk
diff -u src/gnu/usr.bin/gcc4/arch/alpha/defs.mk:1.6 src/gnu/usr.bin/gcc4/arch/alpha/defs.mk:1.6.18.1
--- src/gnu/usr.bin/gcc4/arch/alpha/defs.mk:1.6	Thu Jun 21 16:58:45 2007
+++ src/gnu/usr.bin/gcc4/arch/alpha/defs.mk	Sun Mar 18 13:27:40 2012
@@ -42,7 +42,7 @@ G_tm_file_list=options.h ${GNUHOSTDIST}/
 G_build_xm_include_list=auto-build.h ansidecl.h
 G_lang_specs_files=${GNUHOSTDIST}/gcc/cp/lang-specs.h ${GNUHOSTDIST}/gcc/objc/lang-specs.h
 G_tm_p_include_list=config/alpha/alpha-protos.h tm-preds.h
-G_LIB2ADDEHDEP=${GNUHOSTDIST}/gcc/unwind-generic.h unwind-pe.h  unwind-dw2-fde.h unwind-dw2.h
+G_LIB2ADDEHDEP= unwind-dw2-fde.h unwind-dw2-fde.c
 G_CXX_OBJS=cp-lang.o stub-objc.o call.o decl.o expr.o pt.o typeck2.o class.o decl2.o error.o lex.o parser.o ptree.o rtti.o typeck.o cvt.o except.o friend.o init.o method.o search.o semantics.o tree.o repo.o dump.o optimize.o mangle.o cp-objcp-common.o name-lookup.o cxx-pretty-print.o cp-gimplify.o tree-mudflap.o attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o  c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_CXX_C_OBJS=attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o  c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_F77_OBJS=

Index: src/gnu/usr.bin/gcc4/arch/arm/defs.mk
diff -u src/gnu/usr.bin/gcc4/arch/arm/defs.mk:1.5 src/gnu/usr.bin/gcc4/arch/arm/defs.mk:1.5.18.1
--- src/gnu/usr.bin/gcc4/arch/arm/defs.mk:1.5	Thu Jun 21 16:58:45 2007
+++ src/gnu/usr.bin/gcc4/arch/arm/defs.mk	Sun Mar 18 13:27:40 2012
@@ -42,7 +42,7 @@ G_tm_file_list=options.h ${GNUHOSTDIST}/
 G_build_xm_include_list=auto-build.h ansidecl.h
 G_lang_specs_files=${GNUHOSTDIST}/gcc/cp/lang-specs.h ${GNUHOSTDIST}/gcc/objc/lang-specs.h
 G_tm_p_include_list=config/arm/arm-protos.h tm-preds.h
-G_LIB2ADDEHDEP=${GNUHOSTDIST}/gcc/unwind-generic.h unwind-pe.h  unwind-dw2-fde.h unwind-dw2.h
+G_LIB2ADDEHDEP= unwind-dw2-fde.h unwind-dw2-fde.c
 G_CXX_OBJS=cp-lang.o stub-objc.o call.o decl.o expr.o pt.o typeck2.o class.o decl2.o error.o lex.o parser.o ptree.o rtti.o typeck.o cvt.o except.o friend.o init.o method.o search.o semantics.o tree.o repo.o dump.o optimize.o mangle.o cp-objcp-common.o name-lookup.o cxx-pretty-print.o cp-gimplify.o tree-mudflap.o attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o  c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_CXX_C_OBJS=attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o  c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_F77_OBJS=

Index: src/gnu/usr.bin/gcc4/arch/armeb/defs.mk
diff -u src/gnu/usr.bin/gcc4/arch/armeb/defs.mk:1.6 src/gnu/usr.bin/gcc4/arch/armeb/defs.mk:1.6.18.1
--- src/gnu/usr.bin/gcc4/arch/armeb/defs.mk:1.6	Thu Jun 21 16:58:46 2007
+++ src/gnu/usr.bin/gcc4/arch/armeb/defs.mk	Sun Mar 18 13:27:40 2012
@@ -42,7 +42,7 @@ G_tm_file_list=options.h ${GNUHOSTDIST}/
 G_build_xm_include_list=auto-build.h ansidecl.h
 G_lang_specs_files=${GNUHOSTDIST}/gcc/cp/lang-specs.h ${GNUHOSTDIST}/gcc/objc/lang-specs.h
 G_tm_p_include_list=config/arm/arm-protos.h tm-preds.h
-G_LIB2ADDEHDEP=${GNUHOSTDIST}/gcc/unwind-generic.h unwind-pe.h  unwind-dw2-fde.h unwind-dw2.h
+G_LIB2ADDEHDEP= unwind-dw2-fde.h unwind-dw2-fde.c
 G_CXX_OBJS=cp-lang.o stub-objc.o call.o decl.o expr.o pt.o typeck2.o class.o decl2.o error.o lex.o parser.o ptree.o rtti.o typeck.o cvt.o except.o friend.o init.o method.o search.o semantics.o tree.o repo.o dump.o optimize.o mangle.o cp-objcp-common.o name-lookup.o cxx-pretty-print.o cp-gimplify.o tree-mudflap.o attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o  c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_CXX_C_OBJS=attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o  c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_F77_OBJS=

Index: src/gnu/usr.bin/gcc4/arch/hppa/defs.mk
diff -u src/gnu/usr.bin/gcc4/arch/hppa/defs.mk:1.5 src/gnu/usr.bin/gcc4/arch/hppa/defs.mk:1.5.18.1
--- src/gnu/usr.bin/gcc4/arch/hppa/defs.mk:1.5	Thu Jun 21 16:58:46 2007
+++ src/gnu/usr.bin/gcc4/arch/hppa/defs.mk	Sun Mar 18 13:27:40 2012
@@ -1,5 +1,5 @@
 # This file is automatically generated.  DO NOT EDIT!
-# Generated from: 	NetBSD: mknative-gcc,v 1.22 2006/06/25 03:06:15 mrg Exp 
+# Generated from: 	NetBSD: mknative-gcc,v 1.45 2009/12/17 15:48:13 uebayasi Exp 
 # Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp 
 #
 G_BUILD_EARLY_SUPPORT=gensupport.o dummy-conditions.o
@@ -42,7 +42,7 @@ G_tm_file_list=options.h ${GNUHOSTDIST}/
 G_build_xm_include_list=auto-build.h ansidecl.h
 G_lang_specs_files=${GNUHOSTDIST}/gcc/cp/lang-specs.h ${GNUHOSTDIST}/gcc/objc/lang-specs.h
 G_tm_p_include_list=config/pa/pa-protos.h tm-preds.h
-G_LIB2ADDEHDEP=${GNUHOSTDIST}/gcc/unwind-generic.h unwind-pe.h  unwind-dw2-fde.h unwind-dw2.h
+G_LIB2ADDEHDEP= unwind-dw2-fde.h unwind-dw2-fde.c
 G_CXX_OBJS=cp-lang.o stub-objc.o call.o decl.o expr.o pt.o typeck2.o class.o decl2.o error.o lex.o parser.o ptree.o rtti.o typeck.o cvt.o except.o friend.o init.o method.o search.o semantics.o tree.o repo.o dump.o optimize.o mangle.o cp-objcp-common.o name-lookup.o cxx-pretty-print.o cp-gimplify.o tree-mudflap.o attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o  c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_CXX_C_OBJS=attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o  c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_F77_OBJS=

Index: src/gnu/usr.bin/gcc4/arch/i386/defs.mk
diff -u src/gnu/usr.bin/gcc4/arch/i386/defs.mk:1.7 src/gnu/usr.bin/gcc4/arch/i386/defs.mk:1.7.18.1
--- src/gnu/usr.bin/gcc4/arch/i386/defs.mk:1.7	Thu Jun 21 16:58:47 2007
+++ src/gnu/usr.bin/gcc4/arch/i386/defs.mk	Sun Mar 18 13:27:40 2012
@@ -42,7 +42,7 @@ G_tm_file_list=options.h ${GNUHOSTDIST}/
 G_build_xm_include_list=auto-build.h ansidecl.h
 G_lang_specs_files=${GNUHOSTDIST}/gcc/cp/lang-specs.h ${GNUHOSTDIST}/gcc/objc/lang-specs.h
 G_tm_p_include_list=config/i386/i386-protos.h tm-preds.h
-G_LIB2ADDEHDEP=${GNUHOSTDIST}/gcc/unwind-generic.h unwind-pe.h  unwind-dw2-fde.h unwind-dw2.h
+G_LIB2ADDEHDEP= unwind-dw2-fde.h unwind-dw2-fde.c
 G_CXX_OBJS=cp-lang.o stub-objc.o call.o decl.o expr.o pt.o typeck2.o class.o decl2.o error.o lex.o parser.o ptree.o rtti.o typeck.o cvt.o except.o friend.o init.o method.o search.o semantics.o tree.o repo.o dump.o optimize.o mangle.o cp-objcp-common.o name-lookup.o cxx-pretty-print.o cp-gimplify.o tree-mudflap.o attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o  c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_CXX_C_OBJS=attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o  c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_F77_OBJS=

Index: src/gnu/usr.bin/gcc4/arch/m68000/defs.mk
diff -u src/gnu/usr.bin/gcc4/arch/m68000/defs.mk:1.5 src/gnu/usr.bin/gcc4/arch/m68000/defs.mk:1.5.4.1
--- src/gnu/usr.bin/gcc4/arch/m68000/defs.mk:1.5	Mon Sep  1 23:52:24 2008
+++ src/gnu/usr.bin/gcc4/arch/m68000/defs.mk	Sun Mar 18 13:27:40 2012
@@ -42,7 +42,7 @@ G_tm_file_list=options.h ${GNUHOSTDIST}/
 G_build_xm_include_list=auto-build.h ansidecl.h
 G_lang_specs_files=${GNUHOSTDIST}/gcc/cp/lang-specs.h ${GNUHOSTDIST}/gcc/objc/lang-specs.h
 G_tm_p_include_list=config/m68k/m68k-protos.h tm-preds.h
-G_LIB2ADDEHDEP=${GNUHOSTDIST}/gcc/unwind-generic.h unwind-pe.h  unwind-dw2-fde.h unwind-dw2.h
+G_LIB2ADDEHDEP= unwind-dw2-fde.h unwind-dw2-fde.c
 G_CXX_OBJS=cp-lang.o stub-objc.o call.o decl.o expr.o pt.o typeck2.o class.o decl2.o error.o lex.o parser.o ptree.o rtti.o typeck.o cvt.o except.o friend.o init.o method.o search.o semantics.o tree.o repo.o dump.o optimize.o mangle.o cp-objcp-common.o name-lookup.o cxx-pretty-print.o cp-gimplify.o tree-mudflap.o attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o  c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_CXX_C_OBJS=attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o  c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_F77_OBJS=

Index: src/gnu/usr.bin/gcc4/arch/m68k/defs.mk
diff -u src/gnu/usr.bin/gcc4/arch/m68k/defs.mk:1.6 src/gnu/usr.bin/gcc4/arch/m68k/defs.mk:1.6.4.1
--- src/gnu/usr.bin/gcc4/arch/m68k/defs.mk:1.6	Sun Aug 24 08:51:11 2008
+++ src/gnu/usr.bin/gcc4/arch/m68k/defs.mk	Sun Mar 18 13:27:40 2012
@@ -42,7 +42,7 @@ G_tm_file_list=options.h ${GNUHOSTDIST}/
 G_build_xm_include_list=auto-build.h ansidecl.h
 G_lang_specs_files=${GNUHOSTDIST}/gcc/cp/lang-specs.h ${GNUHOSTDIST}/gcc/objc/lang-specs.h
 G_tm_p_include_list=config/m68k/m68k-protos.h tm-preds.h
-G_LIB2ADDEHDEP=${GNUHOSTDIST}/gcc/unwind-generic.h unwind-pe.h  unwind-dw2-fde.h unwind-dw2.h
+G_LIB2ADDEHDEP= unwind-dw2-fde.h unwind-dw2-fde.c
 G_CXX_OBJS=cp-lang.o stub-objc.o call.o decl.o expr.o pt.o typeck2.o class.o decl2.o error.o lex.o parser.o ptree.o rtti.o typeck.o cvt.o except.o friend.o init.o method.o search.o semantics.o tree.o repo.o dump.o optimize.o mangle.o cp-objcp-common.o name-lookup.o cxx-pretty-print.o cp-gimplify.o tree-mudflap.o attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o  c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_CXX_C_OBJS=attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o  c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_F77_OBJS=

Index: src/gnu/usr.bin/gcc4/arch/mipseb/defs.mk
diff -u src/gnu/usr.bin/gcc4/arch/mipseb/defs.mk:1.5 src/gnu/usr.bin/gcc4/arch/mipseb/defs.mk:1.5.18.1
--- src/gnu/usr.bin/gcc4/arch/mipseb/defs.mk:1.5	Thu Jun 21 16:58:47 2007
+++ src/gnu/usr.bin/gcc4/arch/mipseb/defs.mk	Sun Mar 18 13:27:40 2012
@@ -42,7 +42,7 @@ G_tm_file_list=options.h ${GNUHOSTDIST}/
 G_build_xm_include_list=auto-build.h ansidecl.h
 G_lang_specs_files=${GNUHOSTDIST}/gcc/cp/lang-specs.h ${GNUHOSTDIST}/gcc/objc/lang-specs.h
 G_tm_p_include_list=config/mips/mips-protos.h tm-preds.h
-G_LIB2ADDEHDEP=${GNUHOSTDIST}/gcc/unwind-generic.h unwind-pe.h  unwind-dw2-fde.h unwind-dw2.h
+G_LIB2ADDEHDEP= unwind-dw2-fde.h unwind-dw2-fde.c
 G_CXX_OBJS=cp-lang.o stub-objc.o call.o decl.o expr.o pt.o typeck2.o class.o decl2.o error.o lex.o parser.o ptree.o rtti.o typeck.o cvt.o except.o friend.o init.o method.o search.o semantics.o tree.o repo.o dump.o optimize.o mangle.o cp-objcp-common.o name-lookup.o cxx-pretty-print.o cp-gimplify.o tree-mudflap.o attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o  c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_CXX_C_OBJS=attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o  c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_F77_OBJS=

Index: src/gnu/usr.bin/gcc4/arch/mipsel/defs.mk
diff -u src/gnu/usr.bin/gcc4/arch/mipsel/defs.mk:1.6 src/gnu/usr.bin/gcc4/arch/mipsel/defs.mk:1.6.18.1
--- src/gnu/usr.bin/gcc4/arch/mipsel/defs.mk:1.6	Thu Jun 21 16:58:47 2007
+++ src/gnu/usr.bin/gcc4/arch/mipsel/defs.mk	Sun Mar 18 13:27:41 2012
@@ -42,7 +42,7 @@ G_tm_file_list=options.h ${GNUHOSTDIST}/
 G_build_xm_include_list=auto-build.h ansidecl.h
 G_lang_specs_files=${GNUHOSTDIST}/gcc/cp/lang-specs.h ${GNUHOSTDIST}/gcc/objc/lang-specs.h
 G_tm_p_include_list=config/mips/mips-protos.h tm-preds.h
-G_LIB2ADDEHDEP=${GNUHOSTDIST}/gcc/unwind-generic.h unwind-pe.h  unwind-dw2-fde.h unwind-dw2.h
+G_LIB2ADDEHDEP= unwind-dw2-fde.h unwind-dw2-fde.c
 G_CXX_OBJS=cp-lang.o stub-objc.o call.o decl.o expr.o pt.o typeck2.o class.o decl2.o error.o lex.o parser.o ptree.o rtti.o typeck.o cvt.o except.o friend.o init.o method.o search.o semantics.o tree.o repo.o dump.o optimize.o mangle.o cp-objcp-common.o name-lookup.o cxx-pretty-print.o cp-gimplify.o tree-mudflap.o attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o  c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_CXX_C_OBJS=attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o  c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_F77_OBJS=

Index: src/gnu/usr.bin/gcc4/arch/powerpc/defs.mk
diff -u src/gnu/usr.bin/gcc4/arch/powerpc/defs.mk:1.7 src/gnu/usr.bin/gcc4/arch/powerpc/defs.mk:1.7.18.1
--- src/gnu/usr.bin/gcc4/arch/powerpc/defs.mk:1.7	Thu Jun 21 16:58:48 2007
+++ src/gnu/usr.bin/gcc4/arch/powerpc/defs.mk	Sun Mar 18 13:27:41 2012
@@ -42,7 +42,7 @@ G_tm_file_list=options.h ${GNUHOSTDIST}/
 G_build_xm_include_list=auto-build.h ansidecl.h
 G_lang_specs_files=${GNUHOSTDIST}/gcc/cp/lang-specs.h ${GNUHOSTDIST}/gcc/objc/lang-specs.h
 G_tm_p_include_list=config/rs6000/rs6000-protos.h tm-preds.h
-G_LIB2ADDEHDEP=${GNUHOSTDIST}/gcc/unwind-generic.h unwind-pe.h  unwind-dw2-fde.h unwind-dw2.h
+G_LIB2ADDEHDEP= unwind-dw2-fde.h unwind-dw2-fde.c
 G_CXX_OBJS=cp-lang.o stub-objc.o call.o decl.o expr.o pt.o typeck2.o class.o decl2.o error.o lex.o parser.o ptree.o rtti.o typeck.o cvt.o except.o friend.o init.o method.o search.o semantics.o tree.o repo.o dump.o optimize.o mangle.o cp-objcp-common.o name-lookup.o cxx-pretty-print.o cp-gimplify.o tree-mudflap.o attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o rs6000-c.o c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_CXX_C_OBJS=attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o rs6000-c.o c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_F77_OBJS=

Index: src/gnu/usr.bin/gcc4/arch/powerpc64/defs.mk
diff -u src/gnu/usr.bin/gcc4/arch/powerpc64/defs.mk:1.4 src/gnu/usr.bin/gcc4/arch/powerpc64/defs.mk:1.4.18.1
--- src/gnu/usr.bin/gcc4/arch/powerpc64/defs.mk:1.4	Thu Jun 21 16:58:48 2007
+++ src/gnu/usr.bin/gcc4/arch/powerpc64/defs.mk	Sun Mar 18 13:27:41 2012
@@ -42,7 +42,7 @@ G_tm_file_list=options.h ${GNUHOSTDIST}/
 G_build_xm_include_list=auto-build.h ansidecl.h
 G_lang_specs_files=${GNUHOSTDIST}/gcc/cp/lang-specs.h ${GNUHOSTDIST}/gcc/objc/lang-specs.h
 G_tm_p_include_list=config/rs6000/rs6000-protos.h tm-preds.h
-G_LIB2ADDEHDEP=${GNUHOSTDIST}/gcc/unwind-generic.h unwind-pe.h  unwind-dw2-fde.h unwind-dw2.h
+G_LIB2ADDEHDEP= unwind-dw2-fde.h unwind-dw2-fde.c
 G_CXX_OBJS=cp-lang.o stub-objc.o call.o decl.o expr.o pt.o typeck2.o class.o decl2.o error.o lex.o parser.o ptree.o rtti.o typeck.o cvt.o except.o friend.o init.o method.o search.o semantics.o tree.o repo.o dump.o optimize.o mangle.o cp-objcp-common.o name-lookup.o cxx-pretty-print.o cp-gimplify.o tree-mudflap.o attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o rs6000-c.o c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_CXX_C_OBJS=attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o rs6000-c.o c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_F77_OBJS=

Index: src/gnu/usr.bin/gcc4/arch/sh3eb/defs.mk
diff -u src/gnu/usr.bin/gcc4/arch/sh3eb/defs.mk:1.5 src/gnu/usr.bin/gcc4/arch/sh3eb/defs.mk:1.5.18.1
--- src/gnu/usr.bin/gcc4/arch/sh3eb/defs.mk:1.5	Thu Jun 21 16:58:48 2007
+++ src/gnu/usr.bin/gcc4/arch/sh3eb/defs.mk	Sun Mar 18 13:27:41 2012
@@ -42,7 +42,7 @@ G_tm_file_list=options.h ${GNUHOSTDIST}/
 G_build_xm_include_list=auto-build.h ansidecl.h
 G_lang_specs_files=${GNUHOSTDIST}/gcc/cp/lang-specs.h ${GNUHOSTDIST}/gcc/objc/lang-specs.h
 G_tm_p_include_list=config/sh/sh-protos.h tm-preds.h
-G_LIB2ADDEHDEP=${GNUHOSTDIST}/gcc/unwind-generic.h unwind-pe.h  unwind-dw2-fde.h unwind-dw2.h
+G_LIB2ADDEHDEP= unwind-dw2-fde.h unwind-dw2-fde.c
 G_CXX_OBJS=cp-lang.o stub-objc.o call.o decl.o expr.o pt.o typeck2.o class.o decl2.o error.o lex.o parser.o ptree.o rtti.o typeck.o cvt.o except.o friend.o init.o method.o search.o semantics.o tree.o repo.o dump.o optimize.o mangle.o cp-objcp-common.o name-lookup.o cxx-pretty-print.o cp-gimplify.o tree-mudflap.o attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o sh-c.o c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_CXX_C_OBJS=attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o sh-c.o c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_F77_OBJS=

Index: src/gnu/usr.bin/gcc4/arch/sh3el/defs.mk
diff -u src/gnu/usr.bin/gcc4/arch/sh3el/defs.mk:1.5 src/gnu/usr.bin/gcc4/arch/sh3el/defs.mk:1.5.18.1
--- src/gnu/usr.bin/gcc4/arch/sh3el/defs.mk:1.5	Thu Jun 21 16:58:49 2007
+++ src/gnu/usr.bin/gcc4/arch/sh3el/defs.mk	Sun Mar 18 13:27:41 2012
@@ -42,7 +42,7 @@ G_tm_file_list=options.h ${GNUHOSTDIST}/
 G_build_xm_include_list=auto-build.h ansidecl.h
 G_lang_specs_files=${GNUHOSTDIST}/gcc/cp/lang-specs.h ${GNUHOSTDIST}/gcc/objc/lang-specs.h
 G_tm_p_include_list=config/sh/sh-protos.h tm-preds.h
-G_LIB2ADDEHDEP=${GNUHOSTDIST}/gcc/unwind-generic.h unwind-pe.h  unwind-dw2-fde.h unwind-dw2.h
+G_LIB2ADDEHDEP= unwind-dw2-fde.h unwind-dw2-fde.c
 G_CXX_OBJS=cp-lang.o stub-objc.o call.o decl.o expr.o pt.o typeck2.o class.o decl2.o error.o lex.o parser.o ptree.o rtti.o typeck.o cvt.o except.o friend.o init.o method.o search.o semantics.o tree.o repo.o dump.o optimize.o mangle.o cp-objcp-common.o name-lookup.o cxx-pretty-print.o cp-gimplify.o tree-mudflap.o attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o sh-c.o c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_CXX_C_OBJS=attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o sh-c.o c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_F77_OBJS=

Index: src/gnu/usr.bin/gcc4/arch/sparc/defs.mk
diff -u src/gnu/usr.bin/gcc4/arch/sparc/defs.mk:1.5 src/gnu/usr.bin/gcc4/arch/sparc/defs.mk:1.5.18.1
--- src/gnu/usr.bin/gcc4/arch/sparc/defs.mk:1.5	Thu Jun 21 16:58:49 2007
+++ src/gnu/usr.bin/gcc4/arch/sparc/defs.mk	Sun Mar 18 13:27:41 2012
@@ -42,7 +42,7 @@ G_tm_file_list=options.h ${GNUHOSTDIST}/
 G_build_xm_include_list=auto-build.h ansidecl.h
 G_lang_specs_files=${GNUHOSTDIST}/gcc/cp/lang-specs.h ${GNUHOSTDIST}/gcc/objc/lang-specs.h
 G_tm_p_include_list=config/sparc/sparc-protos.h tm-preds.h
-G_LIB2ADDEHDEP=${GNUHOSTDIST}/gcc/unwind-generic.h unwind-pe.h  unwind-dw2-fde.h unwind-dw2.h
+G_LIB2ADDEHDEP= unwind-dw2-fde.h unwind-dw2-fde.c
 G_CXX_OBJS=cp-lang.o stub-objc.o call.o decl.o expr.o pt.o typeck2.o class.o decl2.o error.o lex.o parser.o ptree.o rtti.o typeck.o cvt.o except.o friend.o init.o method.o search.o semantics.o tree.o repo.o dump.o optimize.o mangle.o cp-objcp-common.o name-lookup.o cxx-pretty-print.o cp-gimplify.o tree-mudflap.o attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o  c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_CXX_C_OBJS=attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o  c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_F77_OBJS=

Index: src/gnu/usr.bin/gcc4/arch/sparc64/defs.mk
diff -u src/gnu/usr.bin/gcc4/arch/sparc64/defs.mk:1.6 src/gnu/usr.bin/gcc4/arch/sparc64/defs.mk:1.6.18.1
--- src/gnu/usr.bin/gcc4/arch/sparc64/defs.mk:1.6	Thu Jun 21 16:58:49 2007
+++ src/gnu/usr.bin/gcc4/arch/sparc64/defs.mk	Sun Mar 18 13:27:41 2012
@@ -42,7 +42,7 @@ G_tm_file_list=options.h ${GNUHOSTDIST}/
 G_build_xm_include_list=auto-build.h ansidecl.h
 G_lang_specs_files=${GNUHOSTDIST}/gcc/cp/lang-specs.h ${GNUHOSTDIST}/gcc/objc/lang-specs.h
 G_tm_p_include_list=config/sparc/sparc-protos.h tm-preds.h
-G_LIB2ADDEHDEP=${GNUHOSTDIST}/gcc/unwind-generic.h unwind-pe.h  unwind-dw2-fde.h unwind-dw2.h
+G_LIB2ADDEHDEP= unwind-dw2-fde.h unwind-dw2-fde.c
 G_CXX_OBJS=cp-lang.o stub-objc.o call.o decl.o expr.o pt.o typeck2.o class.o decl2.o error.o lex.o parser.o ptree.o rtti.o typeck.o cvt.o except.o friend.o init.o method.o search.o semantics.o tree.o repo.o dump.o optimize.o mangle.o cp-objcp-common.o name-lookup.o cxx-pretty-print.o cp-gimplify.o tree-mudflap.o attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o  c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_CXX_C_OBJS=attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o  c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_F77_OBJS=

Index: src/gnu/usr.bin/gcc4/arch/vax/defs.mk
diff -u src/gnu/usr.bin/gcc4/arch/vax/defs.mk:1.5 src/gnu/usr.bin/gcc4/arch/vax/defs.mk:1.5.18.1
--- src/gnu/usr.bin/gcc4/arch/vax/defs.mk:1.5	Thu Jun 21 16:58:49 2007
+++ src/gnu/usr.bin/gcc4/arch/vax/defs.mk	Sun Mar 18 13:27:41 2012
@@ -42,7 +42,7 @@ G_tm_file_list=options.h ${GNUHOSTDIST}/
 G_build_xm_include_list=auto-build.h ansidecl.h
 G_lang_specs_files=${GNUHOSTDIST}/gcc/cp/lang-specs.h ${GNUHOSTDIST}/gcc/objc/lang-specs.h
 G_tm_p_include_list=config/vax/vax-protos.h tm-preds.h
-G_LIB2ADDEHDEP=${GNUHOSTDIST}/gcc/unwind-generic.h unwind-pe.h  unwind-dw2-fde.h unwind-dw2.h
+G_LIB2ADDEHDEP= unwind-dw2-fde.h unwind-dw2-fde.c
 G_CXX_OBJS=cp-lang.o stub-objc.o call.o decl.o expr.o pt.o typeck2.o class.o decl2.o error.o lex.o parser.o ptree.o rtti.o typeck.o cvt.o except.o friend.o init.o method.o search.o semantics.o tree.o repo.o dump.o optimize.o mangle.o cp-objcp-common.o name-lookup.o cxx-pretty-print.o cp-gimplify.o tree-mudflap.o attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o  c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_CXX_C_OBJS=attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o  c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_F77_OBJS=

Index: src/gnu/usr.bin/gcc4/arch/x86_64/defs.mk
diff -u src/gnu/usr.bin/gcc4/arch/x86_64/defs.mk:1.5 src/gnu/usr.bin/gcc4/arch/x86_64/defs.mk:1.5.18.1
--- src/gnu/usr.bin/gcc4/arch/x86_64/defs.mk:1.5	Thu Jun 21 16:58:50 2007
+++ src/gnu/usr.bin/gcc4/arch/x86_64/defs.mk	Sun Mar 18 13:27:41 2012
@@ -42,7 +42,7 @@ G_tm_file_list=options.h ${GNUHOSTDIST}/
 G_build_xm_include_list=auto-build.h ansidecl.h
 G_lang_specs_files=${GNUHOSTDIST}/gcc/cp/lang-specs.h ${GNUHOSTDIST}/gcc/objc/lang-specs.h
 G_tm_p_include_list=config/i386/i386-protos.h tm-preds.h
-G_LIB2ADDEHDEP=${GNUHOSTDIST}/gcc/unwind-generic.h unwind-pe.h  unwind-dw2-fde.h unwind-dw2.h
+G_LIB2ADDEHDEP= unwind-dw2-fde.h unwind-dw2-fde.c
 G_CXX_OBJS=cp-lang.o stub-objc.o call.o decl.o expr.o pt.o typeck2.o class.o decl2.o error.o lex.o parser.o ptree.o rtti.o typeck.o cvt.o except.o friend.o init.o method.o search.o semantics.o tree.o repo.o dump.o optimize.o mangle.o cp-objcp-common.o name-lookup.o cxx-pretty-print.o cp-gimplify.o tree-mudflap.o attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o  c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_CXX_C_OBJS=attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o c-dump.o  c-pretty-print.o c-opts.o c-pch.o c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o c-gimplify.o tree-inline.o
 G_F77_OBJS=

Added files:

Index: src/gnu/dist/gcc4/gcc/unwind-dw2-fde-phdr.c
diff -u /dev/null src/gnu/dist/gcc4/gcc/unwind-dw2-fde-phdr.c:1.1.2.1
--- /dev/null	Sun Mar 18 13:27:42 2012
+++ src/gnu/dist/gcc4/gcc/unwind-dw2-fde-phdr.c	Sun Mar 18 13:27:39 2012
@@ -0,0 +1,3 @@
+#define __GLIBC__ 3             /* Fool unwind-dw2-fde-glibc.c.  */
+#define ElfW(type) Elf_##type
+#include "unwind-dw2-fde-glibc.c"

Reply via email to