This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
Re: Patch: Check input format against output
On Mon, Mar 26, 2001 at 02:07:20PM -0800, Ian Lance Taylor wrote:
> "H . J . Lu" <hjl@lucon.org> writes:
>
> > I believe we can use the generic ELF backends as input during final
> > link as long as no relocations were involved. We should only flag an
> > error if there are any relocations for the generic ELF backends. How
> > about this new patch.
>
> I think the change should be in elf32-gen.c and elf64-gen.c.
>
> I'm not personally going to be happy with a change to elflink.h until
> you can explain why changing elf32-gen.c and elf64-gen.c is wrong.
>
How about this patch?
Thanks.
H.J.
---
2001-03-26 H.J. Lu <hjl@gnu.org>
* elf32-gen.c (elf32_generic_link_add_symbols): New. Check
if there are any relocations for generic ELF.
(bfd_elf32_bfd_link_add_symbols): Defined to
elf32_generic_link_add_symbols.
* elf64-gen.c (elf64_generic_link_add_symbols): New. Check
if there are any relocations for generic ELF.
(bfd_elf64_bfd_link_add_symbols): Defined to
elf64_generic_link_add_symbols.
Index: elf32-gen.c
===================================================================
RCS file: /work/cvs/gnu/binutils/bfd/elf32-gen.c,v
retrieving revision 1.1.1.3
diff -u -p -r1.1.1.3 elf32-gen.c
--- elf32-gen.c 1999/07/12 17:13:28 1.1.1.3
+++ elf32-gen.c 2001/03/26 22:22:12
@@ -58,6 +58,37 @@ elf_generic_info_to_howto_rel (abfd, bfd
bfd_reloc->howto = &dummy;
}
+static boolean
+elf32_generic_link_add_symbols (abfd, info)
+ bfd *abfd;
+ struct bfd_link_info *info ATTRIBUTE_UNUSED;
+{
+ asection *o;
+
+ /* Check if there are any relocations. */
+ for (o = abfd->sections; o != NULL; o = o->next)
+ if ((o->flags & SEC_RELOC) != 0)
+ {
+ Elf_Internal_Ehdr *ehdrp;
+
+ ehdrp = elf_elfheader (abfd);
+ if (abfd->my_archive)
+ (*_bfd_error_handler) (_("%s(%s): Relocations in generic ELF (EM: %d)"),
+ bfd_get_filename (abfd->my_archive),
+ bfd_get_filename (abfd),
+ ehdrp->e_machine);
+ else
+ (*_bfd_error_handler) (_("%s: Relocations in generic ELF (EM: %d)"),
+ bfd_get_filename (abfd),
+ ehdrp->e_machine);
+
+ bfd_set_error (bfd_error_wrong_format);
+ return false;
+ }
+
+ return bfd_elf32_bfd_link_add_symbols (abfd, info);
+}
+
#define TARGET_LITTLE_SYM bfd_elf32_little_generic_vec
#define TARGET_LITTLE_NAME "elf32-little"
#define TARGET_BIG_SYM bfd_elf32_big_generic_vec
@@ -66,6 +97,7 @@ elf_generic_info_to_howto_rel (abfd, bfd
#define ELF_MACHINE_CODE EM_NONE
#define ELF_MAXPAGESIZE 0x1
#define bfd_elf32_bfd_reloc_type_lookup bfd_default_reloc_type_lookup
+#define bfd_elf32_bfd_link_add_symbols elf32_generic_link_add_symbols
#define elf_info_to_howto elf_generic_info_to_howto
#define elf_info_to_howto_rel elf_generic_info_to_howto_rel
Index: elf64-gen.c
===================================================================
RCS file: /work/cvs/gnu/binutils/bfd/elf64-gen.c,v
retrieving revision 1.1.1.3
diff -u -p -r1.1.1.3 elf64-gen.c
--- elf64-gen.c 2001/03/09 19:15:56 1.1.1.3
+++ elf64-gen.c 2001/03/26 22:22:12
@@ -58,6 +58,37 @@ elf_generic_info_to_howto_rel (abfd, bfd
bfd_reloc->howto = &dummy;
}
+static boolean
+elf64_generic_link_add_symbols (abfd, info)
+ bfd *abfd;
+ struct bfd_link_info *info ATTRIBUTE_UNUSED;
+{
+ asection *o;
+
+ /* Check if there are any relocations. */
+ for (o = abfd->sections; o != NULL; o = o->next)
+ if ((o->flags & SEC_RELOC) != 0)
+ {
+ Elf_Internal_Ehdr *ehdrp;
+
+ ehdrp = elf_elfheader (abfd);
+ if (abfd->my_archive)
+ (*_bfd_error_handler) (_("%s(%s): Relocations in generic ELF (EM: %d)"),
+ bfd_get_filename (abfd->my_archive),
+ bfd_get_filename (abfd),
+ ehdrp->e_machine);
+ else
+ (*_bfd_error_handler) (_("%s: Relocations in generic ELF (EM: %d)"),
+ bfd_get_filename (abfd),
+ ehdrp->e_machine);
+
+ bfd_set_error (bfd_error_wrong_format);
+ return false;
+ }
+
+ return bfd_elf64_bfd_link_add_symbols (abfd, info);
+}
+
#define TARGET_LITTLE_SYM bfd_elf64_little_generic_vec
#define TARGET_LITTLE_NAME "elf64-little"
#define TARGET_BIG_SYM bfd_elf64_big_generic_vec
@@ -66,6 +97,7 @@ elf_generic_info_to_howto_rel (abfd, bfd
#define ELF_MACHINE_CODE EM_NONE
#define ELF_MAXPAGESIZE 0x1
#define bfd_elf64_bfd_reloc_type_lookup bfd_default_reloc_type_lookup
+#define bfd_elf64_bfd_link_add_symbols elf64_generic_link_add_symbols
#define elf_info_to_howto elf_generic_info_to_howto
#define elf_info_to_howto_rel elf_generic_info_to_howto_rel