about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-12-18 22:02:01 +0000
committerUlrich Drepper <drepper@redhat.com>2005-12-18 22:02:01 +0000
commite0b849e9b1379fa14422c7b634ab3b6da5715576 (patch)
tree4e8f662efe8fa8d642cd99832f67fa62e295d640
parent7725f8749a850972980349ca05259ea09d0b514f (diff)
downloadglibc-e0b849e9b1379fa14422c7b634ab3b6da5715576.tar.gz
glibc-e0b849e9b1379fa14422c7b634ab3b6da5715576.tar.xz
glibc-e0b849e9b1379fa14422c7b634ab3b6da5715576.zip
* iconv/gconv_builtin.c: Mark map with attribute_relro.
-rw-r--r--ChangeLog2
-rw-r--r--iconv/gconv_builtin.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 12f5cbab25..4c01e65c47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-12-18  Ulrich Drepper  <drepper@redhat.com>
 
+	* iconv/gconv_builtin.c: Mark map with attribute_relro.
+
 	* sysdeps/unix/sysv/linux/x86_64/sysdep.h (PTR_MANGLE): Define C
 	version for inside ld.so.
 
diff --git a/iconv/gconv_builtin.c b/iconv/gconv_builtin.c
index f653d6c7f3..bea8328ce8 100644
--- a/iconv/gconv_builtin.c
+++ b/iconv/gconv_builtin.c
@@ -1,5 +1,5 @@
 /* Table for builtin transformation mapping.
-   Copyright (C) 1997-1999, 2000-2002 Free Software Foundation, Inc.
+   Copyright (C) 1997-1999, 2000-2002, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -38,7 +38,7 @@ static struct builtin_map
   int min_needed_to;
   int max_needed_to;
 
-} map[] =
+} map[] attribute_relro =
 {
 #define BUILTIN_TRANSFORMATION(From, To, Cost, Name, Fct, BtowcFct, \
 			       MinF, MaxF, MinT, MaxT) \