]> code.ossystems Code Review - openembedded-core.git/commitdiff
glibc: Add 2.9 from OE.dev
authorRichard Purdie <rpurdie@linux.intel.com>
Wed, 26 Aug 2009 22:10:10 +0000 (23:10 +0100)
committerRichard Purdie <rpurdie@linux.intel.com>
Wed, 26 Aug 2009 22:10:10 +0000 (23:10 +0100)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
13 files changed:
meta/packages/glibc/glibc-2.9/arm-check-pf.patch [new file with mode: 0644]
meta/packages/glibc/glibc-2.9/arm-longlong.patch [new file with mode: 0644]
meta/packages/glibc/glibc-2.9/arm-lowlevellock-include-tls.patch [new file with mode: 0644]
meta/packages/glibc/glibc-2.9/arm-memcpy.patch [new file with mode: 0644]
meta/packages/glibc/glibc-2.9/dl-cache-libcmp.patch [new file with mode: 0644]
meta/packages/glibc/glibc-2.9/glibc-arm-IO-acquire-lock-fix.diff [new file with mode: 0644]
meta/packages/glibc/glibc-2.9/glibc-arm-no-asm-page.patch [new file with mode: 0644]
meta/packages/glibc/glibc-2.9/local-args6.diff [new file with mode: 0644]
meta/packages/glibc/glibc-2.9/march-i686.patch [new file with mode: 0644]
meta/packages/glibc/glibc-2.9/tls_i486.patch [new file with mode: 0644]
meta/packages/glibc/glibc-initial.inc
meta/packages/glibc/glibc-initial_2.9.bb [new file with mode: 0644]
meta/packages/glibc/glibc_2.9.bb [new file with mode: 0644]

diff --git a/meta/packages/glibc/glibc-2.9/arm-check-pf.patch b/meta/packages/glibc/glibc-2.9/arm-check-pf.patch
new file mode 100644 (file)
index 0000000..b9c7226
--- /dev/null
@@ -0,0 +1,14 @@
+Index: glibc-2.9/ports/sysdeps/unix/sysv/linux/arm/check_pf.c
+===================================================================
+--- glibc-2.9.orig/ports/sysdeps/unix/sysv/linux/arm/check_pf.c        2009-06-19 20:45:32.451372131 +0400
++++ glibc-2.9/ports/sysdeps/unix/sysv/linux/arm/check_pf.c     2009-06-19 20:45:51.351313426 +0400
+@@ -207,9 +207,6 @@
+                     newp->info.flags = (((ifam->ifa_flags & IFA_F_DEPRECATED)
+                                          ? in6ai_deprecated : 0)
+                                         | ((ifam->ifa_flags
+-                                            & IFA_F_TEMPORARY)
+-                                           ? in6ai_temporary : 0)
+-                                        | ((ifam->ifa_flags
+                                             & IFA_F_HOMEADDRESS)
+                                            ? in6ai_homeaddress : 0));
+                     memcpy (newp->info.addr, address ?: local,
diff --git a/meta/packages/glibc/glibc-2.9/arm-longlong.patch b/meta/packages/glibc/glibc-2.9/arm-longlong.patch
new file mode 100644 (file)
index 0000000..28aca83
--- /dev/null
@@ -0,0 +1,58 @@
+--- glibc-2.4/stdlib/longlong.h.ark    2006-03-11 22:49:27.000000000 +0100
++++ glibc-2.4/stdlib/longlong.h        2006-03-11 22:55:12.000000000 +0100
+@@ -206,6 +206,14 @@
+            "rI" ((USItype) (bh)),                                     \
+            "r" ((USItype) (al)),                                      \
+            "rI" ((USItype) (bl)) __CLOBBER_CC)
++/* v3m and all higher arches have long multiply support.  */
++#if !defined(__ARM_ARCH_2__) && !defined(__ARM_ARCH_3__)
++#define umul_ppmm(xh, xl, a, b) \
++  __asm__ ("umull %0,%1,%2,%3" : "=&r" (xl), "=&r" (xh) : "r" (a), "r" (b))
++#define UMUL_TIME 5
++#define smul_ppmm(xh, xl, a, b) \
++  __asm__ ("smull %0,%1,%2,%3" : "=&r" (xl), "=&r" (xh) : "r" (a), "r" (b))
++#else                                                    
+ #define umul_ppmm(xh, xl, a, b) \
+ {register USItype __t0, __t1, __t2;                                   \
+   __asm__ ("%@ Inlined umul_ppmm\n"                                   \
+@@ -227,7 +235,13 @@
+          : "r" ((USItype) (a)),                                       \
+            "r" ((USItype) (b)) __CLOBBER_CC );}
+ #define UMUL_TIME 20
++#endif
+ #define UDIV_TIME 100
++#if defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || defined(__ARM_ARCH_5TE__)
++#define count_leading_zeros(COUNT,X)   ((COUNT) = __builtin_clz (X))
++#define COUNT_LEADING_ZEROS_0 32
++#endif
++                                                         
+ #endif /* __arm__ */
+ #if defined (__hppa) && W_TYPE_SIZE == 32
+--- glibc-2.4/ports/sysdeps/arm/mp_clz_tab.c.ark       2006-03-11 22:56:43.000000000 +0100
++++ glibc-2.4/ports/sysdeps/arm/mp_clz_tab.c   2006-03-11 22:58:19.000000000 +0100
+@@ -0,0 +1,24 @@
++/* __clz_tab -- support for longlong.h
++   Copyright (C) 2004 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++#if defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || defined(__ARM_ARCH_5TE__)
++/* Nothing required.  */
++#else
++#include <stdlib/mp_clz_tab.c>
++#endif
diff --git a/meta/packages/glibc/glibc-2.9/arm-lowlevellock-include-tls.patch b/meta/packages/glibc/glibc-2.9/arm-lowlevellock-include-tls.patch
new file mode 100644 (file)
index 0000000..5c8062e
--- /dev/null
@@ -0,0 +1,12 @@
+Index: glibc-2.9/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
+===================================================================
+--- glibc-2.9.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h       2009-06-19 20:54:35.446686910 +0400
++++ glibc-2.9/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h    2009-06-19 20:54:43.774683370 +0400
+@@ -25,6 +25,7 @@
+ #include <atomic.h>
+ #include <sysdep.h>
+ #include <kernel-features.h>
++#include <tls.h>
+ #define FUTEX_WAIT            0
+ #define FUTEX_WAKE            1
diff --git a/meta/packages/glibc/glibc-2.9/arm-memcpy.patch b/meta/packages/glibc/glibc-2.9/arm-memcpy.patch
new file mode 100644 (file)
index 0000000..bc2b3da
--- /dev/null
@@ -0,0 +1,758 @@
+--- /dev/null  2004-02-02 20:32:13.000000000 +0000
++++ sysdeps/arm/memmove.S      2004-03-20 18:37:23.000000000 +0000
+@@ -0,0 +1,251 @@
++/*
++ *   Optimized memmove implementation for ARM processors
++ *
++ *    Author:         Nicolas Pitre
++ *    Created:        Dec 23, 2003
++ *    Copyright:      (C) MontaVista Software, Inc.
++ *
++ *   This file is free software; you can redistribute it and/or
++ *   modify it under the terms of the GNU Lesser General Public
++ *   License as published by the Free Software Foundation; either
++ *   version 2.1 of the License, or (at your option) any later version.
++ *
++ *   This file is distributed in the hope that it will be useful,
++ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *   Lesser General Public License for more details.
++ */
++
++#include <sysdep.h>
++
++
++/*
++ * Endian independent macros for shifting bytes within registers.
++ */
++#ifndef __ARMEB__
++#define pull            lsr
++#define push            lsl
++#else
++#define pull            lsl
++#define push            lsr
++#endif
++
++/*
++ * Enable data preload for architectures that support it (ARMv5 and above)
++ */
++#if defined(__ARM_ARCH_5__) || \
++    defined(__ARM_ARCH_5T__) || \
++    defined(__ARM_ARCH_5TE__)
++#define PLD(code...)  code
++#else
++#define PLD(code...)
++#endif
++
++
++/* char * memmove (char *dst, const char *src) */
++ENTRY(memmove)
++              subs    ip, r0, r1
++              cmphi   r2, ip
++              bls     memcpy(PLT)
++
++              stmfd   sp!, {r0, r4, lr}
++              add     r1, r1, r2
++              add     r0, r0, r2
++              subs    r2, r2, #4
++              blt     25f
++              ands    ip, r0, #3
++      PLD(    pld     [r1, #-4]               )
++              bne     26f
++              ands    ip, r1, #3
++              bne     27f
++
++19:           subs    r2, r2, #4
++              blt     24f
++              subs    r2, r2, #8
++              blt     23f
++              subs    r2, r2, #16
++              blt     22f
++
++      PLD(    pld     [r1, #-32]              )
++      PLD(    subs    r2, r2, #96             )
++              stmfd   sp!, {r5 - r8}
++      PLD(    blt     21f                     )
++
++      PLD(    @ cache alignment               )
++      PLD(    ands    ip, r1, #31             )
++      PLD(    pld     [r1, #-64]              )
++      PLD(    beq     20f                     )
++      PLD(    cmp     r2, ip                  )
++      PLD(    pld     [r1, #-96]              )
++      PLD(    blt     20f                     )
++      PLD(    cmp     ip, #16                 )
++      PLD(    sub     r2, r2, ip              )
++      PLD(    ldmgedb r1!, {r3 - r6}          )
++      PLD(    stmgedb r0!, {r3 - r6}          )
++      PLD(    beq     20f                     )
++      PLD(    and     ip, ip, #15             )
++      PLD(    cmp     ip, #8                  )
++      PLD(    ldr     r3, [r1, #-4]!          )
++      PLD(    ldrge   r4, [r1, #-4]!          )
++      PLD(    ldrgt   r5, [r1, #-4]!          )
++      PLD(    str     r3, [r0, #-4]!          )
++      PLD(    strge   r4, [r0, #-4]!          )
++      PLD(    strgt   r5, [r0, #-4]!          )
++
++20:   PLD(    pld     [r1, #-96]              )
++      PLD(    pld     [r1, #-128]             )
++21:           ldmdb   r1!, {r3, r4, ip, lr}
++              subs    r2, r2, #32
++              stmdb   r0!, {r3, r4, ip, lr}
++              ldmdb   r1!, {r3, r4, ip, lr}
++              stmgedb r0!, {r3, r4, ip, lr}
++              ldmgedb r1!, {r3, r4, ip, lr}
++              stmgedb r0!, {r3, r4, ip, lr}
++              ldmgedb r1!, {r3, r4, ip, lr}
++              subges  r2, r2, #32
++              stmdb   r0!, {r3, r4, ip, lr}
++              bge     20b
++      PLD(    cmn     r2, #96                 )
++      PLD(    bge     21b                     )
++      PLD(    add     r2, r2, #96             )
++              tst     r2, #31
++              ldmfd   sp!, {r5 - r8}
++              ldmeqfd sp!, {r0, r4, pc}
++
++              tst     r2, #16
++22:           ldmnedb r1!, {r3, r4, ip, lr}
++              stmnedb r0!, {r3, r4, ip, lr}
++
++              tst     r2, #8
++23:           ldmnedb r1!, {r3, r4}
++              stmnedb r0!, {r3, r4}
++
++              tst     r2, #4
++24:           ldrne   r3, [r1, #-4]!
++              strne   r3, [r0, #-4]!
++
++25:           ands    r2, r2, #3
++              ldmeqfd sp!, {r0, r4, pc}
++
++              cmp     r2, #2
++              ldrb    r3, [r1, #-1]
++              ldrgeb  r4, [r1, #-2]
++              ldrgtb  ip, [r1, #-3]
++              strb    r3, [r0, #-1]
++              strgeb  r4, [r0, #-2]
++              strgtb  ip, [r0, #-3]
++              ldmfd   sp!, {r0, r4, pc}
++
++26:           cmp     ip, #2
++              ldrb    r3, [r1, #-1]!
++              ldrgeb  r4, [r1, #-1]!
++              ldrgtb  lr, [r1, #-1]!
++              strb    r3, [r0, #-1]!
++              strgeb  r4, [r0, #-1]!
++              strgtb  lr, [r0, #-1]!
++              subs    r2, r2, ip
++              blt     25b
++              ands    ip, r1, #3
++              beq     19b
++
++27:           bic     r1, r1, #3
++              cmp     ip, #2
++              ldr     r3, [r1]
++              beq     35f
++              blt     36f
++
++
++              .macro  backward_copy_shift push pull
++
++              cmp     r2, #12
++      PLD(    pld     [r1, #-4]               )
++              blt     33f
++              subs    r2, r2, #28
++              stmfd   sp!, {r5 - r9}
++              blt     31f
++
++      PLD(    subs    r2, r2, #96             )
++      PLD(    pld     [r1, #-32]              )
++      PLD(    blt     30f                     )
++      PLD(    pld     [r1, #-64]              )
++
++      PLD(    @ cache alignment               )
++      PLD(    ands    ip, r1, #31             )
++      PLD(    pld     [r1, #-96]              )
++      PLD(    beq     29f                     )
++      PLD(    cmp     r2, ip                  )
++      PLD(    pld     [r1, #-128]             )
++      PLD(    blt     29f                     )
++      PLD(    sub     r2, r2, ip              )
++28:   PLD(    mov     r4, r3, push #\push     )
++      PLD(    ldr     r3, [r1, #-4]!          )
++      PLD(    subs    ip, ip, #4              )
++      PLD(    orr     r4, r4, r3, pull #\pull )
++      PLD(    str     r4, [r0, #-4]!          )
++      PLD(    bgt     28b                     )
++
++29:   PLD(    pld     [r1, #-128]             )
++30:           mov     lr, r3, push #\push
++              ldmdb   r1!, {r3 - r9, ip}
++              subs    r2, r2, #32
++              orr     lr, lr, ip, pull #\pull
++              mov     ip, ip, push #\push
++              orr     ip, ip, r9, pull #\pull
++              mov     r9, r9, push #\push
++              orr     r9, r9, r8, pull #\pull
++              mov     r8, r8, push #\push
++              orr     r8, r8, r7, pull #\pull
++              mov     r7, r7, push #\push
++              orr     r7, r7, r6, pull #\pull
++              mov     r6, r6, push #\push
++              orr     r6, r6, r5, pull #\pull
++              mov     r5, r5, push #\push
++              orr     r5, r5, r4, pull #\pull
++              mov     r4, r4, push #\push
++              orr     r4, r4, r3, pull #\pull
++              stmdb   r0!, {r4 - r9, ip, lr}
++              bge     29b
++      PLD(    cmn     r2, #96                 )
++      PLD(    bge     30b                     )
++      PLD(    add     r2, r2, #96             )
++              cmn     r2, #16
++              blt     32f
++31:           mov     r7, r3, push #\push
++              ldmdb   r1!, {r3 - r6}
++              sub     r2, r2, #16
++              orr     r7, r7, r6, pull #\pull
++              mov     r6, r6, push #\push
++              orr     r6, r6, r5, pull #\pull
++              mov     r5, r5, push #\push
++              orr     r5, r5, r4, pull #\pull
++              mov     r4, r4, push #\push
++              orr     r4, r4, r3, pull #\pull
++              stmdb   r0!, {r4 - r7}
++32:           adds    r2, r2, #28
++              ldmfd   sp!, {r5 - r9}
++              blt     34f
++33:           mov     r4, r3, push #\push
++              ldr     r3, [r1, #-4]!
++              subs    r2, r2, #4
++              orr     r4, r4, r3, pull #\pull
++              str     r4, [r0, #-4]!
++              bge     33b
++34:
++              .endm
++
++
++              backward_copy_shift     push=8  pull=24
++              add     r1, r1, #3
++              b       25b
++
++35:           backward_copy_shift     push=16 pull=16
++              add     r1, r1, #2
++              b       25b
++
++36:           backward_copy_shift     push=24 pull=8
++              add     r1, r1, #1
++              b       25b
++
++              .size   memmove, . - memmove
++END(memmove)
++libc_hidden_builtin_def (memmove)
+--- /dev/null  2004-02-02 20:32:13.000000000 +0000
++++ sysdeps/arm/bcopy.S        2004-03-20 18:37:48.000000000 +0000
+@@ -0,0 +1,255 @@
++/*
++ *   Optimized memmove implementation for ARM processors
++ *
++ *    Author:         Nicolas Pitre
++ *    Created:        Dec 23, 2003
++ *    Copyright:      (C) MontaVista Software, Inc.
++ *
++ *   This file is free software; you can redistribute it and/or
++ *   modify it under the terms of the GNU Lesser General Public
++ *   License as published by the Free Software Foundation; either
++ *   version 2.1 of the License, or (at your option) any later version.
++ *
++ *   This file is distributed in the hope that it will be useful,
++ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *   Lesser General Public License for more details.
++ */
++
++#include <sysdep.h>
++
++
++/*
++ * Endian independent macros for shifting bytes within registers.
++ */
++#ifndef __ARMEB__
++#define pull            lsr
++#define push            lsl
++#else
++#define pull            lsl
++#define push            lsr
++#endif
++
++/*
++ * Enable data preload for architectures that support it (ARMv5 and above)
++ */
++#if defined(__ARM_ARCH_5__) || \
++    defined(__ARM_ARCH_5T__) || \
++    defined(__ARM_ARCH_5TE__)
++#define PLD(code...)  code
++#else
++#define PLD(code...)
++#endif
++
++dst           .req    r1
++src           .req    r0
++
++/* void *bcopy (const char *src, char *dst, size_t size) */
++ENTRY(bcopy)
++              subs    ip, dst, src
++              cmphi   r2, ip
++              movls   r3, r0
++              movls   r0, r1
++              movls   r1, r3
++              bls     memcpy(PLT)
++
++              stmfd   sp!, {r4, lr}
++              add     src, src, r2
++              add     dst, dst, r2
++              subs    r2, r2, #4
++              blt     25f
++              ands    ip, dst, #3
++      PLD(    pld     [src, #-4]              )
++              bne     26f
++              ands    ip, src, #3
++              bne     27f
++
++19:           subs    r2, r2, #4
++              blt     24f
++              subs    r2, r2, #8
++              blt     23f
++              subs    r2, r2, #16
++              blt     22f
++
++      PLD(    pld     [src, #-32]             )
++      PLD(    subs    r2, r2, #96             )
++              stmfd   sp!, {r5 - r8}
++      PLD(    blt     21f                     )
++
++      PLD(    @ cache alignment               )
++      PLD(    ands    ip, src, #31            )
++      PLD(    pld     [src, #-64]             )
++      PLD(    beq     20f                     )
++      PLD(    cmp     r2, ip                  )
++      PLD(    pld     [src, #-96]             )
++      PLD(    blt     20f                     )
++      PLD(    cmp     ip, #16                 )
++      PLD(    sub     r2, r2, ip              )
++      PLD(    ldmgedb src!, {r3 - r6}         )
++      PLD(    stmgedb dst!, {r3 - r6}         )
++      PLD(    beq     20f                     )
++      PLD(    and     ip, ip, #15             )
++      PLD(    cmp     ip, #8                  )
++      PLD(    ldr     r3, [src, #-4]!         )
++      PLD(    ldrge   r4, [src, #-4]!         )
++      PLD(    ldrgt   r5, [src, #-4]!         )
++      PLD(    str     r3, [dst, #-4]!         )
++      PLD(    strge   r4, [dst, #-4]!         )
++      PLD(    strgt   r5, [dst, #-4]!         )
++
++20:   PLD(    pld     [src, #-96]             )
++      PLD(    pld     [src, #-128]            )
++21:           ldmdb   src!, {r3, r4, ip, lr}
++              subs    r2, r2, #32
++              stmdb   dst!, {r3, r4, ip, lr}
++              ldmdb   src!, {r3, r4, ip, lr}
++              stmgedb dst!, {r3, r4, ip, lr}
++              ldmgedb src!, {r3, r4, ip, lr}
++              stmgedb dst!, {r3, r4, ip, lr}
++              ldmgedb src!, {r3, r4, ip, lr}
++              subges  r2, r2, #32
++              stmdb   dst!, {r3, r4, ip, lr}
++              bge     20b
++      PLD(    cmn     r2, #96                 )
++      PLD(    bge     21b                     )
++      PLD(    add     r2, r2, #96             )
++              tst     r2, #31
++              ldmfd   sp!, {r5 - r8}
++              ldmeqfd sp!, {r4, pc}
++
++              tst     r2, #16
++22:           ldmnedb src!, {r3, r4, ip, lr}
++              stmnedb dst!, {r3, r4, ip, lr}
++
++              tst     r2, #8
++23:           ldmnedb src!, {r3, r4}
++              stmnedb dst!, {r3, r4}
++
++              tst     r2, #4
++24:           ldrne   r3, [src, #-4]!
++              strne   r3, [dst, #-4]!
++
++25:           ands    r2, r2, #3
++              ldmeqfd sp!, {dst, r4, pc}
++
++              cmp     r2, #2
++              ldrb    r3, [src, #-1]
++              ldrgeb  r4, [src, #-2]
++              ldrgtb  ip, [src, #-3]
++              strb    r3, [dst, #-1]
++              strgeb  r4, [dst, #-2]
++              strgtb  ip, [dst, #-3]
++              ldmfd   sp!, {dst, r4, pc}
++
++26:           cmp     ip, #2
++              ldrb    r3, [src, #-1]!
++              ldrgeb  r4, [src, #-1]!
++              ldrgtb  lr, [src, #-1]!
++              strb    r3, [dst, #-1]!
++              strgeb  r4, [dst, #-1]!
++              strgtb  lr, [dst, #-1]!
++              subs    r2, r2, ip
++              blt     25b
++              ands    ip, src, #3
++              beq     19b
++
++27:           bic     src, src, #3
++              cmp     ip, #2
++              ldr     r3, [src]
++              beq     35f
++              blt     36f
++
++
++              .macro  backward_copy_shift push pull
++
++              cmp     r2, #12
++      PLD(    pld     [src, #-4]              )
++              blt     33f
++              subs    r2, r2, #28
++              stmfd   sp!, {r5 - r9}
++              blt     31f
++
++      PLD(    subs    r2, r2, #96             )
++      PLD(    pld     [src, #-32]             )
++      PLD(    blt     30f                     )
++      PLD(    pld     [src, #-64]             )
++
++      PLD(    @ cache alignment               )
++      PLD(    ands    ip, src, #31            )
++      PLD(    pld     [src, #-96]             )
++      PLD(    beq     29f                     )
++      PLD(    cmp     r2, ip                  )
++      PLD(    pld     [src, #-128]            )
++      PLD(    blt     29f                     )
++      PLD(    sub     r2, r2, ip              )
++28:   PLD(    mov     r4, r3, push #\push     )
++      PLD(    ldr     r3, [src, #-4]!         )
++      PLD(    subs    ip, ip, #4              )
++      PLD(    orr     r4, r4, r3, pull #\pull )
++      PLD(    str     r4, [dst, #-4]!         )
++      PLD(    bgt     28b                     )
++
++29:   PLD(    pld     [src, #-128]            )
++30:           mov     lr, r3, push #\push
++              ldmdb   src!, {r3 - r9, ip}
++              subs    r2, r2, #32
++              orr     lr, lr, ip, pull #\pull
++              mov     ip, ip, push #\push
++              orr     ip, ip, r9, pull #\pull
++              mov     r9, r9, push #\push
++              orr     r9, r9, r8, pull #\pull
++              mov     r8, r8, push #\push
++              orr     r8, r8, r7, pull #\pull
++              mov     r7, r7, push #\push
++              orr     r7, r7, r6, pull #\pull
++              mov     r6, r6, push #\push
++              orr     r6, r6, r5, pull #\pull
++              mov     r5, r5, push #\push
++              orr     r5, r5, r4, pull #\pull
++              mov     r4, r4, push #\push
++              orr     r4, r4, r3, pull #\pull
++              stmdb   dst!, {r4 - r9, ip, lr}
++              bge     29b
++      PLD(    cmn     r2, #96                 )
++      PLD(    bge     30b                     )
++      PLD(    add     r2, r2, #96             )
++              cmn     r2, #16
++              blt     32f
++31:           mov     r7, r3, push #\push
++              ldmdb   src!, {r3 - r6}
++              sub     r2, r2, #16
++              orr     r7, r7, r6, pull #\pull
++              mov     r6, r6, push #\push
++              orr     r6, r6, r5, pull #\pull
++              mov     r5, r5, push #\push
++              orr     r5, r5, r4, pull #\pull
++              mov     r4, r4, push #\push
++              orr     r4, r4, r3, pull #\pull
++              stmdb   dst!, {r4 - r7}
++32:           adds    r2, r2, #28
++              ldmfd   sp!, {r5 - r9}
++              blt     34f
++33:           mov     r4, r3, push #\push
++              ldr     r3, [src, #-4]!
++              subs    r2, r2, #4
++              orr     r4, r4, r3, pull #\pull
++              str     r4, [dst, #-4]!
++              bge     33b
++34:
++              .endm
++
++
++              backward_copy_shift     push=8  pull=24
++              add     src, src, #3
++              b       25b
++
++35:           backward_copy_shift     push=16 pull=16
++              add     src, src, #2
++              b       25b
++
++36:           backward_copy_shift     push=24 pull=8
++              add     src, src, #1
++              b       25b
++
++              .size   bcopy, . - bcopy
++END(bcopy)
+
+--- /dev/null  2004-02-02 20:32:13.000000000 +0000
++++ sysdeps/arm/memcpy.S       2004-05-02 14:33:22.000000000 +0100
+@@ -0,0 +1,242 @@
++/*
++ *   Optimized memcpy implementation for ARM processors
++ *
++ *    Author:         Nicolas Pitre
++ *    Created:        Dec 23, 2003
++ *    Copyright:      (C) MontaVista Software, Inc.
++ *
++ *   This file is free software; you can redistribute it and/or
++ *   modify it under the terms of the GNU Lesser General Public
++ *   License as published by the Free Software Foundation; either
++ *   version 2.1 of the License, or (at your option) any later version.
++ *
++ *   This file is distributed in the hope that it will be useful,
++ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *   Lesser General Public License for more details.
++ */
++
++#include <sysdep.h>
++
++
++/*
++ * Endian independent macros for shifting bytes within registers.
++ */
++#ifndef __ARMEB__
++#define pull            lsr
++#define push            lsl
++#else
++#define pull            lsl
++#define push            lsr
++#endif
++
++/*
++ * Enable data preload for architectures that support it (ARMv5 and above)
++ */
++#if defined(__ARM_ARCH_5__) || \
++    defined(__ARM_ARCH_5T__) || \
++    defined(__ARM_ARCH_5TE__)
++#define PLD(code...)  code
++#else
++#define PLD(code...)
++#endif
++
++
++/* char * memcpy (char *dst, const char *src) */
++
++ENTRY(memcpy)
++              subs    r2, r2, #4
++              stmfd   sp!, {r0, r4, lr}
++              blt     7f
++              ands    ip, r0, #3
++      PLD(    pld     [r1, #0]                )
++              bne     8f
++              ands    ip, r1, #3
++              bne     9f
++
++1:            subs    r2, r2, #4
++              blt     6f
++              subs    r2, r2, #8
++              blt     5f
++              subs    r2, r2, #16
++              blt     4f
++
++      PLD(    subs    r2, r2, #65             )
++              stmfd   sp!, {r5 - r8}
++      PLD(    blt     3f                      )
++      PLD(    pld     [r1, #32]               )
++
++      PLD(    @ cache alignment               )
++      PLD(    ands    ip, r1, #31             )
++      PLD(    pld     [r1, #64]               )
++      PLD(    beq     2f                      )
++      PLD(    rsb     ip, ip, #32             )
++      PLD(    cmp     r2, ip                  )
++      PLD(    pld     [r1, #96]               )
++      PLD(    blt     2f                      )
++      PLD(    cmp     ip, #16                 )
++      PLD(    sub     r2, r2, ip              )
++      PLD(    ldmgeia r1!, {r3 - r6}          )
++      PLD(    stmgeia r0!, {r3 - r6}          )
++      PLD(    beq     2f                      )
++      PLD(    and     ip, ip, #15             )
++      PLD(    cmp     ip, #8                  )
++      PLD(    ldr     r3, [r1], #4            )
++      PLD(    ldrge   r4, [r1], #4            )
++      PLD(    ldrgt   r5, [r1], #4            )
++      PLD(    str     r3, [r0], #4            )
++      PLD(    strge   r4, [r0], #4            )
++      PLD(    strgt   r5, [r0], #4            )
++
++2:    PLD(    pld     [r1, #96]               )
++3:            ldmia   r1!, {r3 - r8, ip, lr}
++              subs    r2, r2, #32
++              stmia   r0!, {r3 - r8, ip, lr}
++              bge     2b
++      PLD(    cmn     r2, #65                 )
++      PLD(    bge     3b                      )
++      PLD(    add     r2, r2, #65             )
++              tst     r2, #31
++              ldmfd   sp!, {r5 - r8}
++              ldmeqfd sp!, {r0, r4, pc}
++
++              tst     r2, #16
++4:            ldmneia r1!, {r3, r4, ip, lr}
++              stmneia r0!, {r3, r4, ip, lr}
++
++              tst     r2, #8
++5:            ldmneia r1!, {r3, r4}
++              stmneia r0!, {r3, r4}
++
++              tst     r2, #4
++6:            ldrne   r3, [r1], #4
++              strne   r3, [r0], #4
++
++7:            ands    r2, r2, #3
++              ldmeqfd sp!, {r0, r4, pc}
++
++              cmp     r2, #2
++              ldrb    r3, [r1], #1
++              ldrgeb  r4, [r1], #1
++              ldrgtb  ip, [r1]
++              strb    r3, [r0], #1
++              strgeb  r4, [r0], #1
++              strgtb  ip, [r0]
++              ldmfd   sp!, {r0, r4, pc}
++
++8:            rsb     ip, ip, #4
++              cmp     ip, #2
++              ldrb    r3, [r1], #1
++              ldrgeb  r4, [r1], #1
++              ldrgtb  lr, [r1], #1
++              strb    r3, [r0], #1
++              strgeb  r4, [r0], #1
++              strgtb  lr, [r0], #1
++              subs    r2, r2, ip
++              blt     7b
++              ands    ip, r1, #3
++              beq     1b
++
++9:            bic     r1, r1, #3
++              cmp     ip, #2
++              ldr     lr, [r1], #4
++              beq     17f
++              bgt     18f
++
++
++              .macro  forward_copy_shift pull push
++
++              cmp     r2, #12
++      PLD(    pld     [r1, #0]                )
++              blt     15f
++              subs    r2, r2, #28
++              stmfd   sp!, {r5 - r9}
++              blt     13f
++
++      PLD(    subs    r2, r2, #97             )
++      PLD(    blt     12f                     )
++      PLD(    pld     [r1, #32]               )
++
++      PLD(    @ cache alignment               )
++      PLD(    rsb     ip, r1, #36             )
++      PLD(    pld     [r1, #64]               )
++      PLD(    ands    ip, ip, #31             )
++      PLD(    pld     [r1, #96]               )
++      PLD(    beq     11f                     )
++      PLD(    cmp     r2, ip                  )
++      PLD(    pld     [r1, #128]              )
++      PLD(    blt     11f                     )
++      PLD(    sub     r2, r2, ip              )
++10:   PLD(    mov     r3, lr, pull #\pull     )
++      PLD(    ldr     lr, [r1], #4            )
++      PLD(    subs    ip, ip, #4              )
++      PLD(    orr     r3, r3, lr, push #\push )
++      PLD(    str     r3, [r0], #4            )
++      PLD(    bgt     10b                     )
++
++11:   PLD(    pld     [r1, #128]              )
++12:           mov     r3, lr, pull #\pull
++              ldmia   r1!, {r4 - r9, ip, lr}
++              subs    r2, r2, #32
++              orr     r3, r3, r4, push #\push
++              mov     r4, r4, pull #\pull
++              orr     r4, r4, r5, push #\push
++              mov     r5, r5, pull #\pull
++              orr     r5, r5, r6, push #\push
++              mov     r6, r6, pull #\pull
++              orr     r6, r6, r7, push #\push
++              mov     r7, r7, pull #\pull
++              orr     r7, r7, r8, push #\push
++              mov     r8, r8, pull #\pull
++              orr     r8, r8, r9, push #\push
++              mov     r9, r9, pull #\pull
++              orr     r9, r9, ip, push #\push
++              mov     ip, ip, pull #\pull
++              orr     ip, ip, lr, push #\push
++              stmia   r0!, {r3 - r9, ip}
++              bge     11b
++      PLD(    cmn     r2, #97                 )
++      PLD(    bge     12b                     )
++      PLD(    add     r2, r2, #97             )
++              cmn     r2, #16
++              blt     14f
++13:           mov     r3, lr, pull #\pull
++              ldmia   r1!, {r4 - r6, lr}
++              sub     r2, r2, #16
++              orr     r3, r3, r4, push #\push
++              mov     r4, r4, pull #\pull
++              orr     r4, r4, r5, push #\push
++              mov     r5, r5, pull #\pull
++              orr     r5, r5, r6, push #\push
++              mov     r6, r6, pull #\pull
++              orr     r6, r6, lr, push #\push
++              stmia   r0!, {r3 - r6}
++14:           adds    r2, r2, #28
++              ldmfd   sp!, {r5 - r9}
++              blt     16f
++15:           mov     r3, lr, pull #\pull
++              ldr     lr, [r1], #4
++              subs    r2, r2, #4
++              orr     r3, r3, lr, push #\push
++              str     r3, [r0], #4
++              bge     15b
++16:
++              .endm
++
++
++              forward_copy_shift      pull=8  push=24
++              sub     r1, r1, #3
++              b       7b
++
++17:           forward_copy_shift      pull=16 push=16
++              sub     r1, r1, #2
++              b       7b
++
++18:           forward_copy_shift      pull=24 push=8
++              sub     r1, r1, #1
++              b       7b
++
++              .size   memcpy, . - memcpy
++END(memcpy)
++libc_hidden_builtin_def (memcpy)
++
diff --git a/meta/packages/glibc/glibc-2.9/dl-cache-libcmp.patch b/meta/packages/glibc/glibc-2.9/dl-cache-libcmp.patch
new file mode 100644 (file)
index 0000000..2fedfa6
--- /dev/null
@@ -0,0 +1,10 @@
+--- glibc-2.4/elf/Versions.ark 2006-03-11 23:30:09.000000000 +0100
++++ glibc-2.4/elf/Versions     2006-03-11 23:31:44.000000000 +0100
+@@ -63,5 +63,7 @@
+     _dl_debug_state;
+     # Pointer protection.
+     __pointer_chk_guard;
++    # for ldconfig
++    _dl_cache_libcmp;
+   }
+ }
diff --git a/meta/packages/glibc/glibc-2.9/glibc-arm-IO-acquire-lock-fix.diff b/meta/packages/glibc/glibc-2.9/glibc-arm-IO-acquire-lock-fix.diff
new file mode 100644 (file)
index 0000000..a552cf0
--- /dev/null
@@ -0,0 +1,13 @@
+Arm needs a similar fix as http://sourceware.org/ml/libc-ports/2007-12/msg00000.html
+
+--- /tmp/stdio-lock.h  2008-03-04 18:51:15.555038993 +0100
++++ glibc-2.7/ports/sysdeps/unix/sysv/linux/arm/bits/stdio-lock.h      2008-03-04 18:51:28.445035052 +0100
+@@ -50,6 +50,8 @@
+   _IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, (_fp));      \
+   _IO_flockfile (_fp)
++# define _IO_acquire_lock_clear_flags2(_fp) _IO_acquire_lock (_fp)
++
+ # define _IO_release_lock(_fp) \
+   _IO_funlockfile (_fp);                                                    \
+   _IO_cleanup_region_end (0)
diff --git a/meta/packages/glibc/glibc-2.9/glibc-arm-no-asm-page.patch b/meta/packages/glibc/glibc-2.9/glibc-arm-no-asm-page.patch
new file mode 100644 (file)
index 0000000..7eb1717
--- /dev/null
@@ -0,0 +1,15 @@
+http://sourceware.org/ml/libc-ports/2008-04/msg00005.html
+
+
+Index: glibc-2.6.1/ports/sysdeps/unix/sysv/linux/arm/ioperm.c
+===================================================================
+--- glibc-2.6.1.orig/ports/sysdeps/unix/sysv/linux/arm/ioperm.c        2008-09-12 18:08:18.000000000 -0700
++++ glibc-2.6.1/ports/sysdeps/unix/sysv/linux/arm/ioperm.c     2008-09-12 18:08:28.000000000 -0700
+@@ -45,7 +45,6 @@
+ #include <sys/mman.h>
+ #include <linux/version.h>
+-#include <asm/page.h>
+ #include <sys/sysctl.h>
+ #define PATH_ARM_SYSTYPE      "/etc/arm_systype"
diff --git a/meta/packages/glibc/glibc-2.9/local-args6.diff b/meta/packages/glibc/glibc-2.9/local-args6.diff
new file mode 100644 (file)
index 0000000..28c957f
--- /dev/null
@@ -0,0 +1,12 @@
+--- glibc-2.7/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h.orig
++++ glibc-2.7/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
+@@ -73,6 +73,9 @@
+ # define DOCARGS_5    DOCARGS_4
+ # define UNDOCARGS_5  UNDOCARGS_4
++# define DOCARGS_6    DOCARGS_5
++# define UNDOCARGS_6  UNDOCARGS_5
++
+ # ifdef IS_IN_libpthread
+ #  define CENABLE     bl PLTJMP(__pthread_enable_asynccancel)
+ #  define CDISABLE    bl PLTJMP(__pthread_disable_asynccancel)
diff --git a/meta/packages/glibc/glibc-2.9/march-i686.patch b/meta/packages/glibc/glibc-2.9/march-i686.patch
new file mode 100644 (file)
index 0000000..0461603
--- /dev/null
@@ -0,0 +1,38 @@
+2007-02-15  Khem Raj  <kraj@xxxxxxxxxx>
+
+       * sysdeps/unix/sysv/linux/i386/sysdep.h: Re-define __i686.
+       * nptl/sysdeps/pthread/pt-initfini.c: Ditto.
+
+
+
+Index: sysdeps/unix/sysv/linux/i386/sysdep.h
+===================================================================
+--- sysdeps/unix/sysv/linux/i386/sysdep.h      (revision 1469)
++++ sysdeps/unix/sysv/linux/i386/sysdep.h      (working copy)
+@@ -29,6 +29,10 @@
+ #include <dl-sysdep.h>
+ #include <tls.h>
++#if defined __i686 && defined __ASSEMBLER__
++#undef __i686
++#define __i686 __i686
++#endif
+ /* For Linux we can use the system call table in the header file
+       /usr/include/asm/unistd.h
+Index: nptl/sysdeps/pthread/pt-initfini.c
+===================================================================
+--- nptl/sysdeps/pthread/pt-initfini.c (revision 1469)
++++ nptl/sysdeps/pthread/pt-initfini.c (working copy)
+@@ -45,6 +45,11 @@
+ /* Embed an #include to pull in the alignment and .end directives. */
+ asm ("\n#include \"defs.h\"");
++asm ("\n#if defined __i686 && defined __ASSEMBLER__");
++asm ("\n#undef __i686");
++asm ("\n#define __i686 __i686");
++asm ("\n#endif");
++
+ /* The initial common code ends here. */
+ asm ("\n/*@HEADER_ENDS*/");
diff --git a/meta/packages/glibc/glibc-2.9/tls_i486.patch b/meta/packages/glibc/glibc-2.9/tls_i486.patch
new file mode 100644 (file)
index 0000000..69a1fdf
--- /dev/null
@@ -0,0 +1,14 @@
+Index: glibc-2.9/sysdeps/i386/dl-tlsdesc.S
+===================================================================
+--- glibc-2.9.orig/sysdeps/i386/dl-tlsdesc.S   2009-07-07 23:21:11.647664128 +0200
++++ glibc-2.9/sysdeps/i386/dl-tlsdesc.S        2009-07-07 23:21:32.802555992 +0200
+@@ -128,8 +128,7 @@
+ .Lslow:
+       cfi_adjust_cfa_offset (28)
+       movl    %ebx, 16(%esp)
+-      call    __i686.get_pc_thunk.bx
+-      addl    $_GLOBAL_OFFSET_TABLE_, %ebx
++      LOAD_PIC_REG (bx)
+       call    ___tls_get_addr@PLT
+       movl    16(%esp), %ebx
+       jmp     .Lret
index 143a662d52971f5ec2123b0dd03763d3128625ec..21b7631d3e0884b5553ef58a2614b306dbf0e72d 100644 (file)
@@ -1,7 +1,7 @@
 SECTION = "libs"
 DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
 PACKAGES = ""
 PACKAGES_DYNAMIC = ""
diff --git a/meta/packages/glibc/glibc-initial_2.9.bb b/meta/packages/glibc/glibc-initial_2.9.bb
new file mode 100644 (file)
index 0000000..d662970
--- /dev/null
@@ -0,0 +1,6 @@
+require glibc_${PV}.bb
+require glibc-initial.inc
+
+do_configure_prepend () {
+       unset CFLAGS
+}
diff --git a/meta/packages/glibc/glibc_2.9.bb b/meta/packages/glibc/glibc_2.9.bb
new file mode 100644 (file)
index 0000000..d56e42f
--- /dev/null
@@ -0,0 +1,158 @@
+require glibc.inc
+
+ARM_INSTRUCTION_SET = "arm"
+
+PACKAGES_DYNAMIC = "libc6*"
+RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
+
+PR = "r0"
+
+# the -isystem in bitbake.conf screws up glibc do_stage
+BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
+TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
+
+GLIBC_ADDONS ?= "ports,nptl,libidn"
+
+GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN"
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+
+#
+# For now, we will skip building of a gcc package if it is a uclibc one
+# and our build is not a uclibc one, and we skip a glibc one if our build
+# is a uclibc build.
+#
+# See the note in gcc/gcc_3.4.0.oe
+#
+
+python __anonymous () {
+    import bb, re
+    uc_os = (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None)
+    if uc_os:
+        raise bb.parse.SkipPackage("incompatible with target %s" %
+                                   bb.data.getVar('TARGET_OS', d, 1))
+}
+
+RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
+
+#         file://noinfo.patch;patch=1
+#         file://ldconfig.patch;patch=1;pnum=0
+#         file://arm-machine-gmon.patch;patch=1;pnum=0 \
+#         \
+#         file://arm-ioperm.patch;patch=1;pnum=0 \
+#         file://ldd.patch;patch=1;pnum=0 \
+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
+          ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-2.7.tar.bz2 \
+          ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2 \
+           file://arm-memcpy.patch;patch=1 \
+           file://arm-longlong.patch;patch=1 \
+           file://fhs-linux-paths.patch;patch=1 \
+           file://dl-cache-libcmp.patch;patch=1 \
+           file://ldsocache-varrun.patch;patch=1 \
+           file://nptl-crosscompile.patch;patch=1 \
+          file://glibc-check_pf.patch;patch=1;pnum=0 \
+           file://ldd-unbash.patch;patch=1 \
+          file://glibc-arm-IO-acquire-lock-fix.diff;patch=1 \
+          file://local-args6.diff;patch=1 \
+          file://arm-check-pf.patch;patch=1 \
+          file://arm-lowlevellock-include-tls.patch;patch=1 \
+          file://generic-bits_select.h \
+          file://generic-bits_types.h \
+          file://generic-bits_typesizes.h \
+          file://generic-bits_time.h \
+           file://etc/ld.so.conf \
+           file://generate-supported.mk \
+           file://march-i686.patch;patch=1;pnum=0 \
+          file://tls_i486.patch;patch=1 \
+          file://glibc-arm-no-asm-page.patch;patch=1 \
+           "
+
+
+# Build fails on sh3 and sh4 without additional patches
+SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1"
+SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"
+
+#powerpc patches to add support for soft-float
+SRC_URI_append_powerpc= " file://powerpc-sqrt-hack.diff;patch=1"
+
+S = "${WORKDIR}/glibc-${PV}"
+B = "${WORKDIR}/build-${TARGET_SYS}"
+
+EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
+               --without-cvs --disable-profile --disable-debug --without-gd \
+               --enable-clocale=gnu \
+               --enable-add-ons=${GLIBC_ADDONS} \
+               --with-headers=${STAGING_INCDIR} \
+               --without-selinux \
+               ${GLIBC_EXTRA_OECONF}"
+
+EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}"
+
+do_munge() {
+       # Integrate ports and libidn into tree
+       mv ${WORKDIR}/glibc-ports-2.7 ${S}/ports
+       mv ${WORKDIR}/glibc-libidn-${PV} ${S}/libidn
+
+       # Ports isn't really working... Fix it
+       # Some of this is rather dirty, but it seems to be the only
+       # quick way to get this cruft to compile
+       rm -rf ${S}/ports/sysdeps/unix/sysv/linux/arm/linuxthreads
+       ln -s nptl ${S}/ports/sysdeps/unix/sysv/linux/arm/linuxthreads
+       cp ${S}/nptl/sysdeps/pthread/bits/sigthread.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/
+       cp ${S}/sysdeps/unix/sysv/linux/i386/bits/wchar.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/
+       cp ${S}/sysdeps/wordsize-32/bits/wordsize.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/
+       cp ${WORKDIR}/generic-bits_select.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/select.h
+       cp ${WORKDIR}/generic-bits_types.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/types.h
+       cp ${WORKDIR}/generic-bits_typesizes.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/typesizes.h
+       cp ${WORKDIR}/generic-bits_time.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/time.h
+       # Copy in generic stuff for not yet implemented headers
+       for i in ${S}/bits/*.h; do
+               F=`basename $i`
+               [ "$F" = "local_lim.h" ] && continue
+               [ "$F" = "errno.h" ] && continue
+               test -e ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/$F || test -e ${S}/ports/sysdeps/arm/bits/$F || test -e ${S}/sysdeps/unix/sysv/linux/bits/$F || test -e ${S}/sysdeps/ieee754/bits/$F || cp $i ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/
+       done
+       # This is harmful; we need to get the one from nptl/sysdeps/pthreads
+       rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/libc-lock.h
+       # Obsoleted by sysdeps/arm/{fpu,eabi}/bits/fenv.h
+       rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/fenv.h
+       # Obsoleted by sysdeps/gnu/bits/utmp.h
+       rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/utmp.h
+}
+
+addtask munge before do_patch after do_unpack
+
+
+do_configure () {
+# override this function to avoid the autoconf/automake/aclocal/autoheader
+# calls for now
+# don't pass CPPFLAGS into configure, since it upsets the kernel-headers
+# version check and doesn't really help with anything
+       if [ -z "`which rpcgen`" ]; then
+               echo "rpcgen not found.  Install glibc-devel."
+               exit 1
+       fi
+       (cd ${S} && gnu-configize) || die "failure in running gnu-configize"
+       CPPFLAGS="" oe_runconf
+}
+
+rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \
+         yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \
+         rusers.x spray.x nfs_prot.x rquota.x key_prot.x"
+
+do_compile () {
+       # -Wl,-rpath-link <staging>/lib in LDFLAGS can cause breakage if another glibc is in staging
+       unset LDFLAGS
+       base_do_compile
+       (
+               cd ${S}/sunrpc/rpcsvc
+               for r in ${rpcsvc}; do
+                       h=`echo $r|sed -e's,\.x$,.h,'`
+                       rpcgen -h $r -o $h || oewarn "unable to generate header for $r"
+               done
+       )
+}
+
+require glibc-stage.inc
+
+require glibc-package.bbclass