diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-10-22 19:51:30 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-10-22 19:51:30 +0000 |
commit | ea8e518cdce77a310763a69aedf67f2c9853d7ca (patch) | |
tree | 5cc487ed66dab9b1929f0583c8787ce61ff0c16e /libc/csu | |
parent | 64245cd1d519cb74af7ccf3f95ed7f0fcbdc63cd (diff) |
Merge changes between r9028 and r9122 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@9123 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/csu')
-rw-r--r-- | libc/csu/elf-init.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libc/csu/elf-init.c b/libc/csu/elf-init.c index d5ec912cb..1d2df62ca 100644 --- a/libc/csu/elf-init.c +++ b/libc/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; |