patches/gcc/4.4.2/290-freebsd.patch
author Johannes Stezenbach <js@sig21.net>
Thu Jul 29 19:47:16 2010 +0200 (2010-07-29)
changeset 2045 fdaa6c7f6dea
parent 1544 2228ea3f6b79
permissions -rw-r--r--
cc/gcc: add option to compile against static libstdc++, for gcc-4.4 and newer

Idea and know-how taken from CodeSourcery build script.

Normal build:
$ ldd arm-unknown-linux-uclibcgnueabi-gcc
linux-gate.so.1 => (0xb77f3000)
libstdc++.so.6 => /usr/lib/libstdc++.so.6 (0xb76e8000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb75a1000)
libm.so.6 => /lib/i686/cmov/libm.so.6 (0xb757a000)
/lib/ld-linux.so.2 (0xb77f4000)
libgcc_s.so.1 => /lib/libgcc_s.so.1 (0xb755c000)

CC_STATIC_LIBSTDCXX=y:
$ ldd arm-unknown-linux-uclibcgnueabi-gcc
linux-gate.so.1 => (0xb7843000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb76e6000)
/lib/ld-linux.so.2 (0xb7844000)

I made CC_STATIC_LIBSTDCXX default=y since I think
it is always desirable.

Signed-off-by: Johannes Stezenbach <js@sig21.net>
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-05-27 21:38:47.000000000 +0200
yann@1393
     3
+++ gcc-4.4.0/gcc/config/freebsd-spec.h	2009-05-27 21:38:47.000000000 +0200
yann@1393
     4
@@ -86,9 +86,10 @@
yann@1393
     5
 #define FBSD_STARTFILE_SPEC \
yann@1393
     6
   "%{!shared: \
yann@1393
     7
      %{pg:gcrt1.o%s} %{!pg:%{p:gcrt1.o%s} \
yann@1393
     8
-		       %{!p:%{profile:gcrt1.o%s} \
yann@1393
     9
-			 %{!profile:crt1.o%s}}}} \
yann@1393
    10
-   crti.o%s %{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}"
yann@1393
    11
+	%{!p:%{profile:gcrt1.o%s} \
yann@1393
    12
+	 %{!profile:crt1.o%s}}}} \
yann@1393
    13
+   crti.o%s \
yann@1393
    14
+   %{static:crtbeginT.o%s;shared:crtbeginS.o%s;:crtbegin.o%s}"
yann@1393
    15
 
yann@1393
    16
 /* Provide a ENDFILE_SPEC appropriate for FreeBSD.  Here we tack on
yann@1393
    17
    the magical crtend.o file (see crtstuff.c) which provides part of 
yann@1393
    18
@@ -126,7 +127,8 @@
yann@1393
    19
     %{pg:  -lc_p}							\
yann@1393
    20
   }"
yann@1393
    21
 #else
yann@1393
    22
-#if FBSD_MAJOR < 5
yann@1393
    23
+#include <sys/param.h>
yann@1393
    24
+#if __FreeBSD_version < 500016
yann@1393
    25
 #define FBSD_LIB_SPEC "							\
yann@1393
    26
   %{!shared:								\
yann@1393
    27
     %{!pg:								\
yann@1393
    28
@@ -136,17 +138,34 @@
yann@1393
    29
       %{!pthread:-lc_p}							\
yann@1393
    30
       %{pthread:-lc_r_p}}						\
yann@1393
    31
   }"
yann@1393
    32
-#else
yann@1393
    33
+#elif __FreeBSD_version < 700022
yann@1393
    34
 #define FBSD_LIB_SPEC "							\
yann@1393
    35
   %{!shared:								\
yann@1393
    36
     %{!pg: %{pthread:-lpthread} -lc}					\
yann@1393
    37
     %{pg:  %{pthread:-lpthread_p} -lc_p}				\
yann@1393
    38
   }"
yann@1393
    39
+#else
yann@1393
    40
+#define FBSD_LIB_SPEC "							\
yann@1393
    41
+  %{!shared:								\
yann@1393
    42
+    %{!pg: %{pthread:-lpthread} -lc}					\
yann@1393
    43
+    %{pg:  %{pthread:-lpthread_p} -lc_p}}				\
yann@1393
    44
+  %{shared:								\
yann@1393
    45
+    %{pthread:-lpthread} -lc}						\
yann@1393
    46
+  "
yann@1393
    47
 #endif
yann@1393
    48
 #endif
yann@1393
    49
 
yann@1393
    50
-#if FBSD_MAJOR < 6
yann@1393
    51
+#if FBSD_MAJOR < 5
yann@1393
    52
 #define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1"
yann@1393
    53
 #else
yann@1393
    54
 #define FBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.1"
yann@1393
    55
 #endif
yann@1393
    56
+
yann@1393
    57
+#if defined(HAVE_LD_EH_FRAME_HDR)
yann@1393
    58
+#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
yann@1393
    59
+#endif
yann@1393
    60
+
yann@1393
    61
+/* Use --as-needed -lgcc_s for eh support.  */
yann@1393
    62
+#ifdef HAVE_LD_AS_NEEDED
yann@1393
    63
+#define USE_LD_AS_NEEDED 1
yann@1393
    64
+#endif