X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Femultempl%2Farmelf.em;h=b292cd13fb5ad230801b5ae684469c283c6470fc;hb=dea514f51da1051f9f3cd7a746e3b68085aa1a72;hp=beeb40c72076cb93096c867451990f7349eaebd7;hpb=e489d0aef709443ce63e0bb21e7eb18c9575d35c;p=deliverable%2Fbinutils-gdb.git

diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em
index beeb40c720..b292cd13fb 100644
--- a/ld/emultempl/armelf.em
+++ b/ld/emultempl/armelf.em
@@ -22,12 +22,14 @@
 # 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)
@@ -67,15 +69,19 @@ 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.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);
 
+      /* Don't attach the interworking stubs to a dynamic object, to
+	 an empty section, etc.  */
       if ((output_section->flags & SEC_HAS_CONTENTS) != 0
 	  && (i->flags & SEC_NEVER_LOAD) == 0
+	  && ! (i->owner->flags & DYNAMIC)
 	  && ! i->owner->output_has_begun)
 	{
 	  bfd_for_interwork = i->owner;
@@ -118,7 +124,6 @@ arm_elf_before_allocation (void)
     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 */
@@ -179,6 +184,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
@@ -187,6 +200,9 @@ EOF
 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
@@ -195,17 +211,22 @@ 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;
+      /* Only here for backwards compatibility.  */
       break;
 
     case OPTION_THUMB_ENTRY:
@@ -215,12 +236,25 @@ PARSE_AND_LIST_ARGS_CASES='
     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