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