patches/gcc/4.4.4/280-freebsd.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Oct 12 23:47:24 2010 +0200 (2010-10-12)
branch1.8
changeset 2151 ee9ce2595560
parent 1948 d341be24dc68
permissions -rw-r--r--
cc/gcc: fix 4.4.4 patchset

Most patches contained two spurious first lines.

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