From: H.J. Lu <hjl.tools@gmail.com>
Date: Tue, 27 Mar 2001 02:00:34 +0000 (+0000)
Subject: 2001-03-26  H.J. Lu  <hjl@gnu.org>
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=eb4a6e4f4b7f30d8a6220d7fd807973077221faf;p=deliverable%2Fbinutils-gdb.git

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 f59fa2d699..d8a3353a2a 100644
--- 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 47da53b1bc..f67887069a 100644
--- 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 31a0ac2303..1e26b4f9ab 100644
--- 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