* emultempl/elf32.em (gld${EMULATION_NAME}_check_ld_so_conf): Replace

[deliverable/binutils-gdb.git] / ld / emultempl / armcoff.em

diff --git a/ld/emultempl/armcoff.em b/ld/emultempl/armcoff.em
index 6380e4b6ba3d4a4e61cf8330effac31bd9c27e78..20bff145c5e62a5648b4acbb24a4b38dfefc501c 100644 (file)
--- a/ld/emultempl/armcoff.em
+++ b/ld/emultempl/armcoff.em
@@ -5,7 +5,7 @@ fragment <<EOF
 
 /* emulate the original gld for the given ${EMULATION_NAME}
    Copyright 1991, 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-   2004, 2005, 2007 Free Software Foundation, Inc.
+   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
    Written by Steve Chamberlain steve@cygnus.com
 
    This file is part of the GNU Binutils.
@@ -70,8 +70,8 @@ gld${EMULATION_NAME}_add_options
 static void
 gld${EMULATION_NAME}_list_options (FILE *file)
 {
-  fprintf (file, _("  --support-old-code   Support interworking with old code\n"));
-  fprintf (file, _("  --thumb-entry=<sym>  Set the entry point to be Thumb symbol <sym>\n"));
+  fprintf (file, _("  --support-old-code          Support interworking with old code\n"));
+  fprintf (file, _("  --thumb-entry=<sym>         Set the entry point to be Thumb symbol <sym>\n"));
 }
 
 static bfd_boolean
@@ -133,7 +133,9 @@ gld${EMULATION_NAME}_before_allocation (void)
 static void
 gld${EMULATION_NAME}_after_open (void)
 {
-  if (strstr (bfd_get_target (output_bfd), "arm") == NULL)
+  after_open_default ();
+
+  if (strstr (bfd_get_target (link_info.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,
@@ -173,7 +175,7 @@ gld${EMULATION_NAME}_finish (void)
          /* 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,
+                + bfd_get_section_vma (link_info.output_bfd,
                                        h->u.def.section->output_section)
                 + h->u.def.section->output_offset);
 
@@ -192,7 +194,7 @@ gld${EMULATION_NAME}_finish (void)
          entry_symbol.name = buffer;
        }
       else
-       einfo (_("%P: warning: connot find thumb start symbol %s\n"),
+       einfo (_("%P: warning: cannot find thumb start symbol %s\n"),
               thumb_entry_symbol);
     }