From 40551fb82ee710dc311320c3a010b742d387b46e Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 16 May 2012 14:52:16 +0000 Subject: PR 13503 * reloc.c: Rename BFD_RELOC_AVR_8_HHI to BFD_RELOC_AVR_8_HLO. * bfd-in2.h: Regenerate. * libbfd.h: Regenrate. * elf32-avr.c (elf_avr_howto_table): Rename R_AVR_8_HHI8 to R_AVR_8_HLO8. (avr_reloc_map): Ditto. * config/tc-avr.c (avr_cons_fix_new): Rename R_AVR_8_HHI8 to R_AVR_8_HLO8. (exp_mod_data) Ditto. And replace "hhi8" with "hlo8". (md_apply_fix): Rename BFD_RELOC_AVR_8_HHI to BFD_RELOC_AVR_8_HLO. * avr.h (RELOC_NUMBERS): Rename R_AVR_8_HHI8 to R_AVR_8_HLO8. --- bfd/ChangeLog | 10 ++++++++++ bfd/bfd-in2.h | 4 ++-- bfd/elf32-avr.c | 8 ++++---- bfd/libbfd.h | 2 +- bfd/reloc.c | 4 ++-- 5 files changed, 19 insertions(+), 9 deletions(-) (limited to 'bfd') diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 200e37a6e1..533ed375da 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,13 @@ +2012-05-16 Georg-Johann Lay + + PR target/13503 + * reloc.c: Rename BFD_RELOC_AVR_8_HHI to BFD_RELOC_AVR_8_HLO. + * bfd-in2.h: Regenerate. + * libbfd.h: Regenrate. + * elf32-avr.c (elf_avr_howto_table): Rename R_AVR_8_HHI8 to + R_AVR_8_HLO8. + (avr_reloc_map): Likewise. + 2012-05-16 Daniel Richard G. PR binutils/13558 diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index a006591959..629d03bf6f 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -4111,8 +4111,8 @@ in .byte hi8(symbol) */ BFD_RELOC_AVR_8_HI, /* This is a 8 bit reloc for the AVR that stores bits 16..23 of a symbol -in .byte hhi8(symbol) */ - BFD_RELOC_AVR_8_HHI, +in .byte hlo8(symbol) */ + BFD_RELOC_AVR_8_HLO, /* Renesas RL78 Relocations. */ BFD_RELOC_RL78_NEG8, diff --git a/bfd/elf32-avr.c b/bfd/elf32-avr.c index 582cdaee9f..38e41df48d 100644 --- a/bfd/elf32-avr.c +++ b/bfd/elf32-avr.c @@ -545,8 +545,8 @@ static reloc_howto_type elf_avr_howto_table[] = 0xffffff, /* src_mask */ 0xffffff, /* dst_mask */ FALSE), /* pcrel_offset */ - /* hhi8-part to use in .byte hhi8(sym). */ - HOWTO (R_AVR_8_HHI8, /* type */ + /* hlo8-part to use in .byte hlo8(sym). */ + HOWTO (R_AVR_8_HLO8, /* type */ 16, /* rightshift */ 0, /* size (0 = byte, 1 = short, 2 = long) */ 8, /* bitsize */ @@ -554,7 +554,7 @@ static reloc_howto_type elf_avr_howto_table[] = 0, /* bitpos */ complain_overflow_dont,/* complain_on_overflow */ bfd_elf_generic_reloc, /* special_function */ - "R_AVR_8_HHI8", /* name */ + "R_AVR_8_HLO8", /* name */ FALSE, /* partial_inplace */ 0xffffff, /* src_mask */ 0xffffff, /* dst_mask */ @@ -600,7 +600,7 @@ static const struct avr_reloc_map avr_reloc_map[] = { BFD_RELOC_8, R_AVR_8 }, { BFD_RELOC_AVR_8_LO, R_AVR_8_LO8 }, { BFD_RELOC_AVR_8_HI, R_AVR_8_HI8 }, - { BFD_RELOC_AVR_8_HHI, R_AVR_8_HHI8 } + { BFD_RELOC_AVR_8_HLO, R_AVR_8_HLO8 } }; /* Meant to be filled one day with the wrap around address for the diff --git a/bfd/libbfd.h b/bfd/libbfd.h index 173c009c91..0bd5dd2abf 100644 --- a/bfd/libbfd.h +++ b/bfd/libbfd.h @@ -1886,7 +1886,7 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", "BFD_RELOC_AVR_6_ADIW", "BFD_RELOC_AVR_8_LO", "BFD_RELOC_AVR_8_HI", - "BFD_RELOC_AVR_8_HHI", + "BFD_RELOC_AVR_8_HLO", "BFD_RELOC_RL78_NEG8", "BFD_RELOC_RL78_NEG16", "BFD_RELOC_RL78_NEG24", diff --git a/bfd/reloc.c b/bfd/reloc.c index 978fe8da21..cc4a5db59a 100644 --- a/bfd/reloc.c +++ b/bfd/reloc.c @@ -4405,10 +4405,10 @@ ENUMDOC This is a 8 bit reloc for the AVR that stores bits 8..15 of a symbol in .byte hi8(symbol) ENUM - BFD_RELOC_AVR_8_HHI + BFD_RELOC_AVR_8_HLO ENUMDOC This is a 8 bit reloc for the AVR that stores bits 16..23 of a symbol - in .byte hhi8(symbol) + in .byte hlo8(symbol) ENUM BFD_RELOC_RL78_NEG8 -- cgit v1.2.1