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.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f59fa2d6991c108ee19f310b2294807a3507f739..d8a3353a2ac16a9763b3c4792410c1ee0a0c54c6 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,14 @@
+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.
+
 2001-03-23  Nick Clifton  <nickc@redhat.com>
 
        * Makefile.am (BUILD_CFILES): New variable: List of C source

diff --git a/bfd/elf32-gen.c b/bfd/elf32-gen.c
index 47da53b1bc68a038d3b1bbb0181559b70fbc8e1c..f67887069a72cf4304b8d851b1331dcbb57aaa73 100644 (file)
--- a/bfd/elf32-gen.c
+++ b/bfd/elf32-gen.c
@@ -58,6 +58,37 @@ elf_generic_info_to_howto_rel (abfd, bfd_reloc, elf_reloc)
   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_reloc, elf_reloc)
 #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
 

diff --git a/bfd/elf64-gen.c b/bfd/elf64-gen.c
index 31a0ac23037a16ea0586549affccf43b1905b999..1e26b4f9ab07f1b05dc5c142795d90ede447012d 100644 (file)
--- a/bfd/elf64-gen.c
+++ b/bfd/elf64-gen.c
@@ -58,6 +58,37 @@ elf_generic_info_to_howto_rel (abfd, bfd_reloc, elf_reloc)
   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_reloc, elf_reloc)
 #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