mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
2003-04-06  Jakub Jelinek  <jakub@redhat.com>

	* elf/rtld.c: Revert 2003-03-14 change.
	* elf/dl-conflict.c (_dl_resolve_conflicts): Move
	#if ! ELF_MACHINE_NO_RELA conditional into the routine.
This commit is contained in:
Ulrich Drepper 2003-04-06 18:58:09 +00:00
parent c70ad7d71e
commit efedd9cf71
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2003-04-06 Jakub Jelinek <jakub@redhat.com>
* elf/rtld.c: Revert 2003-03-14 change.
* elf/dl-conflict.c (_dl_resolve_conflicts): Move
#if ! ELF_MACHINE_NO_RELA conditional into the routine.
2003-04-05 Ulrich Drepper <drepper@redhat.com> 2003-04-05 Ulrich Drepper <drepper@redhat.com>
* sunrpc/xdr.c (xdr_string): Catch nodesize == 0 [PR libc/4999]. * sunrpc/xdr.c (xdr_string): Catch nodesize == 0 [PR libc/4999].

4
elf/dl-conflict.c
View File

@ -28,11 +28,11 @@
#include <sys/types.h> #include <sys/types.h>
#include "dynamic-link.h" #include "dynamic-link.h"
#if ! ELF_MACHINE_NO_RELA
void void
_dl_resolve_conflicts (struct link_map *l, ElfW(Rela) *conflict, _dl_resolve_conflicts (struct link_map *l, ElfW(Rela) *conflict,
ElfW(Rela) *conflictend) ElfW(Rela) *conflictend)
{ {
#if ! ELF_MACHINE_NO_RELA
if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_RELOC, 0)) if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_RELOC, 0))
_dl_printf ("\nconflict processing: %s\n", _dl_printf ("\nconflict processing: %s\n",
l->l_name[0] ? l->l_name : rtld_progname); l->l_name[0] ? l->l_name : rtld_progname);
@ -64,5 +64,5 @@ _dl_resolve_conflicts (struct link_map *l, ElfW(Rela) *conflict,
for (; conflict < conflictend; ++conflict) for (; conflict < conflictend; ++conflict)
elf_machine_rela (l, conflict, NULL, NULL, (void *) conflict->r_offset); elf_machine_rela (l, conflict, NULL, NULL, (void *) conflict->r_offset);
} }
}
#endif #endif
}

2
elf/rtld.c
View File

@ -1444,7 +1444,6 @@ cannot allocate TLS data structures for initial thread");
_dl_printf ("\nprelink checking: %s\n", prelinked ? "ok" : "failed"); _dl_printf ("\nprelink checking: %s\n", prelinked ? "ok" : "failed");
} }
#if ! ELF_MACHINE_NO_RELA /* We don't REL-only prelink. */
if (prelinked) if (prelinked)
{ {
struct link_map *l; struct link_map *l;
@ -1477,7 +1476,6 @@ cannot allocate TLS data structures for initial thread");
_dl_sysdep_start_cleanup (); _dl_sysdep_start_cleanup ();
} }
else else
#endif
{ {
/* Now we have all the objects loaded. Relocate them all except for /* Now we have all the objects loaded. Relocate them all except for
the dynamic linker itself. We do this in reverse order so that copy the dynamic linker itself. We do this in reverse order so that copy