bfd_section_* macros

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

diff --git a/ld/emultempl/m68hc1xelf.em b/ld/emultempl/m68hc1xelf.em
index 0dda5dd4a16df2cf64dca225b54907f23c90aec4..b63e4e92d97ff240188513f789cee6694aa7ecec 100644 (file)
--- a/ld/emultempl/m68hc1xelf.em
+++ b/ld/emultempl/m68hc1xelf.em
@@ -19,7 +19,7 @@
 # MA 02110-1301, USA.
 #
 
-# This file is sourced from elf32.em, and defines extra m68hc12-elf
+# This file is sourced from elf.em, and defines extra m68hc12-elf
 # and m68hc11-elf specific routines.  It is used to generate the
 # HC11/HC12 trampolines to call a far function by using a normal 'jsr/bsr'.
 #
@@ -212,10 +212,8 @@ hook_in_stub (struct hook_stub_info *info, lang_statement_union_type **lp)
 
        case lang_input_section_enum:
          if (l->input_section.section == info->input_section
-             || strcmp (bfd_get_section_name (l->input_section.section->owner,
-                                              l->input_section.section),
-                        bfd_get_section_name (info->input_section->owner,
-                                              info->input_section)) == 0)
+             || strcmp (bfd_section_name (l->input_section.section),
+                        bfd_section_name (info->input_section)) == 0)
            {
              /* We've found our section.  Insert the stub immediately
                 before its associated input section.  */
@@ -319,27 +317,6 @@ m68hc11elf_after_allocation (void)
   gld${EMULATION_NAME}_after_allocation ();
 }
 
-
-/* Avoid processing the fake stub_file in vercheck, stat_needed and
-   check_needed routines.  */
-
-static void (*real_func) (lang_input_statement_type *);
-
-static void m68hc11_for_each_input_file_wrapper (lang_input_statement_type *l)
-{
-  if (l != stub_file)
-    (*real_func) (l);
-}
-
-static void
-m68hc11_lang_for_each_input_file (void (*func) (lang_input_statement_type *))
-{
-  real_func = func;
-  lang_for_each_input_file (&m68hc11_for_each_input_file_wrapper);
-}
-
-#define lang_for_each_input_file m68hc11_lang_for_each_input_file
-
 EOF
 
 # Define some shell vars to insert bits of code into the standard elf