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>

diff --git a/ChangeLog.alpha b/ChangeLog.alpha
index 739efce..784f6b7 100644 (file)
--- a/ChangeLog.alpha
+++ b/ChangeLog.alpha
@@ -1,5 +1,11 @@
 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.
        (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 8afc4db..075797d 100644 (file)
--- 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 4034820..5d0867a 100644 (file)
--- 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 <sysdeps/unix/sysv/linux/dl-sysdep.c>