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

This commit is contained in:
Nick Clifton
2000-09-22 00:41:50 +00:00
parent 0b7410c4da
commit 36bdbeeca5
2 changed files with 120 additions and 76 deletions

View File

@ -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> 2000-09-21 Kazu Hirata <kazu@hxi.com>
* ldmain.c: Fix formatting. * ldmain.c: Fix formatting.

View File

@ -17,76 +17,91 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # 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 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)); static void check_sections PARAMS ((bfd *, asection *, PTR));
#endif
static void m68k_elf_after_allocation PARAMS ((void)); 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 static void
m68k_elf_after_open () m68k_elf_after_open ()
{ {
bfd *abfd;
/* Call the standard elf routine. */ /* Call the standard elf routine. */
gld${EMULATION_NAME}_after_open (); 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))
for (abfd = link_info.input_bfds; abfd != NULL; abfd = abfd->link_next)
{ {
asection *datasec; bfd *abfd;
/* As first-order business, make sure that each input BFD is ELF. It /* In the embedded relocs mode we create a .emreloc section for each
better be, as we are directly calling a ELF backend function. */ input file with a nonzero .data section. The BFD backend will fill in
if (bfd_get_flavour (abfd) != bfd_target_elf_flavour) these sections with magic numbers which can be used to relocate the
einfo ("%F%B: all input objects must be ELF for --embedded-relocs\n"); data section at run time. */
for (abfd = link_info.input_bfds; abfd != NULL; abfd = abfd->link_next)
datasec = bfd_get_section_by_name (abfd, ".data");
/* Note that we assume that the reloc_count field has already
been set up. We could call bfd_get_reloc_upper_bound, but
that returns the size of a memory buffer rather than a reloc
count. We do not want to call bfd_canonicalize_reloc,
because although it would always work it would force us to
read in the relocs into BFD canonical form, which would waste
a significant amount of time and memory. */
if (datasec != NULL && datasec->reloc_count > 0)
{ {
asection *relsec; asection *datasec;
relsec = bfd_make_section (abfd, ".emreloc"); /* As first-order business, make sure that each input BFD is either
if (relsec == NULL COFF or ELF. We need to call a special BFD backend function to
|| ! bfd_set_section_flags (abfd, relsec, generate the embedded relocs, and we have such functions only for
(SEC_ALLOC COFF and ELF. */
| SEC_LOAD if (bfd_get_flavour (abfd) != bfd_target_coff_flavour
| SEC_HAS_CONTENTS && bfd_get_flavour (abfd) != bfd_target_elf_flavour)
| SEC_IN_MEMORY)) einfo ("%F%B: all input objects must be COFF or ELF for --embedded-relocs\n");
|| ! bfd_set_section_alignment (abfd, relsec, 2)
|| ! bfd_set_section_size (abfd, relsec, datasec = bfd_get_section_by_name (abfd, ".data");
datasec->reloc_count * 12))
einfo ("%F%B: can not create .emreloc section: %E\n"); /* Note that we assume that the reloc_count field has already
been set up. We could call bfd_get_reloc_upper_bound, but
that returns the size of a memory buffer rather than a reloc
count. We do not want to call bfd_canonicalize_reloc,
because although it would always work it would force us to
read in the relocs into BFD canonical form, which would waste
a significant amount of time and memory. */
if (datasec != NULL && datasec->reloc_count > 0)
{
asection *relsec;
relsec = bfd_make_section (abfd, ".emreloc");
if (relsec == NULL
|| ! bfd_set_section_flags (abfd, relsec,
(SEC_ALLOC
| SEC_LOAD
| SEC_HAS_CONTENTS
| SEC_IN_MEMORY))
|| ! bfd_set_section_alignment (abfd, relsec, 2)
|| ! bfd_set_section_size (abfd, relsec,
datasec->reloc_count * 12))
einfo ("%F%B: can not create .emreloc section: %E\n");
}
/* Double check that all other data sections are empty, as is
required for embedded PIC code. */
bfd_map_over_sections (abfd, check_sections, (PTR) datasec);
} }
/* Double check that all other data sections are empty, as is
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 /* Check that of the data sections, only the .data section has
relocs. This is called via bfd_map_over_sections. */ relocs. This is called via bfd_map_over_sections. */
@ -103,47 +118,71 @@ check_sections (abfd, sec, datasec)
abfd, bfd_get_section_name (abfd, sec)); abfd, bfd_get_section_name (abfd, sec));
} }
#endif /* SUPPORT_EMBEDDED_RELOCS */
/* This function is called after the section sizes and offsets have /* 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 static void
m68k_elf_after_allocation () m68k_elf_after_allocation ()
{ {
bfd *abfd;
/* Call the standard elf routine. */ /* Call the standard elf routine. */
gld${EMULATION_NAME}_before_allocation (); 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))
for (abfd = link_info.input_bfds; abfd != NULL; abfd = abfd->link_next)
{ {
asection *datasec, *relsec; bfd *abfd;
char *errmsg;
datasec = bfd_get_section_by_name (abfd, ".data"); /* If we are generating embedded relocs, call a special BFD backend
routine to do the work. */
if (datasec == NULL || datasec->reloc_count == 0) for (abfd = link_info.input_bfds; abfd != NULL; abfd = abfd->link_next)
continue;
relsec = bfd_get_section_by_name (abfd, ".emreloc");
ASSERT (relsec != NULL);
if (! bfd_m68k_elf32_create_embedded_relocs (abfd, &link_info,
datasec, relsec,
&errmsg))
{ {
if (errmsg == NULL) asection *datasec, *relsec;
einfo ("%B%X: can not create runtime reloc information: %E\n", char *errmsg;
abfd);
datasec = bfd_get_section_by_name (abfd, ".data");
if (datasec == NULL || datasec->reloc_count == 0)
continue;
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))
{
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 else
einfo ("%X%B: can not create runtime reloc information: %s\n", abort ();
abfd, errmsg);
} }
} }
#endif /* SUPPORT_EMBEDDED_RELOCS */
} }
EOF EOF