+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
+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'
% 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>"
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>"
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;
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