diff options
Diffstat (limited to 'ld/emultempl')
| -rw-r--r-- | ld/emultempl/armelf.em | 25 | ||||
| -rw-r--r-- | ld/emultempl/armelf_oabi.em | 2 |
2 files changed, 22 insertions, 5 deletions
diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em index 6a690f8..54af832 100644 --- a/ld/emultempl/armelf.em +++ b/ld/emultempl/armelf.em @@ -22,6 +22,7 @@ # 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; @@ -29,6 +30,7 @@ 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) @@ -121,8 +123,7 @@ arm_elf_before_allocation (void) { if (!bfd_elf32_arm_process_before_allocation (is->the_bfd, & link_info, no_pipeline_knowledge, - byteswap_code, - target1_is_rel)) + byteswap_code)) { /* xgettext:c-format */ einfo (_("Errors encountered processing file %s"), is->filename); @@ -182,6 +183,14 @@ arm_elf_finish (void) 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 @@ -192,6 +201,7 @@ PARSE_AND_LIST_PROLOGUE=' #define OPTION_BE8 302 #define OPTION_TARGET1_REL 303 #define OPTION_TARGET1_ABS 304 +#define OPTION_TARGET2 305 ' PARSE_AND_LIST_SHORTOPTS=p @@ -202,14 +212,16 @@ PARSE_AND_LIST_LONGOPTS=' { "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, _(" --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=' @@ -232,12 +244,17 @@ PARSE_AND_LIST_ARGS_CASES=' 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 diff --git a/ld/emultempl/armelf_oabi.em b/ld/emultempl/armelf_oabi.em index 64f908a..a9b053b 100644 --- a/ld/emultempl/armelf_oabi.em +++ b/ld/emultempl/armelf_oabi.em @@ -69,7 +69,7 @@ gld${EMULATION_NAME}_before_allocation (void) LANG_FOR_EACH_INPUT_STATEMENT (is) { if (!bfd_elf32_arm_process_before_allocation (is->the_bfd, &link_info, - 0, 0, 0)) + 0, 0)) { /* xgettext:c-format */ einfo (_("Errors encountered processing file %s"), is->filename); |