aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--csu/elf-init.c12
2 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index fd39e40132..6c8c14d63c 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 d5ec912cba..1d2df62ca3 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;