patches/gcc/4.4.3/290-freebsd.patch
author "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
Wed Dec 14 16:55:22 2011 +0100 (2011-12-14)
branch1.13
changeset 2848 1ff89596dab0
parent 1611 e2516bba8fe5
permissions -rw-r--r--
libc/eglibc: fix localedef 2.14 build

The localedef of eglibc 2.14 requires NOT_IN_libc to be defined in order to
compile intl/l10nflist.c.

This is because localedef is built separately from eglibc and uses some parts of
eglibc that don't compile in standalone without this preprocessor definition.

This fixes the following error:

[ALL ] gcc -g -O2 -DNO_SYSCONF -DNO_UNCOMPRESS
-DLOCALE_PATH='"/usr/lib/locale:/usr/share/i18n"'
-DLOCALEDIR='"/usr/lib/locale"' -DLOCALE_ALIAS_PATH='"/usr/share/locale"'
-DCHARMAP_PATH='"/usr/share/i18n/charmaps"'
-DREPERTOIREMAP_PATH='"/usr/share/i18n/repertoiremaps"'
-DLOCSRCDIR='"/usr/share/i18n/locales"' -Iglibc/locale/programs -Iglibc/locale
-I/<snip>/.build/src/eglibc-localedef-2_14/include
-I/<snip>/.build/src/eglibc-localedef-2_14 -I.
-include /<snip>/.build/src/eglibc-localedef-2_14/include/always.h -Wall
-Wno-format -c -o locarchive.o glibc/locale/programs/locarchive.c
[ALL ] glibc/locale/programs/locarchive.c: In function 'enlarge_archive':
[ALL ] glibc/locale/programs/locarchive.c:303:21: warning: variable
'oldlocrectab' set but not used [-Wunused-but-set-variable]
[ALL ] In file included from glibc/locale/programs/locarchive.c:651:0:
[ALL ] glibc/locale/programs/../../intl/l10nflist.c: In function
'_nl_normalize_codeset':
[ERROR] glibc/locale/programs/../../intl/l10nflist.c:342:9: error:
'_nl_C_locobj_ptr' undeclared (first use in this function)
[ALL ] glibc/locale/programs/../../intl/l10nflist.c:342:9: note: each
undeclared identifier is reported only once for each function it appears in
[ALL ] glibc/locale/programs/locarchive.c: In function
'add_locales_to_archive':
[ALL ] glibc/locale/programs/locarchive.c:1450:7: warning: passing argument
1 of '__xpg_basename' discards 'const' qualifier from pointer target type
[enabled by default]
[ALL ] /usr/include/libgen.h:35:14: note: expected 'char *' but argument is
of type 'const char *'
[ERROR] make[1]: *** [locarchive.o] Error 1

Signed-off-by: "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
(transplanted from 4cd9134739b594451794cf61a6e1b137422cdafd)
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