patches/gcc/4.3.1/330-unwind-for-uClibc.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:09:43 2011 +0200 (2011-05-19)
branch1.11
changeset 2465 5f98b7a90fbc
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@766
     1
diff -durN gcc-4.3.1.orig/gcc/config/t-linux-uclibc gcc-4.3.1/gcc/config/t-linux-uclibc
yann@766
     2
--- gcc-4.3.1.orig/gcc/config/t-linux-uclibc	1970-01-01 01:00:00.000000000 +0100
yann@766
     3
+++ gcc-4.3.1/gcc/config/t-linux-uclibc	2008-07-29 13:07:15.000000000 +0200
yann@766
     4
@@ -0,0 +1,5 @@
yann@766
     5
+# Remove glibc specific files added in t-linux
yann@766
     6
+SHLIB_MAPFILES := $(filter-out $(srcdir)/config/libgcc-glibc.ver, $(SHLIB_MAPFILES))
yann@766
     7
+
yann@766
     8
+# Use unwind-dw2-fde instead of unwind-dw2-fde-glibc
yann@766
     9
+LIB2ADDEH := $(subst unwind-dw2-fde-glibc.c,unwind-dw2-fde.c,$(LIB2ADDEH))
yann@766
    10
diff -durN gcc-4.3.1.orig/gcc/config.gcc gcc-4.3.1/gcc/config.gcc
yann@766
    11
--- gcc-4.3.1.orig/gcc/config.gcc	2008-07-29 13:11:02.000000000 +0200
yann@766
    12
+++ gcc-4.3.1/gcc/config.gcc	2008-07-29 13:10:05.000000000 +0200
yann@766
    13
@@ -2651,6 +2651,12 @@
yann@766
    14
 	;;
yann@766
    15
 esac
yann@766
    16
 
yann@766
    17
+# Rather than hook into each target, just do it after all the linux
yann@766
    18
+# targets have been processed
yann@766
    19
+case ${target} in
yann@766
    20
+  *-linux-uclibc*) tm_defines="${tm_defines} USE_UCLIBC" ; tmake_file="${tmake_file} t-linux-uclibc";;
yann@766
    21
+esac
yann@766
    22
+
yann@766
    23
 case ${target} in
yann@766
    24
 i[34567]86-*-linux*aout* | i[34567]86-*-linux*libc1)
yann@766
    25
 	tmake_file="${tmake_file} i386/t-gmm_malloc"