diff options
| author | Sean Keys <skeys@ipdatasys.com> | 2012-08-02 20:40:30 +0000 |
|---|---|---|
| committer | Sean Keys <skeys@ipdatasys.com> | 2012-08-02 20:40:30 +0000 |
| commit | 9a92d0ce3620520f3a4a4d364483b59b5d16ca7b (patch) | |
| tree | 4bcedafda26b4f56fd4a76fa65e2703178ba7b6d /bfd | |
| parent | b40f514fed16e4b9d155328938ca1a28f73f527b (diff) | |
| download | gdb-9a92d0ce3620520f3a4a4d364483b59b5d16ca7b.zip gdb-9a92d0ce3620520f3a4a4d364483b59b5d16ca7b.tar.gz gdb-9a92d0ce3620520f3a4a4d364483b59b5d16ca7b.tar.bz2 | |
* elf32-m68hc1x.c (elf32_m68hc11_relocate_section): Modified
conditional statment to allow suppression of mismatched bank
warning.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/elf32-m68hc1x.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 73f9eff..739fbef 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2012-08-02 Sean Keys <skeys@ipdatasys.com> + + * elf32-m68hc1x.c (elf32_m68hc11_relocate_section): Modified + conditional statment to allow suppression of mismatched bank + warning. + 2012-08-01 Alan Modra <amodra@gmail.com> * dwarf2.c (struct dwarf2_debug): Add close_on_cleanup. diff --git a/bfd/elf32-m68hc1x.c b/bfd/elf32-m68hc1x.c index 442a411..ef0a9f1 100644 --- a/bfd/elf32-m68hc1x.c +++ b/bfd/elf32-m68hc1x.c @@ -918,9 +918,11 @@ elf32_m68hc11_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, struct m68hc11_page_info *pinfo; const struct elf_backend_data * const ebd = get_elf_backend_data (input_bfd); struct m68hc11_elf_link_hash_table *htab; + unsigned long e_flags; symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr; sym_hashes = elf_sym_hashes (input_bfd); + e_flags = elf_elfheader (input_bfd)->e_flags; htab = m68hc11_elf_hash_table (info); if (htab == NULL) @@ -1048,7 +1050,7 @@ elf32_m68hc11_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, a LO8XG. Does not actually check that it was a LO8XG. Adjusts high and low bytes. */ relocation = phys_addr; - if ((elf_elfheader (input_bfd)->e_flags & E_M68HC11_XGATE_RAMOFFSET) + if ((e_flags & E_M68HC11_XGATE_RAMOFFSET) && (relocation >= 0x2000)) relocation += 0xc000; /* HARDCODED RAM offset for XGATE. */ @@ -1162,7 +1164,7 @@ elf32_m68hc11_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, if (m68hc11_addr_is_banked (pinfo, relocation + rel->r_addend) && m68hc11_addr_is_banked (pinfo, insn_addr) - && phys_page != insn_page) + && phys_page != insn_page && !(e_flags & E_M68HC11_NO_BANK_WARNING)) { const char * msg; char * buf; |