[PATCH] Fix dl-conflict.c on ppc64

[Ulrich Drepper]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Jakub Jelinek wrote:

> 2003-05-31  Jakub Jelinek  <jakub@redhat.com>
> 
> 	* sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_plt_conflict):
> 	New function.
> 	(elf_machine_rela) <case R_PPC64_JMP_SLOT>: Avoid
> 	RESOLVE_CONFLICT_FIND_MAP.  If RESOLVE_CONFLICT_FIND_MAP is defined,
> 	call elf_machine_plt_conflict instead of elf_machine_fixup_plt.

I've added the patch.

- -- 
- --------------.                        ,-.            444 Castro Street
Ulrich Drepper \    ,-----------------'   \ Mountain View, CA 94041 USA
Red Hat         `--' drepper at redhat.com `---------------------------
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD4DBQE+2VdS2ijCOnn/RHQRAiSpAJigyNIC/DDjehLURNtMEsJvvNWvAKCOw3Nn
BbBEq3Mtl6R3KWh4roeHxQ==
=M0gf
-----END PGP SIGNATURE-----