yann@1393: diff -durN gcc-4.4.0.orig/gcc/config/freebsd-spec.h gcc-4.4.0/gcc/config/freebsd-spec.h
yann@1393: --- gcc-4.4.0.orig/gcc/config/freebsd-spec.h	2009-04-10 01:23:07.000000000 +0200
yann@1393: +++ gcc-4.4.0/gcc/config/freebsd-spec.h	2009-05-27 21:38:45.000000000 +0200
yann@1393: @@ -61,6 +61,8 @@
yann@1393:  	builtin_assert ("system=unix");					\
yann@1393:  	builtin_assert ("system=bsd");					\
yann@1393:  	builtin_assert ("system=FreeBSD");				\
yann@1393: +	if(!(flag_iso && (c_dialect_cxx () ? cxx_dialect == cxx98 : !flag_isoc99)))	\
yann@1393: +		builtin_define("_LONGLONG");				\
yann@1393:  	FBSD_TARGET_CPU_CPP_BUILTINS();					\
yann@1393:      }									\
yann@1393:    while (0)
yann@1393: diff -durN gcc-4.4.0.orig/gcc/config/t-freebsd-eh gcc-4.4.0/gcc/config/t-freebsd-eh
yann@1393: --- gcc-4.4.0.orig/gcc/config/t-freebsd-eh	1970-01-01 01:00:00.000000000 +0100
yann@1393: +++ gcc-4.4.0/gcc/config/t-freebsd-eh	2009-05-27 21:38:45.000000000 +0200
yann@1393: @@ -0,0 +1,4 @@
yann@1393: +# Use unwind-dw2-fde-glibc
yann@1393: +LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde-glibc.c \
yann@1393: +  $(srcdir)/unwind-sjlj.c $(srcdir)/gthr-gnat.c $(srcdir)/unwind-c.c
yann@1393: +LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h unwind-dw2-fde.c
yann@1393: diff -durN gcc-4.4.0.orig/gcc/config.gcc gcc-4.4.0/gcc/config.gcc
yann@1393: --- gcc-4.4.0.orig/gcc/config.gcc	2009-05-27 21:38:34.000000000 +0200
yann@1393: +++ gcc-4.4.0/gcc/config.gcc	2009-05-27 21:38:45.000000000 +0200
yann@1393: @@ -456,7 +456,7 @@
yann@1393:    # pleases around the provided core setting.
yann@1393:    gas=yes
yann@1393:    gnu_ld=yes
yann@1393: -  extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
yann@1393: +  extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
yann@1393:    fbsd_major=`echo ${target} | sed -e 's/.*freebsd//g' | sed -e 's/\..*//g'`
yann@1393:    tm_defines="${tm_defines} FBSD_MAJOR=${fbsd_major}"
yann@1393:    tmake_file="t-slibgcc-elf-ver t-freebsd"
yann@1393: @@ -1042,6 +1042,10 @@
yann@1393:  	;;
yann@1393:  i[34567]86-*-freebsd*)
yann@1393:  	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/freebsd.h"
yann@1393: +	fbsd_major=`echo ${target} | sed -e 's/.*freebsd//g' | sed -e 's/\..*//g'`
yann@1393: +	if test ${fbsd_major} -ge 7; then
yann@1393: +		tmake_file="${tmake_file} t-freebsd-eh"
yann@1393: +	fi
yann@1393:  	;;
yann@1393:  x86_64-*-freebsd*)
yann@1393:  	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/x86-64.h i386/freebsd.h i386/freebsd64.h"
yann@1393: diff -durN gcc-4.4.0.orig/gcc/crtstuff.c gcc-4.4.0/gcc/crtstuff.c
yann@1393: --- gcc-4.4.0.orig/gcc/crtstuff.c	2009-04-10 01:23:07.000000000 +0200
yann@1393: +++ gcc-4.4.0/gcc/crtstuff.c	2009-05-27 21:38:45.000000000 +0200
yann@1393: @@ -85,13 +85,15 @@
yann@1393:      && !defined(OBJECT_FORMAT_FLAT) \
yann@1393:      && defined(HAVE_LD_EH_FRAME_HDR) \
yann@1393:      && !defined(inhibit_libc) && !defined(CRTSTUFFT_O) \
yann@1393: -    && defined(__GLIBC__) && __GLIBC__ >= 2
yann@1393: +    && ((defined(__GLIBC__) && __GLIBC__ >= 2) \
yann@1393: +    || (defined(__FreeBSD_version) && __FreeBSD_version >= 700022))
yann@1393:  #include <link.h>
yann@1393:  /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h.
yann@1393:     But it doesn't use PT_GNU_EH_FRAME ELF segment currently.  */
yann@1393:  # if !defined(__UCLIBC__) \
yann@1393: -     && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
yann@1393: -     || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
yann@1393: +     || (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
yann@1393: +     || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) \
yann@1393: +     || (__FreeBSD_version >= 700022)
yann@1393:  #  define USE_PT_GNU_EH_FRAME
yann@1393:  # endif
yann@1393:  #endif
yann@1393: diff -durN gcc-4.4.0.orig/gcc/unwind-dw2-fde-glibc.c gcc-4.4.0/gcc/unwind-dw2-fde-glibc.c
yann@1393: --- gcc-4.4.0.orig/gcc/unwind-dw2-fde-glibc.c	2009-04-10 01:23:07.000000000 +0200
yann@1393: +++ gcc-4.4.0/gcc/unwind-dw2-fde-glibc.c	2009-05-27 21:38:45.000000000 +0200
yann@1393: @@ -46,8 +46,9 @@
yann@1393:  #include "gthr.h"
yann@1393:  
yann@1393:  #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
yann@1393: -    && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
yann@1393: -	|| (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
yann@1393: +    && ((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
yann@1393: +	|| (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) \
yann@1393: +    || (__FreeBSD_version >= 700022 ))
yann@1393:  
yann@1393:  #ifndef __RELOC_POINTER
yann@1393:  # define __RELOC_POINTER(ptr, base) ((ptr) + (base))
yann@1393: @@ -63,6 +64,13 @@
yann@1393:  #define PT_GNU_EH_FRAME (PT_LOOS + 0x474e550)
yann@1393:  #endif
yann@1393:  
yann@1393: +/* Support FreeBSD */
yann@1393: +#ifndef ElfW
yann@1393: +# ifdef __ElfN
yann@1393: +#  define ElfW __ElfN
yann@1393: +# endif
yann@1393: +#endif
yann@1393: +
yann@1393:  struct unw_eh_callback_data
yann@1393:  {
yann@1393:    _Unwind_Ptr pc;