patches/uClibc/0.9.30.2/110-arm_fix_alignment.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)
jocke@1737
     1
Original patch from Gentoo.
jocke@1737
     2
jocke@1737
     3
-= BEGIN original header =-
jocke@1737
     4
ARMV5 can use STRD and LDRD access instructions but these accesses need to be 
jocke@1737
     5
8 byte aligned. The dynamic linker's malloc needs to match this so structures
jocke@1737
     6
become 8 byte aligned to void unaligned accesses.
jocke@1737
     7
jocke@1737
     8
RP - 14/02/2008
jocke@1737
     9
jocke@1737
    10
-= END original header =-
jocke@1737
    11
jocke@1737
    12
Modified slightly for uClibc-0.9.30.2 by Joachim Nilsson <jocke@vmlinux.org>
jocke@1737
    13
jocke@1737
    14
diff -durN uClibc-0.9.30.orig/ldso/ldso/arm/dl-sysdep.h uClibc-0.9.30/ldso/ldso/arm/dl-sysdep.h
jocke@1737
    15
--- uClibc-0.9.30.orig/ldso/ldso/arm/dl-sysdep.h	2008-09-25 10:35:20.000000000 +0200
jocke@1737
    16
+++ uClibc-0.9.30/ldso/ldso/arm/dl-sysdep.h	2009-02-07 09:57:59.000000000 +0100
jocke@1737
    17
@@ -15,6 +15,8 @@
jocke@1737
    18
   GOT_BASE[1] = (unsigned long) MODULE; \
jocke@1737
    19
 }
jocke@1737
    20
 
jocke@1737
    21
+#define DL_MALLOC_ALIGN 8  /* EABI needs 8 byte alignment for STRD LDRD*/
jocke@1737
    22
+
jocke@1737
    23
 static __always_inline unsigned long arm_modulus(unsigned long m, unsigned long p)
jocke@1737
    24
 {
jocke@1737
    25
 	unsigned long i,t,inc;