Replace input_bfd and output_bfd with abfd

The first argument to bfd_get_8/bfd_put_8 isn't used.  But we should
use something real.  Replace input_bfd and output_bfd with abfd.

	* elf32-i386.c (elf_i386_convert_mov_to_lea): Replace input_bfd
	and output_bfd with abfd.
	* elf64-x86-64.c (elf_x86_64_convert_mov_to_lea): Likewise.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 000cd71412b74cee62287960f5d5be9279566079..f8e97ceee72c52484e2bf9e04435e7f48816580d 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2015-05-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * elf32-i386.c (elf_i386_convert_mov_to_lea): Replace input_bfd
+       and output_bfd with abfd.
+       * elf64-x86-64.c (elf_x86_64_convert_mov_to_lea): Likewise.
+
 2015-05-06  Toni Spets  <toni.spets@iki.fi>
 
        PR ld/18372

diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index 10657f193c18b114091014511e4fe85e9e26d041..715961a3c04ab9b6613f9bb5904502b24e531a63 100644 (file)
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -2724,11 +2724,9 @@ elf_i386_convert_mov_to_lea (bfd *abfd, asection *sec,
          /* STT_GNU_IFUNC must keep R_386_GOT32 relocation.  */
          if (ELF_ST_TYPE (isym->st_info) != STT_GNU_IFUNC
              && irel->r_offset >= 2
-             && bfd_get_8 (input_bfd,
-                           contents + irel->r_offset - 2) == 0x8b)
+             && bfd_get_8 (abfd, contents + irel->r_offset - 2) == 0x8b)
            {
-             bfd_put_8 (output_bfd, 0x8d,
-                        contents + irel->r_offset - 2);
+             bfd_put_8 (abfd, 0x8d, contents + irel->r_offset - 2);
              irel->r_info = ELF32_R_INFO (r_symndx, R_386_GOTOFF);
              if (local_got_refcounts != NULL
                  && local_got_refcounts[r_symndx] > 0)
@@ -2754,11 +2752,9 @@ elf_i386_convert_mov_to_lea (bfd *abfd, asection *sec,
          && h != htab->elf.hdynamic
          && SYMBOL_REFERENCES_LOCAL (link_info, h)
          && irel->r_offset >= 2
-         && bfd_get_8 (input_bfd,
-                       contents + irel->r_offset - 2) == 0x8b)
+         && bfd_get_8 (abfd, contents + irel->r_offset - 2) == 0x8b)
        {
-         bfd_put_8 (output_bfd, 0x8d,
-                    contents + irel->r_offset - 2);
+         bfd_put_8 (abfd, 0x8d, contents + irel->r_offset - 2);
          irel->r_info = ELF32_R_INFO (r_symndx, R_386_GOTOFF);
          if (h->got.refcount > 0)
            h->got.refcount -= 1;

diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index a3604c7eba5c44be944c68411671d1df1864cdb2..34e0f835cddccd1300954365af83ccea4c963e4f 100644 (file)
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -2945,11 +2945,9 @@ elf_x86_64_convert_mov_to_lea (bfd *abfd, asection *sec,
          /* STT_GNU_IFUNC must keep R_X86_64_GOTPCREL relocation.  */
          if (ELF_ST_TYPE (isym->st_info) != STT_GNU_IFUNC
              && irel->r_offset >= 2
-             && bfd_get_8 (input_bfd,
-                           contents + irel->r_offset - 2) == 0x8b)
+             && bfd_get_8 (abfd, contents + irel->r_offset - 2) == 0x8b)
            {
-             bfd_put_8 (output_bfd, 0x8d,
-                        contents + irel->r_offset - 2);
+             bfd_put_8 (abfd, 0x8d, contents + irel->r_offset - 2);
              irel->r_info = htab->r_info (r_symndx, R_X86_64_PC32);
              if (local_got_refcounts != NULL
                  && local_got_refcounts[r_symndx] > 0)
@@ -2976,11 +2974,9 @@ elf_x86_64_convert_mov_to_lea (bfd *abfd, asection *sec,
          && h != htab->elf.hdynamic
          && SYMBOL_REFERENCES_LOCAL (link_info, h)
          && irel->r_offset >= 2
-         && bfd_get_8 (input_bfd,
-                       contents + irel->r_offset - 2) == 0x8b)
+         && bfd_get_8 (abfd, contents + irel->r_offset - 2) == 0x8b)
        {
-         bfd_put_8 (output_bfd, 0x8d,
-                    contents + irel->r_offset - 2);
+         bfd_put_8 (abfd, 0x8d, contents + irel->r_offset - 2);
          irel->r_info = htab->r_info (r_symndx, R_X86_64_PC32);
          if (h->got.refcount > 0)
            h->got.refcount -= 1;