From 45e3c406530f1a185fe236173b39ee74b6176d82 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Fri, 26 Mar 2010 11:10:23 -0700 Subject: [PATCH] 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 --- ChangeLog.alpha | 6 ++++++ sysdeps/unix/sysv/linux/alpha/dl-auxv.h | 2 +- sysdeps/unix/sysv/linux/alpha/dl-sysdep.c | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog.alpha b/ChangeLog.alpha index 739efce24c..784f6b7c82 100644 --- a/ChangeLog.alpha +++ b/ChangeLog.alpha @@ -1,5 +1,11 @@ 2010-03-26 Richard Henderson + * 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 + * sysdeps/unix/sysv/linux/alpha/sys/user.h: Don't include asm/page.h. (PAGE_SHIFT, PAGE_SIZE, PAGE_MASK): Define. diff --git a/sysdeps/unix/sysv/linux/alpha/dl-auxv.h b/sysdeps/unix/sysv/linux/alpha/dl-auxv.h index 8afc4dba3b..075797db08 100644 --- a/sysdeps/unix/sysv/linux/alpha/dl-auxv.h +++ b/sysdeps/unix/sysv/linux/alpha/dl-auxv.h @@ -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: \ diff --git a/sysdeps/unix/sysv/linux/alpha/dl-sysdep.c b/sysdeps/unix/sysv/linux/alpha/dl-sysdep.c index 4034820f4d..5d0867a100 100644 --- a/sysdeps/unix/sysv/linux/alpha/dl-sysdep.c +++ b/sysdeps/unix/sysv/linux/alpha/dl-sysdep.c @@ -1,2 +1,5 @@ #include "dl-auxv.h" + +long __libc_alpha_cache_shape[4] = { -2, -2, -2, -2 }; + #include -- 2.11.4.GIT