diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-01-10 00:28:48 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-01-10 00:28:48 +0000 |
commit | 00ed3326c2fac75592e173e9d731452e9bb769ff (patch) | |
tree | 749aa90fd85da4971d09bc7cb69d79ac7e1ea580 /libc/sysdeps/powerpc/powerpc32/dl-machine.c | |
parent | 28c5710e0d8071ca674ea390549c1b9e969ccde2 (diff) |
Merge changes between r22062 and r22176 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@22177 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/powerpc/powerpc32/dl-machine.c')
-rw-r--r-- | libc/sysdeps/powerpc/powerpc32/dl-machine.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/sysdeps/powerpc/powerpc32/dl-machine.c b/libc/sysdeps/powerpc/powerpc32/dl-machine.c index 6267af3a1..1863e3b71 100644 --- a/libc/sysdeps/powerpc/powerpc32/dl-machine.c +++ b/libc/sysdeps/powerpc/powerpc32/dl-machine.c @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation functions. PowerPC version. - Copyright (C) 1995-2012 Free Software Foundation, Inc. + Copyright (C) 1995-2013 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 @@ -114,7 +114,7 @@ __elf_preferred_address (struct link_map *loader, size_t maplength, /* Otherwise, quickly look for a suitable gap between 0x3FFFF and 0x70000000. 0x3FFFF is so that references off NULL pointers will cause a segfault, 0x70000000 is just paranoia (it should always - be superceded by the program's load address). */ + be superseded by the program's load address). */ low = 0x0003FFFF; high = 0x70000000; for (nsid = 0; nsid < DL_NNS; ++nsid) |