diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-06-24 16:26:34 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-06-24 16:26:34 +0000 |
| commit | 0c0eed75570abfa84c7cebbbe4b2dd14492db0a8 (patch) | |
| tree | b61aa9fb0ab9b47e63f5d16c5fa8cb6e823c9bdf /libc/csu | |
| parent | 257ea412cd5f858b64148bef99d4bd6b882c4fb1 (diff) | |
Merge changes between r8519 and r8594 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@8595 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/csu')
| -rw-r--r-- | libc/csu/elf-init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libc/csu/elf-init.c b/libc/csu/elf-init.c index 5a99a3a40..d5ec912cb 100644 --- a/libc/csu/elf-init.c +++ b/libc/csu/elf-init.c @@ -1,5 +1,5 @@ /* Startup support for ELF initializers/finalizers in the main executable. - Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -36,7 +36,7 @@ #include <stddef.h> -#ifndef LIBC_NONSHARED +#if defined USE_MULTIARCH && !defined LIBC_NONSHARED # include <link.h> # include <dl-irel.h> @@ -80,7 +80,7 @@ __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. */ -#ifndef LIBC_NONSHARED +#if defined USE_MULTIARCH && !defined LIBC_NONSHARED # ifdef ELF_MACHINE_IRELA { const size_t size = __rela_iplt_end - __rela_iplt_start; |