From 85e02784893e9ff0c44e09abc66fa270bd27a34f Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Thu, 19 Apr 2012 09:50:24 +0000 Subject: [PATCH] bfd/ * elf32-sh.c (elf_sh_link_hash_entry): Specify an enum identifier for got_type. (allocate_dynrelocs, sh_elf_relocate_section, sh_elf_check_relocs): Use it. --- bfd/ChangeLog | 7 +++++++ bfd/elf32-sh.c | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index dacde6d5fc4..93cc9ebb1c7 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2012-04-19 Thomas Schwinge + + * elf32-sh.c (elf_sh_link_hash_entry): Specify an enum identifier for + got_type. + (allocate_dynrelocs, sh_elf_relocate_section, sh_elf_check_relocs): Use + it. + 2012-04-17 Kaz Kojima * elf32-sh.c (allocate_dynrelocs): Don't allocate dynamic diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c index 87d4e4fcbc5..abe837d1937 100644 --- a/bfd/elf32-sh.c +++ b/bfd/elf32-sh.c @@ -2406,7 +2406,7 @@ struct elf_sh_link_hash_entry and thus require fixups or relocations. */ bfd_signed_vma abs_funcdesc_refcount; - enum { + enum got_type { GOT_UNKNOWN = 0, GOT_NORMAL, GOT_TLS_GD, GOT_TLS_IE, GOT_FUNCDESC } got_type; }; @@ -3078,7 +3078,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) { asection *s; bfd_boolean dyn; - int got_type = sh_elf_hash_entry (h)->got_type; + enum got_type got_type = sh_elf_hash_entry (h)->got_type; /* Make sure this symbol is output as a dynamic symbol. Undefined weak syms won't yet be marked as dynamic. */ @@ -3980,7 +3980,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, bfd_reloc_status_type r; int seen_stt_datalabel = 0; bfd_vma off; - int got_type; + enum got_type got_type; const char *symname = NULL; r_symndx = ELF32_R_SYM (rel->r_info); @@ -6093,7 +6093,7 @@ sh_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec, const Elf_Internal_Rela *rel_end; asection *sreloc; unsigned int r_type; - int got_type, old_got_type; + enum got_type got_type, old_got_type; sreloc = NULL; -- 2.30.2