From c9736ba0eec1656e00358edcf0c0f44766f53f17 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 19 Apr 2010 08:46:48 +0000 Subject: [PATCH] * archive64.c (bfd_elf64_archive_slurp_armap): Remove unused arhdrpos variable. * elf64-x86-64.c (elf64_x86_64_relocate_section): Add unused attribute to warned variable. Remove unused val, type and type2 variables. --- bfd/ChangeLog | 10 +++++++++- bfd/archive64.c | 6 ++---- bfd/elf64-x86-64.c | 23 +++++------------------ 3 files changed, 16 insertions(+), 23 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 3d058c5..ca047e7 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,8 +1,16 @@ +2010-04-19 Nick Clifton + + * archive64.c (bfd_elf64_archive_slurp_armap): Remove unused + arhdrpos variable. + * elf64-x86-64.c (elf64_x86_64_relocate_section): Add unused + attribute to warned variable. Remove unused val, type and type2 + variables. + 2010-04-16 Andreas Schwab * vms-alpha.c (alpha_vms_link_add_object_symbols): Avoid breaking strict-aliasing rules. - + 2010-04-16 Tristan Gingold * vms-alpha.c (_bfd_vms_slurp_eihd): Fix typo. diff --git a/bfd/archive64.c b/bfd/archive64.c index 0a1f6ed..067fbb9 100644 --- a/bfd/archive64.c +++ b/bfd/archive64.c @@ -1,6 +1,6 @@ /* MIPS-specific support for 64-bit ELF - Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007 - Free Software Foundation, Inc. + Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, + 2010 Free Software Foundation, Inc. Ian Lance Taylor, Cygnus Support Linker support added by Mark Mitchell, CodeSourcery, LLC. @@ -43,7 +43,6 @@ bfd_elf64_archive_slurp_armap (bfd *abfd) { struct artdata *ardata = bfd_ardata (abfd); char nextname[17]; - file_ptr arhdrpos; bfd_size_type i, parsed_size, nsymz, stringsize, carsym_size, ptrsize; struct areltdata *mapdata; bfd_byte int_buf[8]; @@ -55,7 +54,6 @@ bfd_elf64_archive_slurp_armap (bfd *abfd) ardata->symdefs = NULL; /* Get the name of the first element. */ - arhdrpos = bfd_tell (abfd); i = bfd_bread (nextname, 16, abfd); if (i == 0) return TRUE; diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index 8051813..3a24cca 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -2676,7 +2676,7 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info, } else { - bfd_boolean warned; + bfd_boolean warned ATTRIBUTE_UNUSED; RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel, r_symndx, symtab_hdr, sym_hashes, @@ -3319,13 +3319,11 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info, leaq x@tlsdesc(%rip), %rax Change it to: - movl $x@tpoff, %rax - */ + movl $x@tpoff, %rax. */ - unsigned int val, type, type2; + unsigned int val, type; type = bfd_get_8 (input_bfd, contents + roff - 3); - type2 = bfd_get_8 (input_bfd, contents + roff - 2); val = bfd_get_8 (input_bfd, contents + roff - 1); bfd_put_8 (output_bfd, 0x48 | ((type >> 2) & 1), contents + roff - 3); @@ -3554,14 +3552,7 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info, leaq x@tlsdesc(%rip), %rax Change it to: - movq x@gottpoff(%rip), %rax # before xchg %ax,%ax - */ - - unsigned int val, type, type2; - - type = bfd_get_8 (input_bfd, contents + roff - 3); - type2 = bfd_get_8 (input_bfd, contents + roff - 2); - val = bfd_get_8 (input_bfd, contents + roff - 1); + movq x@gottpoff(%rip), %rax # before xchg %ax,%ax. */ /* Now modify the instruction as appropriate. To turn a leaq into a movq in the form we use it, it @@ -3586,12 +3577,8 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info, call *(%rax) Change it to: - xchg %ax,%ax. */ - - unsigned int val, type; + xchg %ax, %ax. */ - type = bfd_get_8 (input_bfd, contents + roff); - val = bfd_get_8 (input_bfd, contents + roff + 1); bfd_put_8 (output_bfd, 0x66, contents + roff); bfd_put_8 (output_bfd, 0x90, contents + roff + 1); continue; -- 2.7.4