patches/gcc/4.4.4/170-sparc64-bsd.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Fri Oct 08 23:37:12 2010 +0200 (2010-10-08)
branch1.8
changeset 2150 f97a8ad2b172
child 2148 ada9128c98b8
permissions -rw-r--r--
cc/gcc: fix C++ headers location

In case we build the C++ compiler, we have to tell gcc where to put the C++
headers, or else it will try to # put it in prefix/tuple/include, which we
make a symlink to sysroot/usr/include during the build, and that we delete
(the symlink!) after the build, but gcc will not look in sysroot/usr/inlcude
for C++ headers by default.

Implements a fix suggested by: Bryan Hundven <bryanhundven@gmail.com>

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