This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.16-ports-merge-683-gbcbf983
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 16 Nov 2012 15:40:53 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-683-gbcbf983
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via bcbf9830b735acdd9b0d49fe96da73dfacfa17d0 (commit)
from 02665652d74808a2d20a4f6f8a6f98bddb669464 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=bcbf9830b735acdd9b0d49fe96da73dfacfa17d0
commit bcbf9830b735acdd9b0d49fe96da73dfacfa17d0
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Nov 16 07:40:38 2012 -0800
Set constructor/destructor priority to 1000
diff --git a/ChangeLog b/ChangeLog
index fb21238..8b980c1 100644
--- 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 ca9bdf4..e998932 100644
--- 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 2812761..2f920cd 100644
--- 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)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
elf/tst-array1.c | 6 ++++--
elf/tst-array2dep.c | 6 ++++--
3 files changed, 14 insertions(+), 4 deletions(-)
hooks/post-receive
--
GNU C Library master sources