patches/uClibc/0.9.30/110-arm_fix_alignment.patch
author Zoltan Devai <zdevai@gmail.com>
Wed Oct 28 12:03:38 2009 +0100 (2009-10-28)
changeset 1602 1ba79f2126df
permissions -rw-r--r--
libc/uClibc: fix building on system with recent glibc

While trying to build a toolchain with ct-ng 1.5.0,
arm-unknown-linux-uclibcgnueabi target,
I get the following error:

[INFO ] Installing C library headers
[EXTRA] Copying sources to build dir
[EXTRA] Applying configuration
[EXTRA] Building headers
[EXTRA] Installing headers
[ERROR] extra/scripts/unifdef.c:209: error: conflicting types for 'getline'
[ERROR] make[2]: *** [extra/scripts/unifdef] Error 1
[ERROR] Build failed in step 'Installing C library headers'

The following patch solves the problem.
(It's a backport of this uClibc commit:
http://git.uclibc.org/uClibc/commit/?id=49e81cada73616864b9b31df0aeb6961c30f5a6e
)

[--SNIP from another mail--]
AFAIK this is a problem since glibc 2.10.
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;