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.10-356-g4bb04b1
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 13 Oct 2009 14:19:41 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.10-356-g4bb04b1
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 4bb04b1fb67389a0203da988e1c091a97dc1fd06 (commit)
from 1abedcdad2eef3d262c115ac13f069900338727c (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=4bb04b1fb67389a0203da988e1c091a97dc1fd06
commit 4bb04b1fb67389a0203da988e1c091a97dc1fd06
Author: Andreas Schwab <schwab@redhat.com>
Date: Tue Oct 13 16:12:47 2009 +0200
Fix USE_MULTIARCH conditional
diff --git a/ChangeLog b/ChangeLog
index fd39e40..6c8c14d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-13 Andreas Schwab <schwab@redhat.com>
+
+ * csu/elf-init.c (__libc_csu_init): Run preinit array even if
+ !USE_MULTIARCH.
+
2009-10-08 Ulrich Drepper <drepper@redhat.com>
[BZ #10730]
diff --git a/csu/elf-init.c b/csu/elf-init.c
index d5ec912..1d2df62 100644
--- a/csu/elf-init.c
+++ b/csu/elf-init.c
@@ -80,24 +80,26 @@ __libc_csu_init (int argc, char **argv, char **envp)
/* For dynamically linked executables the preinit array is executed by
the dynamic linker (before initializing any shared object. */
-#if defined USE_MULTIARCH && !defined LIBC_NONSHARED
-# ifdef ELF_MACHINE_IRELA
+#ifndef LIBC_NONSHARED
+# ifdef USE_MULTIARCH
+# ifdef ELF_MACHINE_IRELA
{
const size_t size = __rela_iplt_end - __rela_iplt_start;
for (size_t i = 0; i < size; i++)
elf_irela (&__rela_iplt_start [i]);
}
-# endif
+# endif
-# ifdef ELF_MACHINE_IREL
+# ifdef ELF_MACHINE_IREL
{
const size_t size = __rel_iplt_end - __rel_iplt_start;
for (size_t i = 0; i < size; i++)
elf_irel (&__rel_iplt_start [i]);
}
+# endif
# endif
- /* For static executables, preinit happens rights before init. */
+ /* For static executables, preinit happens right before init. */
{
const size_t size = __preinit_array_end - __preinit_array_start;
size_t i;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
csu/elf-init.c | 12 +++++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
hooks/post-receive
--
GNU C Library master sources