mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-27 04:52:05 +08:00
3674e28ad0
* bfd-in.h (bfd_elf32_arm_set_target_relocs): Add prototype. (bfd_elf32_arm_process_before_allocation): Update prototype. * bfd-in2.h: Regenerate. * bfd/elf32-arm.h (elf32_arm_link_hash_table): Add target2_reloc. (elf32_arm_link_hash_table_create): Set it. (bfd_elf32_arm_process_before_allocation): Remove target1_is_rel. (bfd_elf32_arm_set_target_relocs): New function. (arm_real_reloc_type): New function. (elf32_arm_final_link_relocate): Use it. Handle R_ARM_PREL31 and R_ARM_GOT_PREL. Remove R_ARM_TARGET1. (elf32_arm_gc_sweep_hook): Ditto. (elf32_arm_check_relocs): Ditto. (elf32_arm_relocate_section): Handle R_ARM_GOT_PREL. * elfarm-nabi.c (elf32_arm_howto_table): Add R_ARM_PREL31 and R_ARM_GOT_TARGET2. (elf32_arm_got_prel): New variable. (elf32_arm_howto_from_type): New function. (elf32_arm_info_to_howto): Use it. (elf32_arm_reloc_map): Add BFD_RELOC_ARM_PREL31 and BFD_RELOC_ARM_TARGET2. * libbfd.h: Regenerate. * reloc.c: Add BFD_RELOC_ARM_TARGET2 and BFD_RELOC_ARM_PREL31. gas/ * config/tc-arm.c (s_arm_rel31): New funciton. (md_pseudo_table): Add .rel31. (md_apply_fix3): Handle BFD_RELOC_ARM_TARGET2, BFD_RELOC_32_PCREL and BFD_RELOC_ARM_PREL31. (tc_gen_reloc): Handle BFD_RELOC_ARM_PREL31 and BFD_RELOC_ARM_TARGET2. (arm_fix_adjustable): Return 0 for BFD_RELOC_ARM_TARGET2. (arm_parse_reloc): Add (target2). gas/testsuite/ * gas/arm/pic.s: Add (target2). * gas/arm/pic.d: Ditto. include/ * elf/arm.h: Remove R_ARM_STKCHK and R_ARM_THM_STKCHK. Add R_ARM_TARGET2, R_ARM_PREL31, R_ARM_GOT_ABS, R_ARM_GOT_PREL, R_ARM_GOT_BREL12, R_ARM_GOTOFF12 and R_ARM_GOTRELAX. ld/ * ld.texinfo: Rename arm-specific section. Document --target* * emulparams/armelf_fbsd.sh: Set TARGET2_TYPE. * emulparams/armelf_linux.sh: Ditto. * emulparams/armelf_nbsd.sh: Ditto. * emultempl/armelf.em: Set default for TARGET2_TYPE. (target2_type): New variable. (arm_elf_before_allocation): Don't pass target1_type. (arm_elf_create_output_section_statements): New function. (PARSE_AND_LIST_PROLOGUE): Add OPTION_TARGET2. (PARSE_AND_LIST_LONGOPTS, PARSE_AND_LIST_OPTIONS): Add --target=. (PARSE_AND_LIST_ARGS_CASES): Handle OPTION_TARGET2. (LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS): Set. * emultempl/armelf_oabi.em (_before_allocation): Remove extra argument to bfd_elf32_arm_process_before_allocation. ld/testsuite/ * ld-arm/arm-target1-{abs,rel}.d}: New files. * ld-arm/arm-target1.s: New file. * ld-arm/arm-target2-{,got-}rel.d: New files. * ld-arm/arm-target2.s: New file. * ld-arm/arm-rel31.d: New files. * ld-arm/arm-rel31.s: New files. * ld-arm/arm.ld: New file. * ld-arm/arm-elf.exp: Add new tests.
264 lines
8.3 KiB
Plaintext
264 lines
8.3 KiB
Plaintext
# This shell script emits a C file. -*- C -*-
|
|
# Copyright 1991, 1993, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004
|
|
# Free Software Foundation, Inc.
|
|
#
|
|
# This file is part of GLD, the Gnu Linker.
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 2 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# 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 arm-elf
|
|
# specific routines.
|
|
#
|
|
test -z $TARGET2_TYPE && TARGET2_TYPE="rel"
|
|
cat >>e${EMULATION_NAME}.c <<EOF
|
|
|
|
static int no_pipeline_knowledge = 0;
|
|
static char *thumb_entry_symbol = NULL;
|
|
static bfd *bfd_for_interwork;
|
|
static int byteswap_code = 0;
|
|
static int target1_is_rel = 0${TARGET1_IS_REL};
|
|
static char *target2_type = "${TARGET2_TYPE}";
|
|
|
|
static void
|
|
gld${EMULATION_NAME}_before_parse (void)
|
|
{
|
|
#ifndef TARGET_ /* I.e., if not generic. */
|
|
ldfile_set_output_arch ("`echo ${ARCH}`", bfd_arch_unknown);
|
|
#endif /* not TARGET_ */
|
|
config.dynamic_link = ${DYNAMIC_LINK-TRUE};
|
|
config.has_shared = `if test -n "$GENERATE_SHLIB_SCRIPT" ; then echo TRUE ; else echo FALSE ; fi`;
|
|
}
|
|
|
|
static void
|
|
arm_elf_after_open (void)
|
|
{
|
|
if (strstr (bfd_get_target (output_bfd), "arm") == NULL)
|
|
{
|
|
/* The arm backend needs special fields in the output hash structure.
|
|
These will only be created if the output format is an arm format,
|
|
hence we do not support linking and changing output formats at the
|
|
same time. Use a link followed by objcopy to change output formats. */
|
|
einfo ("%F%X%P: error: cannot change output format whilst linking ARM binaries\n");
|
|
return;
|
|
}
|
|
|
|
{
|
|
LANG_FOR_EACH_INPUT_STATEMENT (is)
|
|
{
|
|
bfd_elf32_arm_add_glue_sections_to_bfd (is->the_bfd, & link_info);
|
|
}
|
|
}
|
|
|
|
/* Call the standard elf routine. */
|
|
gld${EMULATION_NAME}_after_open ();
|
|
}
|
|
|
|
static void
|
|
arm_elf_set_bfd_for_interworking (lang_statement_union_type *statement)
|
|
{
|
|
if (statement->header.type == lang_input_section_enum
|
|
&& !statement->input_section.ifile->just_syms_flag
|
|
&& (statement->input_section.section->flags & SEC_EXCLUDE) == 0)
|
|
{
|
|
asection *i = statement->input_section.section;
|
|
asection *output_section = i->output_section;
|
|
|
|
ASSERT (output_section->owner == output_bfd);
|
|
|
|
if ((output_section->flags & SEC_HAS_CONTENTS) != 0
|
|
&& (i->flags & SEC_NEVER_LOAD) == 0
|
|
&& ! i->owner->output_has_begun)
|
|
{
|
|
bfd_for_interwork = i->owner;
|
|
bfd_for_interwork->output_has_begun = TRUE;
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
arm_elf_before_allocation (void)
|
|
{
|
|
bfd *tem;
|
|
|
|
/* Call the standard elf routine. */
|
|
gld${EMULATION_NAME}_before_allocation ();
|
|
|
|
if (link_info.input_bfds != NULL)
|
|
{
|
|
/* The interworking bfd must be the last one in the link. */
|
|
bfd_for_interwork = NULL;
|
|
for (tem = link_info.input_bfds; tem != NULL; tem = tem->link_next)
|
|
tem->output_has_begun = FALSE;
|
|
|
|
lang_for_each_statement (arm_elf_set_bfd_for_interworking);
|
|
for (tem = link_info.input_bfds; tem != NULL; tem = tem->link_next)
|
|
tem->output_has_begun = FALSE;
|
|
|
|
/* If bfd_for_interwork is NULL, then there are no loadable sections
|
|
with real contents to be linked, so we are not going to have to
|
|
create any interworking stubs, so it is OK not to call
|
|
bfd_elf32_arm_get_bfd_for_interworking. */
|
|
if (bfd_for_interwork != NULL)
|
|
bfd_elf32_arm_get_bfd_for_interworking (bfd_for_interwork, &link_info);
|
|
}
|
|
/* We should be able to set the size of the interworking stub section. */
|
|
|
|
/* Here we rummage through the found bfds to collect glue information. */
|
|
/* FIXME: should this be based on a command line option? krk@cygnus.com */
|
|
{
|
|
LANG_FOR_EACH_INPUT_STATEMENT (is)
|
|
{
|
|
if (!bfd_elf32_arm_process_before_allocation (is->the_bfd, & link_info,
|
|
no_pipeline_knowledge,
|
|
byteswap_code))
|
|
{
|
|
/* xgettext:c-format */
|
|
einfo (_("Errors encountered processing file %s"), is->filename);
|
|
}
|
|
}
|
|
}
|
|
|
|
/* We have seen it all. Allocate it, and carry on. */
|
|
bfd_elf32_arm_allocate_interworking_sections (& link_info);
|
|
}
|
|
|
|
static void
|
|
arm_elf_finish (void)
|
|
{
|
|
struct bfd_link_hash_entry * h;
|
|
|
|
/* Call the elf32.em routine. */
|
|
gld${EMULATION_NAME}_finish ();
|
|
|
|
if (thumb_entry_symbol == NULL)
|
|
return;
|
|
|
|
h = bfd_link_hash_lookup (link_info.hash, thumb_entry_symbol,
|
|
FALSE, FALSE, TRUE);
|
|
|
|
if (h != (struct bfd_link_hash_entry *) NULL
|
|
&& (h->type == bfd_link_hash_defined
|
|
|| h->type == bfd_link_hash_defweak)
|
|
&& h->u.def.section->output_section != NULL)
|
|
{
|
|
static char buffer[32];
|
|
bfd_vma val;
|
|
|
|
/* Special procesing is required for a Thumb entry symbol. The
|
|
bottom bit of its address must be set. */
|
|
val = (h->u.def.value
|
|
+ bfd_get_section_vma (output_bfd,
|
|
h->u.def.section->output_section)
|
|
+ h->u.def.section->output_offset);
|
|
|
|
val |= 1;
|
|
|
|
/* Now convert this value into a string and store it in entry_symbol
|
|
where the lang_finish() function will pick it up. */
|
|
buffer[0] = '0';
|
|
buffer[1] = 'x';
|
|
|
|
sprintf_vma (buffer + 2, val);
|
|
|
|
if (entry_symbol.name != NULL && entry_from_cmdline)
|
|
einfo (_("%P: warning: '--thumb-entry %s' is overriding '-e %s'\n"),
|
|
thumb_entry_symbol, entry_symbol.name);
|
|
entry_symbol.name = buffer;
|
|
}
|
|
else
|
|
einfo (_("%P: warning: connot find thumb start symbol %s\n"),
|
|
thumb_entry_symbol);
|
|
}
|
|
|
|
/* This is a convenitent point to tell BFD about target specific flags.
|
|
After the output has been created, but before inputs are read. */
|
|
static void
|
|
arm_elf_create_output_section_statements (void)
|
|
{
|
|
bfd_elf32_arm_set_target_relocs (&link_info, target1_is_rel, target2_type);
|
|
}
|
|
|
|
EOF
|
|
|
|
# Define some shell vars to insert bits of code into the standard elf
|
|
# parse_args and list_options functions.
|
|
#
|
|
PARSE_AND_LIST_PROLOGUE='
|
|
#define OPTION_THUMB_ENTRY 301
|
|
#define OPTION_BE8 302
|
|
#define OPTION_TARGET1_REL 303
|
|
#define OPTION_TARGET1_ABS 304
|
|
#define OPTION_TARGET2 305
|
|
'
|
|
|
|
PARSE_AND_LIST_SHORTOPTS=p
|
|
|
|
PARSE_AND_LIST_LONGOPTS='
|
|
{ "no-pipeline-knowledge", no_argument, NULL, '\'p\''},
|
|
{ "thumb-entry", required_argument, NULL, OPTION_THUMB_ENTRY},
|
|
{ "be8", no_argument, NULL, OPTION_BE8},
|
|
{ "target1-rel", no_argument, NULL, OPTION_TARGET1_REL},
|
|
{ "target1-abs", no_argument, NULL, OPTION_TARGET1_ABS},
|
|
{ "target2", required_argument, NULL, OPTION_TARGET2},
|
|
'
|
|
|
|
PARSE_AND_LIST_OPTIONS='
|
|
fprintf (file, _(" -p --no-pipeline-knowledge Stop the linker knowing about the pipeline length\n"));
|
|
fprintf (file, _(" --thumb-entry=<sym> Set the entry point to be Thumb symbol <sym>\n"));
|
|
fprintf (file, _(" --be8 Oputput BE8 format image\n"));
|
|
fprintf (file, _(" --target1=rel Interpret R_ARM_TARGET1 as R_ARM_REL32\n"));
|
|
fprintf (file, _(" --target1=abs Interpret R_ARM_TARGET1 as R_ARM_ABS32\n"));
|
|
fprintf (file, _(" --target2=<type> Specify definition of R_ARM_TARGET2\n"));
|
|
'
|
|
|
|
PARSE_AND_LIST_ARGS_CASES='
|
|
case '\'p\'':
|
|
no_pipeline_knowledge = 1;
|
|
break;
|
|
|
|
case OPTION_THUMB_ENTRY:
|
|
thumb_entry_symbol = optarg;
|
|
break;
|
|
|
|
case OPTION_BE8:
|
|
byteswap_code = 1;
|
|
break;
|
|
|
|
case OPTION_TARGET1_REL:
|
|
target1_is_rel = 1;
|
|
break;
|
|
|
|
case OPTION_TARGET1_ABS:
|
|
target1_is_rel = 0;
|
|
break;
|
|
|
|
case OPTION_TARGET2:
|
|
target2_type = optarg;
|
|
break;
|
|
'
|
|
|
|
# We have our own after_open and before_allocation functions, but they call
|
|
# the standard routines, so give them a different name.
|
|
LDEMUL_AFTER_OPEN=arm_elf_after_open
|
|
LDEMUL_BEFORE_ALLOCATION=arm_elf_before_allocation
|
|
LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS=arm_elf_create_output_section_statements
|
|
|
|
# Replace the elf before_parse function with our own.
|
|
LDEMUL_BEFORE_PARSE=gld"${EMULATION_NAME}"_before_parse
|
|
|
|
# Call the extra arm-elf function
|
|
LDEMUL_FINISH=arm_elf_finish
|