patches/gcc/4.3.1/180-superh-default-multilib.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:09:43 2011 +0200 (2011-05-19)
branch1.11
changeset 2465 5f98b7a90fbc
parent 746 b150d6f590fc
permissions -rw-r--r--
complibs/ppl: fix 0.11-0.11.2 to compile with --disable-shared

PPL 0.11 (through 0.11.2) had a small bug where it still tried to build
and test its Java interface even when shared libraries are disabled.
Since that's exactly what ct-ng does, it explodes.

This is the patch from the PPL authors (see final link below).

More information can be found in these messages/threads:

Anthony's initial report and analysis with Yann:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00046.html

Ron Flory hit the same problem:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00054.html

Anthony's report to the ppl-devel list:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017450.html

Roberto's reply with a link to the fix in the PPL git repo:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017455.html

Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com>
(transplanted from 139b85d70b623e51f7585e7c64ecb8c6a6cf4567)
yann@552
     1
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/53_all_gcc4-superh-default-multilib.patch
yann@552
     2
The gcc-3.x toolchains would contain all the targets by default.  With gcc-4,
yann@552
     3
you have to actually list out the multilibs you want or you will end up with
yann@552
     4
just one when using targets like 'sh4-linux-gnu'.
yann@552
     5
yann@552
     6
The resulting toolchain can't even build a kernel as the kernel needs to build
yann@552
     7
with the nofpu flag to be sure that no fpu ops are generated.
yann@552
     8
yann@552
     9
Here we restore the gcc-3.x behavior; the additional overhead of building all
yann@552
    10
of these multilibs by default is negligible.
yann@552
    11
yann@552
    12
http://bugs.gentoo.org/140205
yann@552
    13
yann@552
    14
diff -durN gcc-4.3.1.orig/gcc/config.gcc gcc-4.3.1/gcc/config.gcc
yann@552
    15
--- gcc-4.3.1.orig/gcc/config.gcc	2008-05-21 10:54:15.000000000 +0200
yann@552
    16
+++ gcc-4.3.1/gcc/config.gcc	2008-06-10 14:58:06.000000000 +0200
yann@552
    17
@@ -2278,7 +2278,7 @@
yann@552
    18
 	if test x${sh_multilibs} = x ; then
yann@552
    19
 		case ${target} in
yann@552
    20
 		sh64-superh-linux* | \
yann@552
    21
-		sh[1234]*)	sh_multilibs=${sh_cpu_target} ;;
yann@552
    22
+		sh[1234]*)	sh_multilibs=`cd ${srcdir}/config/sh ; echo t-mlib-sh[1-4]* | sed 's:t-mlib-sh:,m:g;s: ::g'` ;;
yann@552
    23
 		sh64* | sh5*)	sh_multilibs=m5-32media,m5-32media-nofpu,m5-compact,m5-compact-nofpu,m5-64media,m5-64media-nofpu ;;
yann@552
    24
 		sh-superh-*)	sh_multilibs=m4,m4-single,m4-single-only,m4-nofpu ;;
yann@552
    25
 		sh*-*-linux*)	sh_multilibs=m1,m3e,m4 ;;