diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-11-16 19:25:42 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-11-16 19:25:42 (GMT) |
| commit | 2df16372710ebd9b2f2d84ae32edae2aebf9f746 (patch) | |
| tree | 0b3d038212ff86ce811261b30f8ac26357cb3844 /patches/glibc/ports-2.10.1/440-alpha-cache-shape.patch | |
| parent | bd8e670d5e06870cb952fa88b3990e47b7747e7a (diff) | |
| parent | 1ebe0b246a554f4029f5be336013cc8c9b7d427e (diff) | |
Merge.
Diffstat (limited to 'patches/glibc/ports-2.10.1/440-alpha-cache-shape.patch')
| -rw-r--r-- | patches/glibc/ports-2.10.1/440-alpha-cache-shape.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/patches/glibc/ports-2.10.1/440-alpha-cache-shape.patch b/patches/glibc/ports-2.10.1/440-alpha-cache-shape.patch new file mode 100644 index 0000000..b1422f6 --- /dev/null +++ b/patches/glibc/ports-2.10.1/440-alpha-cache-shape.patch @@ -0,0 +1,14 @@ +older verisons of glibc would build dl-sysdep as shared-only and dl-support as +static-only. alpha hooks in a cache variable via dl-auxv.h. newer versions of +glibc build dl-sysdep as both shared and static which means we now have symbol +duplication for static builds with dl-sysdep and dl-support. since dl-sysdep +is both shared/static, there is no point in hooking dl-support anymore, so we +can punt it. + +diff -durN glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/dl-support.c +--- glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/dl-support.c 2009-05-16 10:36:20.000000000 +0200 ++++ glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/dl-support.c 2009-11-13 00:50:53.000000000 +0100 +@@ -1,2 +0,0 @@ +-#include "dl-auxv.h" +-#include <elf/dl-support.c> +diff -durN glibc-2.10.1.orig/ports/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2.10.1/ports/sysdeps/unix/sysv/linux/alpha/dl-support.c |