diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-12-09 17:57:18 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2014-12-09 19:50:14 +0800 |
| commit | 5e8c1cf25beccac1d22d10dc866912394f42771b (patch) | |
| tree | ee16b70f804484dc8e434e647e699ab50da2620f /binutils-2.25/bfd/elf32-m32r.c | |
| parent | 8eebd7953384e6662ca926b003f2cdda8ccd3ee5 (diff) | |
| download | toolchain_binutils-5e8c1cf25beccac1d22d10dc866912394f42771b.zip toolchain_binutils-5e8c1cf25beccac1d22d10dc866912394f42771b.tar.gz toolchain_binutils-5e8c1cf25beccac1d22d10dc866912394f42771b.tar.bz2 | |
[2.25] sync to a30720e3e633f275250e26f85ccae5dbdddfb6c6
local patches will be re-applied later
commit a30720e3e633f275250e26f85ccae5dbdddfb6c6
Author: Alan Modra <amodra@gmail.com>
Date: Wed Nov 19 10:30:16 2014 +1030
daily update
Change-Id: Ieb2a3f4dd2ecb289ac5305ff08d428b2847494ab
Diffstat (limited to 'binutils-2.25/bfd/elf32-m32r.c')
| -rw-r--r-- | binutils-2.25/bfd/elf32-m32r.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/binutils-2.25/bfd/elf32-m32r.c b/binutils-2.25/bfd/elf32-m32r.c index 71e8fc7..8dba9f0 100644 --- a/binutils-2.25/bfd/elf32-m32r.c +++ b/binutils-2.25/bfd/elf32-m32r.c @@ -1,5 +1,5 @@ /* M32R-specific support for 32-bit ELF. - Copyright 1996-2013 Free Software Foundation, Inc. + Copyright (C) 1996-2014 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -2177,7 +2177,7 @@ m32r_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED, /* Set up .got offsets for local syms, and space for local dynamic relocs. */ - for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next) + for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link.next) { bfd_signed_vma *local_got; bfd_signed_vma *end_local_got; @@ -2490,6 +2490,12 @@ m32r_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, relocation = 0; h = sym_hashes[r_symndx - symtab_hdr->sh_info]; + + if (info->wrap_hash != NULL + && (input_section->flags & SEC_DEBUGGING) != 0) + h = ((struct elf_link_hash_entry *) + unwrap_hash_lookup (info, input_bfd, &h->root)); + while (h->root.type == bfd_link_hash_indirect || h->root.type == bfd_link_hash_warning) h = (struct elf_link_hash_entry *) h->root.u.i.link; @@ -4004,9 +4010,9 @@ m32r_elf_reloc_type_class (const struct bfd_link_info *info ATTRIBUTE_UNUSED, #define ELF_MACHINE_ALT1 EM_CYGNUS_M32R #define ELF_MAXPAGESIZE 0x1 /* Explicitly requested by Mitsubishi. */ -#define TARGET_BIG_SYM bfd_elf32_m32r_vec +#define TARGET_BIG_SYM m32r_elf32_vec #define TARGET_BIG_NAME "elf32-m32r" -#define TARGET_LITTLE_SYM bfd_elf32_m32rle_vec +#define TARGET_LITTLE_SYM m32r_elf32_le_vec #define TARGET_LITTLE_NAME "elf32-m32rle" #define elf_info_to_howto m32r_info_to_howto @@ -4062,11 +4068,11 @@ m32r_elf_reloc_type_class (const struct bfd_link_info *info ATTRIBUTE_UNUSED, #define ELF_MAXPAGESIZE 0x1000 #undef TARGET_BIG_SYM -#define TARGET_BIG_SYM bfd_elf32_m32rlin_vec +#define TARGET_BIG_SYM m32r_elf32_linux_vec #undef TARGET_BIG_NAME #define TARGET_BIG_NAME "elf32-m32r-linux" #undef TARGET_LITTLE_SYM -#define TARGET_LITTLE_SYM bfd_elf32_m32rlelin_vec +#define TARGET_LITTLE_SYM m32r_elf32_linux_le_vec #undef TARGET_LITTLE_NAME #define TARGET_LITTLE_NAME "elf32-m32rle-linux" #undef elf32_bed |