Conditionalise the embedded relocs feature on the m68*-*-elf target

ld/ChangeLog

@@ -1,3 +1,8 @@
+2000-09-21  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+
+	* emultempl/m68kelf.em: Conditionalise the embedded relocs feature
+	on the m68*-*-elf target.  Make it support COFF input objects.
+
 2000-09-21  Kazu Hirata  <kazu@hxi.com>
 
 	* ldmain.c: Fix formatting.

ld/emultempl/m68kelf.em

@@ -17,43 +17,55 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
 
-# This file is sourced from elf32.em, and defines extra m68k ELF
+# This file is sourced from elf32.em, and defines some extra routines for m68k
-# specific routines.
+# embedded systems using ELF and for some other systems using m68k ELF.  While
-#
+# it is sourced from elf32.em for all m68k ELF configurations, here we include
+# only the features we want depending on the configuration.
+
+case ${target} in
+  m68*-*-elf)
+    echo "#define SUPPORT_EMBEDDED_RELOCS" >>e${EMULATION_NAME}.c
+    ;;
+esac
+
 cat >>e${EMULATION_NAME}.c <<EOF
 
-static void m68k_elf_after_open PARAMS((void));
+static void m68k_elf_after_open PARAMS ((void));
+#ifdef SUPPORT_EMBEDDED_RELOCS
 static void check_sections PARAMS ((bfd *, asection *, PTR));
+#endif
 static void m68k_elf_after_allocation PARAMS ((void));
 
-/* This function is run after all the input files have been opened.
+/* This function is run after all the input files have been opened.  */
-   We create a .emreloc section for each input file with a non zero
-   .data section.  The BFD backend will fill in these sections with
-   magic numbers which can be used to relocate the data section at run
-   time.  */
 
 static void
 m68k_elf_after_open ()
 {
-  bfd *abfd;
-
   /* Call the standard elf routine.  */
   gld${EMULATION_NAME}_after_open ();
 
-  if (! command_line.embedded_relocs
+#ifdef SUPPORT_EMBEDDED_RELOCS
-      || link_info.relocateable)
+  if (command_line.embedded_relocs
-    return;
+      && (! link_info.relocateable))
+    {
+      bfd *abfd;
 
+      /* In the embedded relocs mode we create a .emreloc section for each
+	 input file with a nonzero .data section.  The BFD backend will fill in
+	 these sections with magic numbers which can be used to relocate the
+	 data section at run time.  */
       for (abfd = link_info.input_bfds; abfd != NULL; abfd = abfd->link_next)
 	{
 	  asection *datasec;
 
-      /* As first-order business, make sure that each input BFD is ELF. It
+	  /* As first-order business, make sure that each input BFD is either
-         better be, as we are directly calling a ELF backend function.  */
+	     COFF or ELF.  We need to call a special BFD backend function to
-      if (bfd_get_flavour (abfd) != bfd_target_elf_flavour)
+	     generate the embedded relocs, and we have such functions only for
-	einfo ("%F%B: all input objects must be ELF for --embedded-relocs\n");
+	     COFF and ELF.  */
+	  if (bfd_get_flavour (abfd) != bfd_target_coff_flavour
+	      && bfd_get_flavour (abfd) != bfd_target_elf_flavour)
+	    einfo ("%F%B: all input objects must be COFF or ELF for --embedded-relocs\n");
 
 	  datasec = bfd_get_section_by_name (abfd, ".data");
 
@@ -85,8 +97,11 @@ m68k_elf_after_open ()
 	     required for embedded PIC code.  */
 	  bfd_map_over_sections (abfd, check_sections, (PTR) datasec);
 	}
+    }
+#endif /* SUPPORT_EMBEDDED_RELOCS */
 }
 
+#ifdef SUPPORT_EMBEDDED_RELOCS
 /* Check that of the data sections, only the .data section has
    relocs.  This is called via bfd_map_over_sections.  */
 
@@ -103,22 +118,25 @@ check_sections (abfd, sec, datasec)
 	   abfd, bfd_get_section_name (abfd, sec));
 }
 
+#endif /* SUPPORT_EMBEDDED_RELOCS */
+
 /* This function is called after the section sizes and offsets have
-   been set.  If we are generating embedded relocs, it calls a special
+   been set.  */
-   BFD backend routine to do the work.  */
 
 static void
 m68k_elf_after_allocation ()
 {
-  bfd *abfd;
-
   /* Call the standard elf routine.  */
   gld${EMULATION_NAME}_before_allocation ();
 
-  if (! command_line.embedded_relocs
+#ifdef SUPPORT_EMBEDDED_RELOCS
-      || link_info.relocateable)
+  if (command_line.embedded_relocs
-    return;
+      && (! link_info.relocateable))
+    {
+      bfd *abfd;
 
+      /* If we are generating embedded relocs, call a special BFD backend
+	 routine to do the work.  */
       for (abfd = link_info.input_bfds; abfd != NULL; abfd = abfd->link_next)
 	{
 	  asection *datasec, *relsec;
@@ -132,6 +150,22 @@ m68k_elf_after_allocation ()
 	  relsec = bfd_get_section_by_name (abfd, ".emreloc");
 	  ASSERT (relsec != NULL);
 
+	  if (bfd_get_flavour (abfd) == bfd_target_coff_flavour)
+	    {
+	      if (! bfd_m68k_coff_create_embedded_relocs (abfd, &link_info,
+							  datasec, relsec,
+							  &errmsg))
+		{
+		  if (errmsg == NULL)
+		    einfo ("%B%X: can not create runtime reloc information: %E\n",
+			   abfd);
+		  else
+		    einfo ("%X%B: can not create runtime reloc information: %s\n",
+			   abfd, errmsg);
+		}
+	    }
+	  else if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
+	    {
 	      if (! bfd_m68k_elf32_create_embedded_relocs (abfd, &link_info,
 							   datasec, relsec,
 							   &errmsg))
@@ -144,6 +178,11 @@ m68k_elf_after_allocation ()
 			   abfd, errmsg);
 		}
 	    }
+	  else
+	    abort ();
+	}
+    }
+#endif /* SUPPORT_EMBEDDED_RELOCS */
 }
 
 EOF