about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--elf/tst-array1.c4
-rw-r--r--elf/tst-array2dep.c4
3 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 664543d5a7..bf36da6a69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-10-29  Andreas Jaeger  <aj@suse.de>
+
+	* elf/tst-array1.c (fini_array): Make writeable so that it can be
+	merged with constructor/destructor.
+	(init_array): Likewise.
+	* elf/tst-array2dep.c (fini_array): Likewise.
+	(init_array): Likewise.
+
 2012-10-29  Mike Frysinger  <vapier@gentoo.org>
 
 	* manual/message.texi: Delete @cartouche tags.
diff --git a/elf/tst-array1.c b/elf/tst-array1.c
index 4d78db6167..ca9bdf4079 100644
--- a/elf/tst-array1.c
+++ b/elf/tst-array1.c
@@ -60,7 +60,7 @@ init_2 (void)
   write (STDOUT_FILENO, "init array 2\n", 13);
 }
 
-void (*const init_array []) (void)
+void (*init_array []) (void)
      __attribute__ ((section (".init_array"), aligned (sizeof (void *)))) =
 {
   &init_0,
@@ -86,7 +86,7 @@ fini_2 (void)
   write (STDOUT_FILENO, "fini array 2\n", 13);
 }
 
-void (*const fini_array []) (void)
+void (*fini_array []) (void)
      __attribute__ ((section (".fini_array"), aligned (sizeof (void *)))) =
 {
   &fini_0,
diff --git a/elf/tst-array2dep.c b/elf/tst-array2dep.c
index e1596b5b37..2812761a09 100644
--- a/elf/tst-array2dep.c
+++ b/elf/tst-array2dep.c
@@ -34,7 +34,7 @@ init_2 (void)
   write (STDOUT_FILENO, "DSO init array 2\n", 17);
 }
 
-void (*const init_array []) (void)
+void (*init_array []) (void)
      __attribute__ ((section (".init_array"), aligned (sizeof (void *)))) =
 {
   &init_0,
@@ -60,7 +60,7 @@ fini_2 (void)
   write (STDOUT_FILENO, "DSO fini array 2\n", 17);
 }
 
-void (*const fini_array []) (void)
+void (*fini_array []) (void)
      __attribute__ ((section (".fini_array"), aligned (sizeof (void *)))) =
 {
   &fini_0,