diff --git a/ChangeLog b/ChangeLog
index 49cad44081..b6ca5ebc62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2002-04-02  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/arm/dl-procinfo.c: Completely specify
+	size of _dl_arm_cap_flags.
+	Patch by enrico.scholz@informatik.tu-chemnitz.de [PR libc/3155].
+
+	* sysdeps/unix/sysv/linux/arm/dl-procinfo.h (_DL_HWCAP_COUNT):
+	Define as 8.
+
+2002-03-22  H.J. Lu  <hjl@gnu.org>
+
+	* scripts/firstversions.awk: Check the first version.
+
 2002-04-02  Ulrich Drepper  <drepper@redhat.com>
 
 	* elf/dl-deps.c (_dl_map_object_deps): The sorting of the
diff --git a/scripts/firstversions.awk b/scripts/firstversions.awk
index 736ef0365c..1a500f4f1d 100644
--- a/scripts/firstversions.awk
+++ b/scripts/firstversions.awk
@@ -27,7 +27,8 @@ $1 == "}" {
   if ((thislib, idx[thislib]) in firstversion) {
     # XXX relative string comparison loses if we ever have multiple digits
     # between dots in GLIBC_x.y[.z] names.
-    v = firstversion[thislib, idx[thislib]];
+    f = firstversion[thislib, idx[thislib]];
+    v = f;
     while ($1 >= v) {
       firstversion[thislib, idx[thislib]] = 0;
       idx[thislib]++;
@@ -36,7 +37,7 @@ $1 == "}" {
       else
         break;
     }
-    if ($1 >= v)
+    if ($1 >= v || $1 == f)
       print;
     else
       print $1, "=", v;
diff --git a/sysdeps/unix/sysv/linux/arm/dl-procinfo.c b/sysdeps/unix/sysv/linux/arm/dl-procinfo.c
index 9c6476cb59..9acd07962b 100644
--- a/sysdeps/unix/sysv/linux/arm/dl-procinfo.c
+++ b/sysdeps/unix/sysv/linux/arm/dl-procinfo.c
@@ -46,7 +46,7 @@ EXTERN
 #if !defined PROCINFO_DECL && defined SHARED
   ._dl_arm_cap_flags
 #else
-const char _dl_arm_cap_flags[][10]
+const char _dl_arm_cap_flags[8][10]
 #endif
 #ifndef PROCINFO_DECL
 = {
diff --git a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h b/sysdeps/unix/sysv/linux/arm/dl-procinfo.h
index 7e7e66e727..0ced27489f 100644
--- a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h
+++ b/sysdeps/unix/sysv/linux/arm/dl-procinfo.h
@@ -23,7 +23,7 @@
 
 #include <ldsodefs.h>
 
-#define _DL_HWCAP_COUNT 32
+#define _DL_HWCAP_COUNT 8
 
 /* The kernel provides platform data but it is not interesting.  */
 #define _DL_HWCAP_PLATFORM 	0