patches/glibc/2.9/480-alpha-glibc-2.8-cache-shape.patch
author Esben Haabendal <eha@dev.doredevelopment.dk>
Wed Apr 06 20:15:23 2011 +0200 (2011-04-06)
changeset 2379 372245834071
parent 1273 33f0fcab7f03
permissions -rw-r--r--
libc/glibc: workaround for autoconf'ed define of caddr_t

When building canadian cross compiler, I have some trouble with
configure defining caddr_t as a macro, like:
#define caddr_t char *

When combined with the types.h where caddr_t is protected together
with daddr_t, the typedef of caddr_t breaks.

This patch works around it by protecting the caddr_t typedef
specifically.

I am uncertain as to the real cause and solution to this :-(

Signed-off-by: Esben Haabendal <eha@dev.doredevelopment.dk>
yann@1201
     1
Original patch from: gentoo/src/patchsets/glibc/2.9/6018_all_alpha-glibc-2.8-cache-shape.patch
yann@1201
     2
yann@1201
     3
-= BEGIN original header =-
yann@1201
     4
older verisons of glibc would build dl-sysdep as shared-only and dl-support as
yann@1201
     5
static-only.  alpha hooks in a cache variable via dl-auxv.h.  newer versions of
yann@1201
     6
glibc build dl-sysdep as both shared and static which means we now have symbol
yann@1201
     7
duplication for static builds with dl-sysdep and dl-support.  since dl-sysdep
yann@1201
     8
is both shared/static, there is no point in hooking dl-support anymore, so we
yann@1201
     9
can punt it.
yann@1201
    10
yann@1201
    11
-= END original header =-
yann@1201
    12
yann@1201
    13
diff -durN glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2_9/sysdeps/unix/sysv/linux/alpha/dl-support.c
yann@1201
    14
--- glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c	2007-03-13 22:25:16.000000000 +0100
yann@1201
    15
+++ glibc-2_9/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-02-02 22:01:37.000000000 +0100
yann@1321
    16
@@ -1,1 +1,0 @@
yann@1201
    17
-#include "dl-auxv.h"