2003-04-15  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela): Avoid
	checking R_PPC_RELATIVE, R_PPC_NONE and whether relocation is
	against local symbol in conflict processing.
This commit is contained in:
Ulrich Drepper 2003-04-15 19:42:49 +00:00
parent 6087c4851c
commit aa3f24108d
5 changed files with 25 additions and 7 deletions

View File

@ -1,3 +1,9 @@
2003-04-15 Jakub Jelinek <jakub@redhat.com>
* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela): Avoid
checking R_PPC_RELATIVE, R_PPC_NONE and whether relocation is
against local symbol in conflict processing.
2003-04-15 Steven Munroe <sjmunroe@us.ibm.com>
* sysdeps/powerpc/bits/atomic.h

View File

@ -1,3 +1,11 @@
2003-04-15 Petter Reinholdtsen <pere@hungry.com>
* locales/ar_SD [LC_MONETARY]: Use international currency symbol
'SDD' for Sudan.
* locales/es_EC [LC_MONETARY]: Use international currency symbol
'USD' for Ecuador.
Source is CIA World Fact book.
2003-04-05 Petter Reinholdtsen <pere@hungry.com>
* locales/sr_YU [LC_MONETARY]: Change int_curr_symbol from 'YUN'

View File

@ -47,7 +47,7 @@ LC_MONETARY
% These are generated based on XML base Locale difintion file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U0053><U0044><U0050><U0020>"
int_curr_symbol "<U0053><U0044><U0044><U0020>"
currency_symbol "<U062C><U002E><U0633><U002E>"
mon_decimal_point "<U002E>"
mon_thousands_sep "<U002C>"

View File

@ -61,7 +61,7 @@ noexpr "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
END LC_MESSAGES
LC_MONETARY
int_curr_symbol "<U0045><U0043><U0053><U0020>"
int_curr_symbol "<U0055><U0053><U0044><U0020>"
currency_symbol "<U0024>"
mon_decimal_point "<U002C>"
mon_thousands_sep "<U002E>"

View File

@ -365,6 +365,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
struct link_map *sym_map;
#endif
#ifndef RESOLVE_CONFLICT_FIND_MAP
if (r_type == R_PPC_RELATIVE)
{
*reloc_addr = map->l_addr + reloc->r_addend;
@ -381,18 +382,21 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
value = map->l_addr;
else
{
#if defined USE_TLS && !defined RTLD_BOOTSTRAP
# if defined USE_TLS && !defined RTLD_BOOTSTRAP
sym_map = RESOLVE_MAP (&sym, version, r_type);
value = sym == NULL ? 0 : sym_map->l_addr + sym->st_value;
#else
# else
value = RESOLVE (&sym, version, r_type);
# ifndef RTLD_BOOTSTRAP
# ifndef RTLD_BOOTSTRAP
if (sym != NULL)
# endif
# endif
value += sym->st_value;
#endif
# endif
}
value += reloc->r_addend;
#else
value = reloc->r_addend;
#endif
/* A small amount of code is duplicated here for speed. In libc,
more than 90% of the relocs are R_PPC_RELATIVE; in the X11 shared