2006-02-07 Paul Brook <paul@codesourcery.com>

[external/binutils.git] / ld / emultempl / armelf.em

diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em
index e40033f..bd74ab5 100644 (file)
--- a/ld/emultempl/armelf.em
+++ b/ld/emultempl/armelf.em
@@ -23,9 +23,11 @@
 # This file is sourced from elf32.em, and defines extra arm-elf
 # specific routines.
 #
-test -z $TARGET2_TYPE && TARGET2_TYPE="rel"
+test -z "$TARGET2_TYPE" && TARGET2_TYPE="rel"
 cat >>e${EMULATION_NAME}.c <<EOF
 
+#include "elf/arm.h"
+
 static char *thumb_entry_symbol = NULL;
 static bfd *bfd_for_interwork;
 static int byteswap_code = 0;
@@ -71,24 +73,27 @@ arm_elf_after_open (void)
 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)
+  if (statement->header.type == lang_input_section_enum)
     {
       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)
+      if (!((lang_input_statement_type *) i->owner->usrdata)->just_syms_flag
+         && (i->flags & SEC_EXCLUDE) == 0)
        {
-         bfd_for_interwork = i->owner;
-         bfd_for_interwork->output_has_begun = TRUE;
+         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;
+             bfd_for_interwork->output_has_begun = TRUE;
+           }
        }
     }
 }
@@ -147,11 +152,25 @@ arm_elf_finish (void)
   /* Call the elf32.em routine.  */
   gld${EMULATION_NAME}_finish ();
 
-  if (thumb_entry_symbol == NULL)
-    return;
+  if (thumb_entry_symbol)
+    {
+      h = bfd_link_hash_lookup (link_info.hash, thumb_entry_symbol,
+                               FALSE, FALSE, TRUE);
+    }
+  else
+    {
+      struct elf_link_hash_entry * eh;
+
+      if (!entry_symbol.name)
+       return;
+
+      h = bfd_link_hash_lookup (link_info.hash, entry_symbol.name,
+                               FALSE, FALSE, TRUE);
+      eh = (struct elf_link_hash_entry *)h;
+      if (!h || ELF_ST_TYPE(eh->type) != STT_ARM_TFUNC)
+       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
@@ -177,7 +196,8 @@ arm_elf_finish (void)
 
       sprintf_vma (buffer + 2, val);
 
-      if (entry_symbol.name != NULL && entry_from_cmdline)
+      if (thumb_entry_symbol != NULL && 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;