Set constructor/destructor priority to 1000

diff --git a/ChangeLog b/ChangeLog
index fb21238ecfb77c33c36c825cd1f3b8c00a359695..8b980c14ab8a6f6d1f2e8ad2ce09e469e0743f12 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * elf/tst-array1.c (init): Set constructor priority to 1000.
+       (fini): Set destructor priority to 1000.
+       * elf/tst-array2dep.c: Likewise.
+
 2012-11-16  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
        [BZ #11741]

diff --git a/elf/tst-array1.c b/elf/tst-array1.c
index ca9bdf4079a574b14f1966585c345c0d7166a20d..e998932b369fd5b76a7d344add49e61c266c014c 100644 (file)
--- a/elf/tst-array1.c
+++ b/elf/tst-array1.c
@@ -1,6 +1,7 @@
 #include <unistd.h>
 
-static void init (void) __attribute__ ((constructor));
+/* Give init non-default priority so that it runs before init_array.  */
+static void init (void) __attribute__ ((constructor (1000)));
 
 static void
 init (void)
@@ -8,7 +9,8 @@ init (void)
   write (STDOUT_FILENO, "init\n", 5);
 }
 
-static void fini (void) __attribute__ ((destructor));
+/* Give fini the same priority as init.  */
+static void fini (void) __attribute__ ((destructor (1000)));
 
 static void
 fini (void)

diff --git a/elf/tst-array2dep.c b/elf/tst-array2dep.c
index 2812761a09e6951e27e509b0c1f0a30480b2f435..2f920cdc8d06382c3884c2fab8244792a3004003 100644 (file)
--- a/elf/tst-array2dep.c
+++ b/elf/tst-array2dep.c
@@ -1,6 +1,7 @@
 #include <unistd.h>
 
-static void init (void) __attribute__ ((constructor));
+/* Give init non-default priority so that it runs before init_array.  */
+static void init (void) __attribute__ ((constructor (1000)));
 
 static void
 init (void)
@@ -8,7 +9,8 @@ init (void)
   write (STDOUT_FILENO, "DSO init\n", 9);
 }
 
-static void fini (void) __attribute__ ((destructor));
+/* Give fini the same priority as init.  */
+static void fini (void) __attribute__ ((destructor (1000)));
 
 static void
 fini (void)