Re: RFC: Add 32bit x86-64 support to binutils

["H.J. Lu" <hjl dot tools at gmail dot com>]

On Thu, Dec 30, 2010 at 5:16 PM, Hans-Peter Nilsson
<hans-peter.nilsson@axis.com> wrote:
>> Date: Fri, 31 Dec 2010 02:11:15 +0100
>> From: Hans-Peter Nilsson <hp@axis.com>
>
>> use 'CC=gcc -m32' as below with gcc-4.3.x)
>
> JFTR, I was wrong on the gcc version:
> pchp2:hp:/tmp: rpm -q gcc
> gcc-4.4.3-4.fc12.x86_64
> and it was 'CC=gcc -O2 -m32'.
>

I checked in this patch to fix it.

Thanks.


-- 
H.J.
---
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);
-}