patches/gcc/4.4.0/170-sparc64-bsd.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Wed Sep 07 01:22:37 2011 +0200 (2011-09-07)
branch1.12
changeset 2655 3ba359965eb0
permissions -rw-r--r--
scripts: fix sysroot prefix dir

The sysroot prefix dir was broken in #4960f5d9f829 due to a mishap
when making the out-of-sysroot lib/ symlink: the './' was mistakenly
changed into a single '.' .

Although Jonathan suggested restoring the missing '/' to restore it to
normal operation, I prefered using an explicit pushd/popd to be extra
sure of the symlink location and target, along with a fix in the sysroot
relative directory calculation.

Reported-by: Jonathan Grundon <JGrundon@xos.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from e5fc5c9ea78af28d05244ba09cf718cf75470903)
     1 diff -durN gcc-4.4.0.orig/gcc/config/sparc/freebsd.h gcc-4.4.0/gcc/config/sparc/freebsd.h
     2 --- gcc-4.4.0.orig/gcc/config/sparc/freebsd.h	2007-08-02 12:49:31.000000000 +0200
     3 +++ gcc-4.4.0/gcc/config/sparc/freebsd.h	2009-05-27 21:38:16.000000000 +0200
     4 @@ -25,9 +25,22 @@
     5  /* FreeBSD needs the platform name (sparc64) defined.
     6     Emacs needs to know if the arch is 64 or 32-bits.  */
     7  
     8 -#undef  CPP_CPU64_DEFAULT_SPEC
     9 -#define CPP_CPU64_DEFAULT_SPEC \
    10 -  "-D__sparc64__ -D__sparc_v9__ -D__sparcv9 -D__arch64__"
    11 +#undef  FBSD_TARGET_CPU_CPP_BUILTINS
    12 +#define FBSD_TARGET_CPU_CPP_BUILTINS()                  \
    13 +  do                                                    \
    14 +    {                                                   \
    15 +      if (TARGET_ARCH64)                                \
    16 +        {                                               \
    17 +          builtin_define ("__sparc64__");               \
    18 +          builtin_define ("__sparc_v9__");              \
    19 +          builtin_define ("__sparcv9");                 \
    20 +        }                                               \
    21 +      else                                              \
    22 +        builtin_define ("__sparc");                     \
    23 +      builtin_define ("__sparc__");                     \
    24 +    }                                                   \
    25 +  while (0)
    26 +
    27  
    28  #define LINK_SPEC "%(link_arch)						\
    29    %{!mno-relax:%{!r:-relax}}						\