Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.4.1/290-freebsd.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Thu Dec 27 12:45:22 2012 +0100 (2012-12-27)
changeset 3152 b286c7993be5
parent 1393 b432bd628b10
permissions -rw-r--r--
scripts/addToolsVersion: properly handle .in vs. .in.2

While most components have their version in the .in file, some
have it in the .in.2 (eg. elf2flt).

Currently, to handle this case, we indiscriminately munge both files,
but this is wrong: in the elf2flt case, if we add a binutils version,
we do not want it to be added to elf2flt, and conversely.

So, for each tool, we need to explicitly know what file to munge.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> 
     1 diff -durN gcc-4.4.0.orig/gcc/config/freebsd-spec.h gcc-4.4.0/gcc/config/freebsd-spec.h

     2 --- gcc-4.4.0.orig/gcc/config/freebsd-spec.h	2009-05-27 21:38:47.000000000 +0200

     3 +++ gcc-4.4.0/gcc/config/freebsd-spec.h	2009-05-27 21:38:47.000000000 +0200

     4 @@ -86,9 +86,10 @@

     5  #define FBSD_STARTFILE_SPEC \

     6    "%{!shared: \

     7       %{pg:gcrt1.o%s} %{!pg:%{p:gcrt1.o%s} \

     8 -		       %{!p:%{profile:gcrt1.o%s} \

     9 -			 %{!profile:crt1.o%s}}}} \

    10 -   crti.o%s %{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}"

    11 +	%{!p:%{profile:gcrt1.o%s} \

    12 +	 %{!profile:crt1.o%s}}}} \

    13 +   crti.o%s \

    14 +   %{static:crtbeginT.o%s;shared:crtbeginS.o%s;:crtbegin.o%s}"

    15  

    16  /* Provide a ENDFILE_SPEC appropriate for FreeBSD.  Here we tack on

    17     the magical crtend.o file (see crtstuff.c) which provides part of 

    18 @@ -126,7 +127,8 @@

    19      %{pg:  -lc_p}							\

    20    }"

    21  #else

    22 -#if FBSD_MAJOR < 5

    23 +#include <sys/param.h>

    24 +#if __FreeBSD_version < 500016

    25  #define FBSD_LIB_SPEC "							\

    26    %{!shared:								\

    27      %{!pg:								\

    28 @@ -136,17 +138,34 @@

    29        %{!pthread:-lc_p}							\

    30        %{pthread:-lc_r_p}}						\

    31    }"

    32 -#else

    33 +#elif __FreeBSD_version < 700022

    34  #define FBSD_LIB_SPEC "							\

    35    %{!shared:								\

    36      %{!pg: %{pthread:-lpthread} -lc}					\

    37      %{pg:  %{pthread:-lpthread_p} -lc_p}				\

    38    }"

    39 +#else

    40 +#define FBSD_LIB_SPEC "							\

    41 +  %{!shared:								\

    42 +    %{!pg: %{pthread:-lpthread} -lc}					\

    43 +    %{pg:  %{pthread:-lpthread_p} -lc_p}}				\

    44 +  %{shared:								\

    45 +    %{pthread:-lpthread} -lc}						\

    46 +  "

    47  #endif

    48  #endif

    49  

    50 -#if FBSD_MAJOR < 6

    51 +#if FBSD_MAJOR < 5

    52  #define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1"

    53  #else

    54  #define FBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.1"

    55  #endif

    56 +

    57 +#if defined(HAVE_LD_EH_FRAME_HDR)

    58 +#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "

    59 +#endif

    60 +

    61 +/* Use --as-needed -lgcc_s for eh support.  */

    62 +#ifdef HAVE_LD_AS_NEEDED

    63 +#define USE_LD_AS_NEEDED 1

    64 +#endif
crosstool-ng