about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/linux/i386/dl-procinfo.h4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8aac056300..ed9dd7bf6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-05-04  Ulrich Drepper  <drepper@cygnus.com>
+
+	* sysdeps/unix/sysv/linux/i386/dl-procinfo.h: Avoid nasty
+	relocations.  Patch by Joe Keane <jgk@jgk.org>.
+
 1998-05-04 12:40  Ulrich Drepper  <drepper@cygnus.com>
 
 	* malloc/malloc.c (ptmalloc_init_all): New function.  Similar to
diff --git a/sysdeps/unix/sysv/linux/i386/dl-procinfo.h b/sysdeps/unix/sysv/linux/i386/dl-procinfo.h
index 85baf74496..4520e6cfe0 100644
--- a/sysdeps/unix/sysv/linux/i386/dl-procinfo.h
+++ b/sysdeps/unix/sysv/linux/i386/dl-procinfo.h
@@ -21,7 +21,9 @@
 #ifndef _DL_PROCINFO_H
 #define _DL_PROCINFO_H	1
 
-static const char *x86_cap_flags[] =
+/* If anything should be added here check whether the size of each string
+   is still ok with the given array size.  */
+static const char x86_cap_flags[][7] =
   {
     "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",
     "cx8", "apic", "10", "sep", "mtrr", "pge", "mca", "cmov",