patches/gcc/4.4.4/170-sparc64-bsd.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Sep 12 23:51:25 2010 +0200 (2010-09-12)
changeset 2123 ff2181adbd28
child 2148 ada9128c98b8
permissions -rw-r--r--
cc/gcc: disable complibs if not selected

Force gcc to not link with some companion libraries when
there are not needed (because selected-out).

There is no option to tell gcc *not* to build the Graphite and/or
LTO stuff. They *will* be built if gcc finds the suitable companion
libraries. If we do not provide them, but the host has them, then
gcc *will* find them, and link with them.

Consider the following:
- host has suitable PPL and CLooG (eg. Debian Squeeze)
- user wants to build gcc>=4.4
- user de-selects GRAPHITE
- gcc will find the hosts PPL and CLooG, and will use them
- the user moves the toolchain to an older host that does
not have them (eg. Debian Lenny)
- the toolchain fails, when it was properly setup not to

So, explicitly tell gcc *not* to use unneeded companion libs.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
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}}						\