Move elfXX_r_info/elfXX_r_sym to elfcode.h.

2010-12-30  H.J. Lu  <hongjiu.lu@intel.com>

	* elfcode.h (NAME(elf,r_info)): New.
	(NAME(elf,r_sym)): Likewise.

	* elflink.c (elf64_r_info): Removed.
	(elf32_r_info): Likewise.
	(elf64_r_sym): Likewise.
	(elf32_r_sym): Likewise.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index fc4e5a39a7b1012cd763a934e842c5d01f92e079..7899936751073cde2e282dd633f62ea7fdb79327 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * elfcode.h (NAME(elf,r_info)): New.
+       (NAME(elf,r_sym)): Likewise.
+
+       * elflink.c (elf64_r_info): Removed.
+       (elf32_r_info): Likewise.
+       (elf64_r_sym): Likewise.
+       (elf32_r_sym): Likewise.
+
 2010-12-30  H.J. Lu  <hongjiu.lu@intel.com>
 
        * elf64-x86-64.c (elf_x86_64_relocs_compatible): New.

diff --git a/bfd/elfcode.h b/bfd/elfcode.h
index 5ef461018d97bbc8e08d9150a894ae26e60e50f8..509d42626224e4c5bdb8be2b4c24d12d89a2d5d7 100644 (file)
--- a/bfd/elfcode.h
+++ b/bfd/elfcode.h
@@ -1855,6 +1855,22 @@ NAME(_bfd_elf,bfd_from_remote_memory)
     *loadbasep = loadbase;
   return nbfd;
 }
+
+/* Function for ELF_R_INFO.  */
+
+bfd_vma
+NAME(elf,r_info) (bfd_vma sym, bfd_vma type)
+{
+  return ELF_R_INFO (sym, type);
+}
+
+/* Function for ELF_R_SYM.  */
+
+bfd_vma
+NAME(elf,r_sym) (bfd_vma r_info)
+{
+  return ELF_R_SYM (r_info);
+}
 \f
 #include "elfcore.h"
 \f

diff --git a/bfd/elflink.c b/bfd/elflink.c
index c0dae0ff0d1822893a499345d7979e903af9b635..79256bf6f6e177d5b1501e8234fee19dc7ecdcde 100644 (file)
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -12751,35 +12751,3 @@ elf_append_rel (bfd *abfd, asection *s, Elf_Internal_Rela *rel)
   BFD_ASSERT (loc + bed->s->sizeof_rel <= s->contents + s->size);
   bed->s->swap_reloca_out (abfd, rel, loc);
 }
-
-/* Function for ELF64_R_INFO.  */
-
-bfd_vma
-elf64_r_info (bfd_vma sym, bfd_vma type)
-{
-  return ELF64_R_INFO (sym, type);
-}
-
-/* Function for ELF32_R_INFO.  */
-
-bfd_vma
-elf32_r_info (bfd_vma sym, bfd_vma type)
-{
-  return ELF32_R_INFO (sym, type);
-}
-
-/* Function for ELF64_R_SYM .  */
-
-bfd_vma
-elf64_r_sym (bfd_vma r_info)
-{
-  return ELF64_R_SYM (r_info);
-}
-
-/* Function for ELF32_R_SYM .  */
-
-bfd_vma
-elf32_r_sym (bfd_vma r_info)
-{
-  return ELF32_R_SYM (r_info);
-}