From 51020d214bfe2cd8b912db0f3f2fafb40df28bc2 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Wed, 10 Nov 2010 14:54:30 +0000 Subject: bfd/ * elf32-arm.c (elf32_arm_merge_eabi_attributes): Remove unused variables. --- bfd/ChangeLog | 5 +++++ bfd/elf32-arm.c | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index a9ebff6..e87744a 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2010-11-10 Richard Sandiford + + * elf32-arm.c (elf32_arm_merge_eabi_attributes): Remove unused + variables. + 2010-11-10 Nick Clifton * po/ja.po: Updated Japanese translation. diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index 577060b..ffe8f60 100644 --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -9904,9 +9904,6 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd) { obj_attribute *in_attr; obj_attribute *out_attr; - obj_attribute_list *in_list; - obj_attribute_list *out_list; - obj_attribute_list **out_listp; /* Some tags have 0 = don't care, 1 = strong requirement, 2 = weak requirement. */ static const int order_021[3] = {0, 2, 1}; @@ -10417,10 +10414,6 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd) return FALSE; /* Check for any attributes not known on ARM. */ - in_list = elf_other_obj_attributes_proc (ibfd); - out_listp = &elf_other_obj_attributes_proc (obfd); - out_list = *out_listp; - result &= _bfd_elf_merge_unknown_attribute_list (ibfd, obfd); return result; -- cgit v1.1