patches/gcc/4.4.0/280-freebsd.patch
author Arnaud Lacombe <lacombar@gmail.com>
Tue Aug 03 06:17:51 2010 +0200 (2010-08-03)
changeset 2064 f5ebe8c429dc
permissions -rw-r--r--
libc/uClibc: add uClibc 0.9.30.3

This version has been released a couple of month ago, but it never reached
crosstool-ng tree. This may be linked to the fact that the current 0.9.30.2,
once patched, has nothing much different from 0.9.30.3, released.

I'm not including any patch with this upgrade, on purpose.

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
yann@1393
     1
diff -durN gcc-4.4.0.orig/gcc/config/freebsd-spec.h gcc-4.4.0/gcc/config/freebsd-spec.h
yann@1393
     2
--- gcc-4.4.0.orig/gcc/config/freebsd-spec.h	2009-04-10 01:23:07.000000000 +0200
yann@1393
     3
+++ gcc-4.4.0/gcc/config/freebsd-spec.h	2009-05-27 21:38:45.000000000 +0200
yann@1393
     4
@@ -61,6 +61,8 @@
yann@1393
     5
 	builtin_assert ("system=unix");					\
yann@1393
     6
 	builtin_assert ("system=bsd");					\
yann@1393
     7
 	builtin_assert ("system=FreeBSD");				\
yann@1393
     8
+	if(!(flag_iso && (c_dialect_cxx () ? cxx_dialect == cxx98 : !flag_isoc99)))	\
yann@1393
     9
+		builtin_define("_LONGLONG");				\
yann@1393
    10
 	FBSD_TARGET_CPU_CPP_BUILTINS();					\
yann@1393
    11
     }									\
yann@1393
    12
   while (0)
yann@1393
    13
diff -durN gcc-4.4.0.orig/gcc/config/t-freebsd-eh gcc-4.4.0/gcc/config/t-freebsd-eh
yann@1393
    14
--- gcc-4.4.0.orig/gcc/config/t-freebsd-eh	1970-01-01 01:00:00.000000000 +0100
yann@1393
    15
+++ gcc-4.4.0/gcc/config/t-freebsd-eh	2009-05-27 21:38:45.000000000 +0200
yann@1393
    16
@@ -0,0 +1,4 @@
yann@1393
    17
+# Use unwind-dw2-fde-glibc
yann@1393
    18
+LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde-glibc.c \
yann@1393
    19
+  $(srcdir)/unwind-sjlj.c $(srcdir)/gthr-gnat.c $(srcdir)/unwind-c.c
yann@1393
    20
+LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h unwind-dw2-fde.c
yann@1393
    21
diff -durN gcc-4.4.0.orig/gcc/config.gcc gcc-4.4.0/gcc/config.gcc
yann@1393
    22
--- gcc-4.4.0.orig/gcc/config.gcc	2009-05-27 21:38:34.000000000 +0200
yann@1393
    23
+++ gcc-4.4.0/gcc/config.gcc	2009-05-27 21:38:45.000000000 +0200
yann@1393
    24
@@ -456,7 +456,7 @@
yann@1393
    25
   # pleases around the provided core setting.
yann@1393
    26
   gas=yes
yann@1393
    27
   gnu_ld=yes
yann@1393
    28
-  extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
yann@1393
    29
+  extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
yann@1393
    30
   fbsd_major=`echo ${target} | sed -e 's/.*freebsd//g' | sed -e 's/\..*//g'`
yann@1393
    31
   tm_defines="${tm_defines} FBSD_MAJOR=${fbsd_major}"
yann@1393
    32
   tmake_file="t-slibgcc-elf-ver t-freebsd"
yann@1393
    33
@@ -1042,6 +1042,10 @@
yann@1393
    34
 	;;
yann@1393
    35
 i[34567]86-*-freebsd*)
yann@1393
    36
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/freebsd.h"
yann@1393
    37
+	fbsd_major=`echo ${target} | sed -e 's/.*freebsd//g' | sed -e 's/\..*//g'`
yann@1393
    38
+	if test ${fbsd_major} -ge 7; then
yann@1393
    39
+		tmake_file="${tmake_file} t-freebsd-eh"
yann@1393
    40
+	fi
yann@1393
    41
 	;;
yann@1393
    42
 x86_64-*-freebsd*)
yann@1393
    43
 	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
    44
diff -durN gcc-4.4.0.orig/gcc/crtstuff.c gcc-4.4.0/gcc/crtstuff.c
yann@1393
    45
--- gcc-4.4.0.orig/gcc/crtstuff.c	2009-04-10 01:23:07.000000000 +0200
yann@1393
    46
+++ gcc-4.4.0/gcc/crtstuff.c	2009-05-27 21:38:45.000000000 +0200
yann@1393
    47
@@ -85,13 +85,15 @@
yann@1393
    48
     && !defined(OBJECT_FORMAT_FLAT) \
yann@1393
    49
     && defined(HAVE_LD_EH_FRAME_HDR) \
yann@1393
    50
     && !defined(inhibit_libc) && !defined(CRTSTUFFT_O) \
yann@1393
    51
-    && defined(__GLIBC__) && __GLIBC__ >= 2
yann@1393
    52
+    && ((defined(__GLIBC__) && __GLIBC__ >= 2) \
yann@1393
    53
+    || (defined(__FreeBSD_version) && __FreeBSD_version >= 700022))
yann@1393
    54
 #include <link.h>
yann@1393
    55
 /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h.
yann@1393
    56
    But it doesn't use PT_GNU_EH_FRAME ELF segment currently.  */
yann@1393
    57
 # if !defined(__UCLIBC__) \
yann@1393
    58
-     && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
yann@1393
    59
-     || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
yann@1393
    60
+     || (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
yann@1393
    61
+     || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) \
yann@1393
    62
+     || (__FreeBSD_version >= 700022)
yann@1393
    63
 #  define USE_PT_GNU_EH_FRAME
yann@1393
    64
 # endif
yann@1393
    65
 #endif
yann@1393
    66
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
    67
--- gcc-4.4.0.orig/gcc/unwind-dw2-fde-glibc.c	2009-04-10 01:23:07.000000000 +0200
yann@1393
    68
+++ gcc-4.4.0/gcc/unwind-dw2-fde-glibc.c	2009-05-27 21:38:45.000000000 +0200
yann@1393
    69
@@ -46,8 +46,9 @@
yann@1393
    70
 #include "gthr.h"
yann@1393
    71
 
yann@1393
    72
 #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
yann@1393
    73
-    && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
yann@1393
    74
-	|| (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
yann@1393
    75
+    && ((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
yann@1393
    76
+	|| (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) \
yann@1393
    77
+    || (__FreeBSD_version >= 700022 ))
yann@1393
    78
 
yann@1393
    79
 #ifndef __RELOC_POINTER
yann@1393
    80
 # define __RELOC_POINTER(ptr, base) ((ptr) + (base))
yann@1393
    81
@@ -63,6 +64,13 @@
yann@1393
    82
 #define PT_GNU_EH_FRAME (PT_LOOS + 0x474e550)
yann@1393
    83
 #endif
yann@1393
    84
 
yann@1393
    85
+/* Support FreeBSD */
yann@1393
    86
+#ifndef ElfW
yann@1393
    87
+# ifdef __ElfN
yann@1393
    88
+#  define ElfW __ElfN
yann@1393
    89
+# endif
yann@1393
    90
+#endif
yann@1393
    91
+
yann@1393
    92
 struct unw_eh_callback_data
yann@1393
    93
 {
yann@1393
    94
   _Unwind_Ptr pc;