OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

alpha: Only define __libc_alpha_cache_shape in dl-sysdep.c. 

The static program builds in libc were getting multiple
definition errors between dl-sysdep and dl-support.

Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Richard Henderson 2010-03-26 11:10:23 -07:00
parent 6546e0c499
commit 45e3c40653
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog.alpha
View File

@ -1,3 +1,9 @@
2010-03-26 Richard Henderson <rth@redhat.com>
* sysdeps/unix/sysv/linux/alpha/dl-auxv.h (__libc_alpha_cache_shape):
Define extern here; move definition...
* sysdeps/unix/sysv/linux/alpha/dl-sysdep.c: ... here.
2010-03-26 Richard Henderson <rth@redhat.com>
* sysdeps/unix/sysv/linux/alpha/sys/user.h: Don't include asm/page.h.

2
sysdeps/unix/sysv/linux/alpha/dl-auxv.h
View File

@ -19,7 +19,7 @@
/* Scan the Aux Vector for the cache shape entries. */
long __libc_alpha_cache_shape[4] = { -2, -2, -2, -2 };
extern long __libc_alpha_cache_shape[4];
#define DL_PLATFORM_AUXV \
case AT_L1I_CACHESHAPE: \

3
sysdeps/unix/sysv/linux/alpha/dl-sysdep.c
View File

@ -1,2 +1,5 @@
#include "dl-auxv.h"
long __libc_alpha_cache_shape[4] = { -2, -2, -2, -2 };
#include <sysdeps/unix/sysv/linux/dl-sysdep.c>