diff options
| author | Ian Lance Taylor <ian@airs.com> | 1998-07-22 17:47:42 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 1998-07-22 17:47:42 +0000 |
| commit | 39e4bca40695a8a60b51305b29c6799cf0e61781 (patch) | |
| tree | 7f7bfed612051aab573ad568073f434ddc72864b /bfd | |
| parent | f5d660b679b35f2b4944eeeef3a61b6fd517e047 (diff) | |
| download | gdb-39e4bca40695a8a60b51305b29c6799cf0e61781.zip gdb-39e4bca40695a8a60b51305b29c6799cf0e61781.tar.gz gdb-39e4bca40695a8a60b51305b29c6799cf0e61781.tar.bz2 | |
* elf64-mips.c (mips_elf64_reloc_type): Copy Ulrich's elf32-mips.c
temporary patch over to elf64-mips.c as well.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elf64-mips.c | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 22f96c8..b91c079 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +Wed Jul 22 13:46:51 1998 Ian Lance Taylor <ian@cygnus.com> + + * elf64-mips.c (mips_elf64_reloc_type): Copy Ulrich's elf32-mips.c + temporary patch over to elf64-mips.c as well. + 1998-07-21 Ulrich Drepper <drepper@cygnus.com> * elf32-mips.c (reloc_type): Temporarily disable definition of diff --git a/bfd/elf64-mips.c b/bfd/elf64-mips.c index 30ea6a7..0ea1f8d 100644 --- a/bfd/elf64-mips.c +++ b/bfd/elf64-mips.c @@ -1,5 +1,5 @@ /* MIPS-specific support for 64-bit ELF - Copyright 1996 Free Software Foundation, Inc. + Copyright 1996, 1997 Free Software Foundation, Inc. Ian Lance Taylor, Cygnus Support This file is part of BFD, the Binary File Descriptor library. @@ -66,7 +66,7 @@ static long mips_elf64_get_reloc_upper_bound PARAMS ((bfd *, asection *)); static boolean mips_elf64_slurp_one_reloc_table PARAMS ((bfd *, asection *, asymbol **, const Elf_Internal_Shdr *)); static boolean mips_elf64_slurp_reloc_table - PARAMS ((bfd *, asection *, asymbol **)); + PARAMS ((bfd *, asection *, asymbol **, boolean)); static void mips_elf64_write_relocs PARAMS ((bfd *, asection *, PTR)); static boolean mips_elf64_section_from_shdr PARAMS ((bfd *, Elf_Internal_Shdr *, char *)); @@ -80,6 +80,8 @@ static boolean mips_elf64_write_armap enum mips_elf64_reloc_type { +#if 0 + /* These are now in elf/mips.h. */ R_MIPS_NONE = 0, R_MIPS_16 = 1, R_MIPS_32 = 2, @@ -98,6 +100,7 @@ enum mips_elf64_reloc_type R_MIPS_CALL16 = 11, R_MIPS_CALL = 11, R_MIPS_GPREL32 = 12, +#endif R_MIPS_SHIFT5 = 16, R_MIPS_SHIFT6 = 17, R_MIPS_64 = 18, @@ -1230,7 +1233,7 @@ mips_elf64_swap_reloca_in (abfd, src, dst) dst->r_type3 = bfd_h_get_8 (abfd, (bfd_byte *) src->r_type3); dst->r_type2 = bfd_h_get_8 (abfd, (bfd_byte *) src->r_type2); dst->r_type = bfd_h_get_8 (abfd, (bfd_byte *) src->r_type); - dst->r_addend = bfd_h_get_64 (abfd, (bfd_byte *) src->r_addend); + dst->r_addend = bfd_h_get_signed_64 (abfd, (bfd_byte *) src->r_addend); } #if 0 @@ -1269,7 +1272,7 @@ mips_elf64_swap_reloca_out (abfd, src, dst) bfd_h_put_8 (abfd, src->r_type3, (bfd_byte *) dst->r_type3); bfd_h_put_8 (abfd, src->r_type2, (bfd_byte *) dst->r_type2); bfd_h_put_8 (abfd, src->r_type, (bfd_byte *) dst->r_type); - bfd_h_put_64 (abfd, src->r_offset, (bfd_byte *) dst->r_offset); + bfd_h_put_64 (abfd, src->r_addend, (bfd_byte *) dst->r_addend); } /* A mapping from BFD reloc types to MIPS ELF reloc types. */ |