OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* sysdeps/powerpc/dl-machine.h (elf_machine_rela): Move local

Browse Source 
variable LOADBASE so it's not declared when it's not used.
This commit is contained in:
Roland McGrath 2002-02-17 19:32:29 +00:00
parent 746f400783
commit 9b09446441
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2002-02-17 Roland McGrath <roland@frob.com>
* sysdeps/powerpc/dl-machine.h (elf_machine_rela): Move local
variable LOADBASE so it's not declared when it's not used.
2002-02-16 Roland McGrath <roland@frob.com> 2002-02-16 Roland McGrath <roland@frob.com>
* sysdeps/mach/hurd/times.c (__times) [NO_CREATION_TIME]: Don't try * sysdeps/mach/hurd/times.c (__times) [NO_CREATION_TIME]: Don't try

13
sysdeps/powerpc/dl-machine.h
View File

@ -1,5 +1,5 @@
/* Machine-dependent ELF dynamic relocation inline functions. PowerPC version. /* Machine-dependent ELF dynamic relocation inline functions. PowerPC version.
Copyright (C) 1995-2000, 2001 Free Software Foundation, Inc. Copyright (C) 1995-2000,01,02 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -344,7 +344,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
Elf32_Addr *const reloc_addr) Elf32_Addr *const reloc_addr)
{ {
const Elf32_Sym *const refsym = sym; const Elf32_Sym *const refsym = sym;
Elf32_Word loadbase, finaladdr; Elf32_Word finaladdr;
const int rinfo = ELF32_R_TYPE (reloc->r_info); const int rinfo = ELF32_R_TYPE (reloc->r_info);
#ifndef RESOLVE_CONFLICT_FIND_MAP #ifndef RESOLVE_CONFLICT_FIND_MAP
@ -359,17 +359,18 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
&& ELF32_ST_BIND (sym->st_info) == STB_LOCAL)) && ELF32_ST_BIND (sym->st_info) == STB_LOCAL))
{ {
/* Has already been relocated. */ /* Has already been relocated. */
loadbase = map->l_addr; Elf32_Word loadbase = map->l_addr;
finaladdr = loadbase + reloc->r_addend; finaladdr = loadbase + reloc->r_addend;
} }
else else
{ {
loadbase = (Elf32_Word) (char *) (RESOLVE (&sym, version, Elf32_Word loadbase
ELF32_R_TYPE(reloc->r_info))); = (Elf32_Word) (char *) (RESOLVE (&sym, version,
ELF32_R_TYPE(reloc->r_info)));
if (sym == NULL) if (sym == NULL)
{ {
/* Weak symbol that wasn't actually defined anywhere. */ /* Weak symbol that wasn't actually defined anywhere. */
assert(loadbase == 0); assert (loadbase == 0);
finaladdr = reloc->r_addend; finaladdr = reloc->r_addend;
} }
else else