* ldemul.c (ldemul_add_options, ldemul_handle_option): New functions.

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

diff --git a/ld/emultempl/hppaelf.em b/ld/emultempl/hppaelf.em
index 394f28e1668cdb6d0c00ebd7e62e0bd11cb996ba..4e3b6b957f90bbff3e0a2d87aad37fd1ad9c2cc5 100644 (file)
--- a/ld/emultempl/hppaelf.em
+++ b/ld/emultempl/hppaelf.em
@@ -1,5 +1,5 @@
 # This shell script emits a C file. -*- C -*-
-#   Copyright 1991, 1993, 1994, 1997, 1999, 2000, 2001, 2002
+#   Copyright 1991, 1993, 1994, 1997, 1999, 2000, 2001, 2002, 2003
 #   Free Software Foundation, Inc.
 #
 # This file is part of GLD, the Gnu Linker.
@@ -27,7 +27,7 @@ cat >>e${EMULATION_NAME}.c <<EOF
 #include "ldctor.h"
 #include "elf32-hppa.h"
 
-static void hppaelf_after_parse PARAMS((void));
+static void hppaelf_after_parse PARAMS ((void));
 static void hppaelf_create_output_section_statements PARAMS ((void));
 static asection *hppaelf_add_stub_section
   PARAMS ((const char *, asection *));
@@ -60,7 +60,7 @@ hppaelf_after_parse ()
 {
   if (link_info.relocateable)
     lang_add_unique (".text");
-#if 0 /* enable this once we split millicode stuff from libgcc */
+#if 0 /* Enable this once we split millicode stuff from libgcc.  */
   else
     lang_add_input_file ("milli",
                         lang_input_file_is_l_enum,
@@ -99,16 +99,16 @@ struct hook_stub_info
 
 /* Traverse the linker tree to find the spot where the stub goes.  */
 
-static boolean hook_in_stub
+static bfd_boolean hook_in_stub
   PARAMS ((struct hook_stub_info *, lang_statement_union_type **));
 
-static boolean
+static bfd_boolean
 hook_in_stub (info, lp)
      struct hook_stub_info *info;
      lang_statement_union_type **lp;
 {
   lang_statement_union_type *l;
-  boolean ret;
+  bfd_boolean ret;
 
   for (; (l = *lp) != NULL; lp = &l->header.next)
     {
@@ -146,7 +146,7 @@ hook_in_stub (info, lp)
                 before its associated input section.  */
              *lp = info->add.head;
              *(info->add.tail) = l;
-             return true;
+             return TRUE;
            }
          break;
 
@@ -167,7 +167,7 @@ hook_in_stub (info, lp)
          break;
        }
     }
-  return false;
+  return FALSE;
 }
 
 
@@ -231,7 +231,7 @@ hppaelf_layout_sections_again ()
 
   /* Resize the sections.  */
   lang_size_sections (stat_ptr->head, abs_output_section,
-                     &stat_ptr->head, 0, (bfd_vma) 0, NULL);
+                     &stat_ptr->head, 0, (bfd_vma) 0, NULL, TRUE);
 
   /* Redo special stuff.  */
   ldemul_after_allocation ();
@@ -360,12 +360,8 @@ PARSE_AND_LIST_PROLOGUE='
 #define OPTION_STUBGROUP_SIZE          (OPTION_MULTI_SUBSPACE + 1)
 '
 
-# The options are repeated below so that no abbreviations are allowed.
-# Otherwise -s matches stub-group-size
 PARSE_AND_LIST_LONGOPTS='
   { "multi-subspace", no_argument, NULL, OPTION_MULTI_SUBSPACE },
-  { "multi-subspace", no_argument, NULL, OPTION_MULTI_SUBSPACE },
-  { "stub-group-size", required_argument, NULL, OPTION_STUBGROUP_SIZE },
   { "stub-group-size", required_argument, NULL, OPTION_STUBGROUP_SIZE },
 '