aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2010-12-31 02:43:21 +0000
committerH.J. Lu <hjl.tools@gmail.com>2010-12-31 02:43:21 +0000
commita836572f89a477527b109f19601f2fe2b804fd3d (patch)
tree29da705cc8a25234ee3cb63b56a148e03441039e
parentc543bf9aabd5182baa9ba2c005fba2252e826404 (diff)
downloadfsf-binutils-gdb-a836572f89a477527b109f19601f2fe2b804fd3d.zip
fsf-binutils-gdb-a836572f89a477527b109f19601f2fe2b804fd3d.tar.gz
fsf-binutils-gdb-a836572f89a477527b109f19601f2fe2b804fd3d.tar.bz2
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.
-rw-r--r--bfd/ChangeLog10
-rw-r--r--bfd/elfcode.h16
-rw-r--r--bfd/elflink.c32
3 files changed, 26 insertions, 32 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index fc4e5a3..7899936 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,15 @@
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.
(elf_backend_relocs_compatible): Defined to
elf_x86_64_relocs_compatible.
diff --git a/bfd/elfcode.h b/bfd/elfcode.h
index 5ef4610..509d426 100644
--- 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);
+}
#include "elfcore.h"
diff --git a/bfd/elflink.c b/bfd/elflink.c
index c0dae0f..79256bf 100644
--- 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);
-}