Add get_elf_x86_64_arch_data

	* elf64-x86-64.c (get_elf_x86_64_arch_data): New.
	(get_elf_x86_64_backend_data): Use it.
	(elf_x86_64_size_dynamic_sections): Likewise.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 0b07c5ef5acb67970cd9c20ae550d2b4475325f8..6e34cc75f20768218daae734b6d503561040aa91 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2013-08-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * elf64-x86-64.c (get_elf_x86_64_arch_data): New.
+       (get_elf_x86_64_backend_data): Use it.
+       (elf_x86_64_size_dynamic_sections): Likewise.
+
 2013-08-23  Yuri Chornoivan  <yurchor@ukr.net>
 
        PR binutils/15834

diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 56a1f814eb230c67b11e03905c3b370a634d5c8a..3352d05c8329935d3924951cb9d4e238f6cf31ad 100644 (file)
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -628,9 +628,11 @@ struct elf_x86_64_backend_data
   unsigned int eh_frame_plt_size;
 };
 
+#define get_elf_x86_64_arch_data(bed) \
+  ((const struct elf_x86_64_backend_data *) (bed)->arch_data)
+
 #define get_elf_x86_64_backend_data(abfd) \
-  ((const struct elf_x86_64_backend_data *) \
-   get_elf_backend_data (abfd)->arch_data)
+  get_elf_x86_64_arch_data (get_elf_backend_data (abfd))
 
 #define GET_PLT_ENTRY_SIZE(abfd) \
   get_elf_x86_64_backend_data (abfd)->plt_entry_size
@@ -2906,7 +2908,7 @@ elf_x86_64_size_dynamic_sections (bfd *output_bfd,
       && _bfd_elf_eh_frame_present (info))
     {
       const struct elf_x86_64_backend_data *arch_data
-       = (const struct elf_x86_64_backend_data *) bed->arch_data;
+       = get_elf_x86_64_arch_data (bed);
       htab->plt_eh_frame->size = arch_data->eh_frame_plt_size;
     }
 
@@ -2978,7 +2980,7 @@ elf_x86_64_size_dynamic_sections (bfd *output_bfd,
       && htab->plt_eh_frame->contents != NULL)
     {
       const struct elf_x86_64_backend_data *arch_data
-       = (const struct elf_x86_64_backend_data *) bed->arch_data;
+       = get_elf_x86_64_arch_data (bed);
 
       memcpy (htab->plt_eh_frame->contents,
              arch_data->eh_frame_plt, htab->plt_eh_frame->size);