Changeset 609 for branches/GNU/src/binutils/ld/lexsup.c

Timestamp:

Aug 16, 2003, 6:59:22 PM (22 years ago)

Author:

bird

Message:

binutils v2.14 - offical sources.

File:

• branches/GNU/src/binutils/ld/lexsup.c (modified) (56 diffs, 1 prop)

branches/GNU/src/binutils/ld/lexsup.c

@@ -1 +1 @@
 /* Parse options for the GNU linker.
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001
+   2001, 2002, 2003
    Free Software Foundation, Inc.
 
-This file is part of GLD, the Gnu Linker.
-
-GLD is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GLD is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GLD; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+   This file is part of GLD, the Gnu Linker.
+
+   GLD is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   GLD is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GLD; see the file COPYING.  If not, write to the Free
+   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.  */
 
 #include "bfd.h"
@@ -26 +26 @@
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
+#include "safe-ctype.h"
 #include "getopt.h"
 #include "bfdlink.h"
@@ -34 +34 @@
 #include "ldexp.h"
 #include "ldlang.h"
-#include "ldgram.h"
+#include <ldgram.h>
 #include "ldlex.h"
 #include "ldfile.h"
@@ -54 +54 @@
 #endif
 
-/* Omit args to avoid the possibility of clashing with a system header
-   that might disagree about consts.  */
-unsigned long strtoul ();
-
 static int is_num PARAMS ((const char *, int, int, int));
-static void set_default_dirlist PARAMS ((char *dirlist_ptr));
-static void set_section_start PARAMS ((char *sect, char *valstr));
+static void set_default_dirlist PARAMS ((char *));
+static void set_section_start PARAMS ((char *, char *));
 static void help PARAMS ((void));
 
@@ -110 +106 @@
 #define OPTION_WARN_COMMON              (OPTION_VERSION_EXPORTS_SECTION + 1)
 #define OPTION_WARN_CONSTRUCTORS        (OPTION_WARN_COMMON + 1)
-#define OPTION_WARN_MULTIPLE_GP         (OPTION_WARN_CONSTRUCTORS + 1)
+#define OPTION_WARN_FATAL               (OPTION_WARN_CONSTRUCTORS + 1)
+#define OPTION_WARN_MULTIPLE_GP         (OPTION_WARN_FATAL + 1)
 #define OPTION_WARN_ONCE                (OPTION_WARN_MULTIPLE_GP + 1)
 #define OPTION_WARN_SECTION_ALIGN       (OPTION_WARN_ONCE + 1)
@@ -130 +127 @@
 #define OPTION_TARGET_HELP              (OPTION_UNIQUE + 1)
 #define OPTION_ALLOW_SHLIB_UNDEFINED    (OPTION_TARGET_HELP + 1)
+#define OPTION_NO_ALLOW_SHLIB_UNDEFINED (OPTION_ALLOW_SHLIB_UNDEFINED + 1)
+#define OPTION_ALLOW_MULTIPLE_DEFINITION (OPTION_NO_ALLOW_SHLIB_UNDEFINED + 1)
+#define OPTION_NO_UNDEFINED_VERSION     (OPTION_ALLOW_MULTIPLE_DEFINITION + 1)
+#define OPTION_DISCARD_NONE             (OPTION_NO_UNDEFINED_VERSION + 1)
+#define OPTION_SPARE_DYNAMIC_TAGS       (OPTION_DISCARD_NONE + 1)
+#define OPTION_NO_DEFINE_COMMON         (OPTION_SPARE_DYNAMIC_TAGS + 1)
+#define OPTION_NOSTDLIB                 (OPTION_NO_DEFINE_COMMON + 1)
+#define OPTION_NO_OMAGIC                (OPTION_NOSTDLIB + 1)
+#define OPTION_STRIP_DISCARDED          (OPTION_NO_OMAGIC + 1)
+#define OPTION_NO_STRIP_DISCARDED       (OPTION_STRIP_DISCARDED + 1)
+#define OPTION_ACCEPT_UNKNOWN_INPUT_ARCH    (OPTION_NO_STRIP_DISCARDED + 1)
+#define OPTION_NO_ACCEPT_UNKNOWN_INPUT_ARCH (OPTION_ACCEPT_UNKNOWN_INPUT_ARCH + 1)
 
 /* The long options.  This structure is used for both the option
@@ -200 +209 @@
   { {"soname", required_argument, NULL, OPTION_SONAME},
       'h', N_("FILENAME"), N_("Set internal name of shared library"), ONE_DASH },
+  { {"dynamic-linker", required_argument, NULL, OPTION_DYNAMIC_LINKER},
+      'I', N_("PROGRAM"), N_("Set PROGRAM as the dynamic linker to use"), TWO_DASHES },
   { {"library", required_argument, NULL, 'l'},
       'l', N_("LIBNAME"), N_("Search for library LIBNAME"), TWO_DASHES },
@@ -213 +224 @@
       'N', NULL, N_("Do not page align data, do not make text readonly"),
       EXACTLY_TWO_DASHES },
+  { {"no-omagic", no_argument, NULL, OPTION_NO_OMAGIC},
+      '\0', NULL, N_("Page align data, make text readonly"), EXACTLY_TWO_DASHES },
   { {"output", required_argument, NULL, 'o'},
       'o', N_("FILE"), N_("Set output file name"), EXACTLY_TWO_DASHES },
@@ -232 +245 @@
   { {"strip-debug", no_argument, NULL, 'S'},
       'S', NULL, N_("Strip debugging symbols"), TWO_DASHES },
+  { {"strip-discarded", no_argument, NULL, OPTION_STRIP_DISCARDED},
+      '\0', NULL, N_("Strip symbols in discarded sections"), TWO_DASHES },
+  { {"no-strip-discarded", no_argument, NULL, OPTION_NO_STRIP_DISCARDED},
+      '\0', NULL, N_("Do not strip symbols in discarded sections"), TWO_DASHES },
   { {"trace", no_argument, NULL, 't'},
       't', NULL, N_("Trace file opens"), TWO_DASHES },
@@ -249 +266 @@
       'x', NULL, N_("Discard all local symbols"), TWO_DASHES },
   { {"discard-locals", no_argument, NULL, 'X'},
-      'X', NULL, N_("Discard temporary local symbols"), TWO_DASHES },
+      'X', NULL, N_("Discard temporary local symbols (default)"), TWO_DASHES },
+  { {"discard-none", no_argument, NULL, OPTION_DISCARD_NONE},
+      '\0', NULL, N_("Don't discard any local symbols"), TWO_DASHES },
   { {"trace-symbol", required_argument, NULL, 'y'},
       'y', N_("SYMBOL"), N_("Trace mentions of SYMBOL"), TWO_DASHES },
@@ -258 +277 @@
   { {"end-group", no_argument, NULL, ')'},
       ')', NULL, N_("End a group"), TWO_DASHES },
+  { {"accept-unknown-input-arch", no_argument, NULL, OPTION_ACCEPT_UNKNOWN_INPUT_ARCH},
+    '\0', NULL, N_("Accept input files whose architecture cannot be determined"), TWO_DASHES },
+  { {"no-accept-unknown-input-arch", no_argument, NULL, OPTION_NO_ACCEPT_UNKNOWN_INPUT_ARCH},
+    '\0', NULL, N_("Reject input files whose architecture is unknown"), TWO_DASHES },
   { {"assert", required_argument, NULL, OPTION_ASSERT},
       '\0', N_("KEYWORD"), N_("Ignored for SunOS compatibility"), ONE_DASH },
@@ -287 +310 @@
   { {"demangle", optional_argument, NULL, OPTION_DEMANGLE},
       '\0', N_("[=STYLE]"), N_("Demangle symbol names [using STYLE]"), TWO_DASHES },
-  { {"dynamic-linker", required_argument, NULL, OPTION_DYNAMIC_LINKER},
-      '\0', N_("PROGRAM"), N_("Set the dynamic linker to use"), TWO_DASHES },
   { {"embedded-relocs", no_argument, NULL, OPTION_EMBEDDED_RELOCS},
       '\0', NULL, N_("Generate embedded relocs"), TWO_DASHES},
@@ -307 +328 @@
   { {"Map", required_argument, NULL, OPTION_MAP},
       '\0', N_("FILE"), N_("Write a map file"), ONE_DASH },
+  { {"no-define-common", no_argument, NULL, OPTION_NO_DEFINE_COMMON},
+      '\0', NULL, N_("Do not define Common storage"), TWO_DASHES },
   { {"no-demangle", no_argument, NULL, OPTION_NO_DEMANGLE },
       '\0', NULL, N_("Do not demangle symbol names"), TWO_DASHES },
@@ -314 +337 @@
      '\0', NULL, N_("Allow no undefined symbols"), TWO_DASHES },
   { {"allow-shlib-undefined", no_argument, NULL, OPTION_ALLOW_SHLIB_UNDEFINED},
-     '\0', NULL, N_("Allow undefined symbols in shared objects"), TWO_DASHES },
+     '\0', NULL, N_("Allow undefined symbols in shared objects (the default)"), TWO_DASHES },
+  { {"no-allow-shlib-undefined", no_argument, NULL, OPTION_NO_ALLOW_SHLIB_UNDEFINED},
+     '\0', NULL, N_("Do not allow undefined symbols in shared objects"), TWO_DASHES },
+  { {"allow-multiple-definition", no_argument, NULL, OPTION_ALLOW_MULTIPLE_DEFINITION},
+     '\0', NULL, N_("Allow multiple definitions"), TWO_DASHES },
+  { {"no-undefined-version", no_argument, NULL, OPTION_NO_UNDEFINED_VERSION},
+     '\0', NULL, N_("Disallow undefined version"), TWO_DASHES },
   { {"no-warn-mismatch", no_argument, NULL, OPTION_NO_WARN_MISMATCH},
       '\0', NULL, N_("Don't warn about mismatched input files"), TWO_DASHES},
@@ -323 +352 @@
   { {"noinhibit_exec", no_argument, NULL, OPTION_NOINHIBIT_EXEC},
       '\0', NULL, NULL, NO_HELP },
+  { {"nostdlib", no_argument, NULL, OPTION_NOSTDLIB},
+      '\0', NULL, N_("Only use library directories specified on\n\t\t\t\tthe command line"), ONE_DASH },
   { {"oformat", required_argument, NULL, OPTION_OFORMAT},
       '\0', N_("TARGET"), N_("Specify target of output file"), EXACTLY_TWO_DASHES },
@@ -344 +375 @@
   { {"sort_common", no_argument, NULL, OPTION_SORT_COMMON},
       '\0', NULL, NULL, NO_HELP },
+  { {"spare-dynamic-tags", required_argument, NULL, OPTION_SPARE_DYNAMIC_TAGS},
+      '\0', N_("COUNT"), N_("How many tags to reserve in .dynamic section"), TWO_DASHES },
   { {"split-by-file", optional_argument, NULL, OPTION_SPLIT_BY_FILE},
       '\0', N_("[=SIZE]"), N_("Split output sections every SIZE octets"), TWO_DASHES },
@@ -386 +419 @@
       '\0', NULL, N_("Warn if start of section changes due to alignment"),
       TWO_DASHES },
+  { {"fatal-warnings", no_argument, NULL, OPTION_WARN_FATAL},
+     '\0', NULL, N_("Treat warnings as errors"),
+     TWO_DASHES },
   { {"whole-archive", no_argument, NULL, OPTION_WHOLE_ARCHIVE},
       '\0', NULL, N_("Include all objects from following archives"), TWO_DASHES },
@@ -410 +446 @@
   for (; *string; ++string)
     {
-      if (! isdigit (*string))
+      if (! ISDIGIT (*string))
         {
           result = err;
@@ -432 +468 @@
   int ingroup = 0;
   char *default_dirlist = NULL;
-  char shortopts[OPTION_COUNT * 3 + 2];
-  struct option longopts[OPTION_COUNT + 1];
-  struct option really_longopts[OPTION_COUNT + 1];
+  char *shortopts;
+  struct option *longopts;
+  struct option *really_longopts;
   int last_optind;
+
+  shortopts = (char *) xmalloc (OPTION_COUNT * 3 + 2);
+  longopts = (struct option *) xmalloc (sizeof (*longopts)
+                                        * (OPTION_COUNT + 1));
+  really_longopts = (struct option *) xmalloc (sizeof (*really_longopts)
+                                               * (OPTION_COUNT + 1));
 
   /* Starting the short option string with '-' is for programs that
@@ -481 +523 @@
   really_longopts[irl].name = NULL;
 
+  ldemul_add_options (is, &shortopts, il, &longopts, irl, &really_longopts);
+
   /* The -G option is ambiguous on different platforms.  Sometimes it
      specifies the largest data size to put into the small data
@@ -495 +539 @@
     if (strcmp (argv[i], "-G") == 0
         && (i + 1 >= argc
-            || ! isdigit ((unsigned char) argv[i + 1][0])))
+            || ! ISDIGIT (argv[i + 1][0])))
       argv[i] = (char *) "--shared";
 
@@ -537 +581 @@
          loop around to pick up the -x.  */
       if (optind != last_optind)
-        {
-          if (ldemul_parse_args (argc, argv))
-            continue;
-          last_optind = optind;
-        }
+        if (ldemul_parse_args (argc, argv))
+          continue;
 
       /* getopt_long_only is like getopt_long, but '-' as well as '--'
          can indicate a long option.  */
       opterr = 0;
+      last_optind = optind;
       optc = getopt_long_only (argc, argv, shortopts, longopts, &longind);
       if (optc == '?')
         {
-          --optind;
-          optc = getopt_long (argc, argv, shortopts, really_longopts, &longind);
+          optind = last_optind;
+          optc = getopt_long (argc, argv, "-", really_longopts, &longind);
         }
+
+      if (ldemul_handle_option (optc))
+        continue;
 
       if (optc == -1)
@@ -559 +604 @@
         {
         case '?':
-          fprintf (stderr, _("%s: unrecognized option '%s'\n"),
-                   program_name, argv[optind - 1]);
+          einfo (_("%P: unrecognized option '%s'\n"), argv[last_optind]);
         default:
-          fprintf (stderr,
-                   _("%s: use the --help option for usage information\n"),
-                   program_name);
-          xexit (1);
+          einfo (_("%P%F: use the --help option for usage information\n"));
+
         case 1:                 /* File name.  */
           lang_add_input_file (optarg, lang_input_file_is_file_enum,
@@ -578 +620 @@
              currently support shared libraries on HP/UX anyhow.  */
           if (strcmp (optarg, "archive") == 0)
-            config.dynamic_link = false;
+            config.dynamic_link = FALSE;
           else if (strcmp (optarg, "shared") == 0
                    || strcmp (optarg, "default") == 0)
-            config.dynamic_link = true;
+            config.dynamic_link = TRUE;
           else
             einfo (_("%P%F: unrecognized -a option `%s'\n"), optarg);
@@ -610 +652 @@
           break;
         case OPTION_CALL_SHARED:
-          config.dynamic_link = true;
+          config.dynamic_link = TRUE;
           break;
         case OPTION_NON_SHARED:
-          config.dynamic_link = false;
+          config.dynamic_link = FALSE;
           break;
         case OPTION_CREF:
-          command_line.cref = true;
-          link_info.notice_all = true;
+          command_line.cref = TRUE;
+          link_info.notice_all = TRUE;
           break;
         case 'd':
-          command_line.force_common_definition = true;
+          command_line.force_common_definition = TRUE;
           break;
         case OPTION_DEFSYM:
@@ -632 +674 @@
           break;
         case OPTION_DEMANGLE:
-          demangling = true;
+          demangling = TRUE;
           if (optarg != NULL)
             {
@@ -645 +687 @@
             }
           break;
+        case 'I':               /* Used on Solaris.  */
         case OPTION_DYNAMIC_LINKER:
           command_line.interpreter = optarg;
@@ -655 +698 @@
           break;
         case OPTION_EMBEDDED_RELOCS:
-          command_line.embedded_relocs = true;
+          command_line.embedded_relocs = TRUE;
           break;
         case OPTION_EXPORT_DYNAMIC:
         case 'E': /* HP/UX compatibility.  */
-          command_line.export_dynamic = true;
+          link_info.export_dynamic = TRUE;
           break;
         case 'e':
-          lang_add_entry (optarg, true);
+          lang_add_entry (optarg, TRUE);
           break;
         case 'f':
@@ -691 +734 @@
           break;
         case OPTION_FORCE_EXE_SUFFIX:
-          command_line.force_exe_suffix = true;
+          command_line.force_exe_suffix = TRUE;
           break;
         case 'G':
@@ -705 +748 @@
           break;
         case OPTION_GC_SECTIONS:
-          command_line.gc_sections = true;
+          command_line.gc_sections = TRUE;
           break;
         case OPTION_HELP:
@@ -712 +755 @@
           break;
         case 'L':
-          ldfile_add_library_path (optarg, true);
+          ldfile_add_library_path (optarg, TRUE);
           break;
         case 'l':
@@ -728 +771 @@
           break;
         case 'N':
-          config.text_read_only = false;
-          config.magic_demand_paged = false;
-          config.dynamic_link = false;
+          config.text_read_only = FALSE;
+          config.magic_demand_paged = FALSE;
+          config.dynamic_link = FALSE;
+          break;
+        case OPTION_NO_OMAGIC:
+          config.text_read_only = TRUE;
+          config.magic_demand_paged = TRUE;
+          /* NB/ Does not set dynamic_link to TRUE.
+             Use --call-shared or -Bdynamic for this.  */
           break;
         case 'n':
-          config.magic_demand_paged = false;
-          config.dynamic_link = false;
+          config.magic_demand_paged = FALSE;
+          config.dynamic_link = FALSE;
+          break;
+        case OPTION_NO_DEFINE_COMMON:
+          command_line.inhibit_common_definition = TRUE;
           break;
         case OPTION_NO_DEMANGLE:
-          demangling = false;
+          demangling = FALSE;
           break;
         case OPTION_NO_GC_SECTIONS:
-          command_line.gc_sections = false;
+          command_line.gc_sections = FALSE;
           break;
         case OPTION_NO_KEEP_MEMORY:
-          link_info.keep_memory = false;
+          link_info.keep_memory = FALSE;
           break;
         case OPTION_NO_UNDEFINED:
-          link_info.no_undefined = true;
+          link_info.no_undefined = TRUE;
           break;
         case OPTION_ALLOW_SHLIB_UNDEFINED:
-          link_info.allow_shlib_undefined = true;
+          link_info.allow_shlib_undefined = TRUE;
+          break;
+        case OPTION_NO_ALLOW_SHLIB_UNDEFINED:
+          link_info.allow_shlib_undefined = FALSE;
+          break;
+        case OPTION_ALLOW_MULTIPLE_DEFINITION:
+          link_info.allow_multiple_definition = TRUE;
+          break;
+        case OPTION_NO_UNDEFINED_VERSION:
+          link_info.allow_undefined_version = FALSE;
           break;
         case OPTION_NO_WARN_MISMATCH:
-          command_line.warn_mismatch = false;
+          command_line.warn_mismatch = FALSE;
           break;
         case OPTION_NOINHIBIT_EXEC:
-          force_make_executable = true;
+          force_make_executable = TRUE;
+          break;
+        case OPTION_NOSTDLIB:
+          config.only_cmd_line_lib_dirs = TRUE;
           break;
         case OPTION_NO_WHOLE_ARCHIVE:
-          whole_archive = false;
+          whole_archive = FALSE;
           break;
         case 'O':
@@ -768 +832 @@
 
           /* Enable optimizations of output files.  */
-          link_info.optimize = strtoul (optarg, NULL, 0) ? true : false;
+          link_info.optimize = strtoul (optarg, NULL, 0) ? TRUE : FALSE;
           break;
         case 'o':
@@ -777 +841 @@
           break;
         case 'q':
-          link_info.emitrelocations = true;
+          link_info.emitrelocations = TRUE;
           break;
         case 'i':
         case 'r':
-          link_info.relocateable = true;
-          config.build_constructors = false;
-          config.magic_demand_paged = false;
-          config.text_read_only = false;
-          config.dynamic_link = false;
+          if (optind == last_optind)
+            /* This can happen if the user put "-rpath,a" on the command
+               line.  (Or something similar.  The comma is important).
+               Getopt becomes confused and thinks that this is a -r option
+               but it cannot parse the text after the -r so it refuses to
+               increment the optind counter.  Detect this case and issue
+               an error message here.  We cannot just make this a warning,
+               increment optind, and continue because getopt is too confused
+               and will seg-fault the next time around.  */
+            einfo(_("%P%F: bad -rpath option\n"));
+
+          link_info.relocateable = TRUE;
+          config.build_constructors = FALSE;
+          config.magic_demand_paged = FALSE;
+          config.text_read_only = FALSE;
+          config.dynamic_link = FALSE;
           break;
         case 'R':
@@ -822 +897 @@
                 {
                   size_t idx = 0;
+
                   while (optarg[idx] != '\0' && optarg[idx] == cp[idx])
                     ++idx;
@@ -861 +937 @@
           break;
         case OPTION_RELAX:
-          command_line.relax = true;
+          command_line.relax = TRUE;
           break;
         case OPTION_RETAIN_SYMBOLS_FILE:
@@ -872 +948 @@
           link_info.strip = strip_all;
           break;
+        case OPTION_STRIP_DISCARDED:
+          link_info.strip_discarded = TRUE;
+          break;
+        case OPTION_NO_STRIP_DISCARDED:
+          link_info.strip_discarded = FALSE;
+          break;
         case OPTION_SHARED:
           if (config.has_shared)
-            link_info.shared = true;
+            link_info.shared = TRUE;
           else
             einfo (_("%P%F: -shared not supported\n"));
@@ -883 +965 @@
           break;
         case OPTION_SORT_COMMON:
-          config.sort_common = true;
+          config.sort_common = TRUE;
           break;
         case OPTION_STATS:
-          config.stats = true;
+          config.stats = TRUE;
           break;
         case OPTION_SYMBOLIC:
-          link_info.symbolic = true;
+          link_info.symbolic = TRUE;
           break;
         case 't':
-          trace_files = true;
+          trace_files = TRUE;
           break;
         case 'T':
@@ -908 +990 @@
             optarg2 = strchr (optarg, '=');
             if (optarg2 == NULL)
-              {
-                fprintf (stderr,
-                         _("%s: Invalid argument to option \"--section-start\"\n"),
-                         program_name);
-                xexit (1);
-              }
+              einfo (_("%P%F: invalid argument to option \"--section-start\"\n"));
 
             optarg2++;
@@ -919 +996 @@
             /* So far so good.  Are all the args present?  */
             if ((*optarg == '\0') || (*optarg2 == '\0'))
-              {
-                fprintf (stderr,
-                         _("%s: Missing argument(s) to option \"--section-start\"\n"),
-                         program_name);
-                xexit (1);
-              }
+              einfo (_("%P%F: missing argument(s) to option \"--section-start\"\n"));
 
             /* We must copy the section name as set_section_start
@@ -939 +1011 @@
         case OPTION_TARGET_HELP:
           /* Mention any target specific options.  */
-          ldemul_list_emulation_options (stdout);
-          exit (0);
+          ldemul_list_emulation_options (stdout);
+          exit (0);
         case OPTION_TBSS:
           set_section_start (".bss", optarg);
@@ -951 +1023 @@
           break;
         case OPTION_TRADITIONAL_FORMAT:
-          link_info.traditional_format = true;
+          link_info.traditional_format = TRUE;
           break;
         case OPTION_TASK_LINK:
-          link_info.task_link = true;
+          link_info.task_link = TRUE;
           /* Fall through - do an implied -r option.  */
         case OPTION_UR:
-          link_info.relocateable = true;
-          config.build_constructors = true;
-          config.magic_demand_paged = false;
-          config.text_read_only = false;
-          config.dynamic_link = false;
+          link_info.relocateable = TRUE;
+          config.build_constructors = TRUE;
+          config.magic_demand_paged = FALSE;
+          config.text_read_only = FALSE;
+          config.dynamic_link = FALSE;
           break;
         case 'u':
@@ -970 +1042 @@
             lang_add_unique (optarg);
           else
-            config.unique_orphan_sections = true;
+            config.unique_orphan_sections = TRUE;
           break;
         case OPTION_VERBOSE:
           ldversion (1);
-          version_printed = true;
-          trace_file_tries = true;
+          version_printed = TRUE;
+          trace_file_tries = TRUE;
           break;
         case 'v':
           ldversion (0);
-          version_printed = true;
+          version_printed = TRUE;
           break;
         case 'V':
           ldversion (1);
-          version_printed = true;
+          version_printed = TRUE;
           break;
         case OPTION_VERSION:
-          /* This output is intended to follow the GNU standards document.  */
-          printf ("GNU ld %s\n", ld_program_version);
-          printf (_("Copyright 2001 Free Software Foundation, Inc.\n"));
-          printf (_("\
-This program is free software; you may redistribute it under the terms of\n\
-the GNU General Public License.  This program has absolutely no warranty.\n"));
-          {
-            ld_emulation_xfer_type **ptr = ld_emulations;
-
-            printf (_("  Supported emulations:\n"));
-            while (*ptr)
-              {
-                printf ("   %s\n", (*ptr)->emulation_name);
-                ptr++;
-              }
-          }
+          ldversion (2);
           xexit (0);
           break;
@@ -1009 +1066 @@
              we've seen a linker script.  */
           {
-            boolean hold_had_script;
-
-            hold_had_script = had_script;
+            FILE *hold_script_handle;
+
+            hold_script_handle = saved_script_handle;
             ldfile_open_command_file (optarg);
-            had_script = hold_had_script;
+            saved_script_handle = hold_script_handle;
             parser_input = input_version_script;
             yyparse ();
@@ -1025 +1082 @@
           break;
         case OPTION_WARN_COMMON:
-          config.warn_common = true;
+          config.warn_common = TRUE;
           break;
         case OPTION_WARN_CONSTRUCTORS:
-          config.warn_constructors = true;
+          config.warn_constructors = TRUE;
+          break;
+        case OPTION_WARN_FATAL:
+          config.fatal_warnings = TRUE;
           break;
         case OPTION_WARN_MULTIPLE_GP:
-          config.warn_multiple_gp = true;
+          config.warn_multiple_gp = TRUE;
           break;
         case OPTION_WARN_ONCE:
-          config.warn_once = true;
+          config.warn_once = TRUE;
           break;
         case OPTION_WARN_SECTION_ALIGN:
-          config.warn_section_align = true;
+          config.warn_section_align = TRUE;
           break;
         case OPTION_WHOLE_ARCHIVE:
-          whole_archive = true;
+          whole_archive = TRUE;
           break;
         case OPTION_WRAP:
           add_wrap (optarg);
+          break;
+        case OPTION_DISCARD_NONE:
+          link_info.discard = discard_none;
           break;
         case 'X':
@@ -1054 +1117 @@
           if (strncmp (optarg, "P,", 2) == 0)
             optarg += 2;
+          if (default_dirlist != NULL)
+            free (default_dirlist);
           default_dirlist = xstrdup (optarg);
           break;
         case 'y':
           add_ysym (optarg);
+          break;
+        case OPTION_SPARE_DYNAMIC_TAGS:
+          link_info.spare_dynamic_tags = strtoul (optarg, NULL, 0);
           break;
         case OPTION_SPLIT_BY_RELOC:
@@ -1072 +1140 @@
           break;
         case OPTION_CHECK_SECTIONS:
-          command_line.check_section_addresses = true;
+          command_line.check_section_addresses = TRUE;
           break;
         case OPTION_NO_CHECK_SECTIONS:
-          command_line.check_section_addresses = false;
+          command_line.check_section_addresses = FALSE;
+          break;
+        case OPTION_ACCEPT_UNKNOWN_INPUT_ARCH:
+          command_line.accept_unknown_input_arch = TRUE;
+          break;
+        case OPTION_NO_ACCEPT_UNKNOWN_INPUT_ARCH:
+          command_line.accept_unknown_input_arch = FALSE;
           break;
         case '(':
           if (ingroup)
-            {
-              fprintf (stderr,
-                       _("%s: may not nest groups (--help for usage)\n"),
-                       program_name);
-              xexit (1);
-            }
+            einfo (_("%P%F: may not nest groups (--help for usage)\n"));
+
           lang_enter_group ();
           ingroup = 1;
@@ -1090 +1160 @@
         case ')':
           if (! ingroup)
-            {
-              fprintf (stderr,
-                       _("%s: group ended before it began (--help for usage)\n"),
-                       program_name);
-              xexit (1);
-            }
+            einfo (_("%P%F: group ended before it began (--help for usage)\n"));
+
           lang_leave_group ();
           ingroup = 0;
           break;
         case OPTION_MPC860C0:
-          link_info.mpc860c0 = 20;      /* default value (in bytes) */
+          /* Default value (in bytes).  */
+          link_info.mpc860c0 = 20;
           if (optarg)
             {
@@ -1107 +1174 @@
               words = is_num (optarg, 1, 10, 0);
               if (words == 0)
-                {
-                  fprintf (stderr,
-                           _("%s: Invalid argument to option \"mpc860c0\"\n"),
-                           program_name);
-                  xexit (1);
-                }
-              link_info.mpc860c0 = words * 4;   /* convert words to bytes */
+                einfo (_("%P%F: invalid argument to option \"mpc860c0\"\n"));
+
+              /* Convert words to bytes.  */
+              link_info.mpc860c0 = words * 4;
             }
-          command_line.relax = true;
+          command_line.relax = TRUE;
           break;
 
@@ -1132 +1196 @@
 
   if (default_dirlist != NULL)
-    set_default_dirlist (default_dirlist);
-
+    {
+      set_default_dirlist (default_dirlist);
+      free (default_dirlist);
+    }
 }
 
@@ -1151 +1217 @@
         *p = '\0';
       if (*dirlist_ptr != '\0')
-        ldfile_add_library_path (dirlist_ptr, true);
+        ldfile_add_library_path (dirlist_ptr, TRUE);
       if (p == NULL)
         break;
@@ -1185 +1251 @@
       if (ld_options[i].doc != NULL)
         {
-          boolean comma;
+          bfd_boolean comma;
           int len;
           unsigned j;
@@ -1191 +1257 @@
           printf ("  ");
 
-          comma = false;
+          comma = FALSE;
           len = 2;
 
@@ -1212 +1278 @@
                       len += strlen (_(ld_options[j].arg));
                     }
-                  comma = true;
+                  comma = TRUE;
                 }
               ++j;
@@ -1227 +1293 @@
                     (ld_options[j].control == TWO_DASHES
                      || ld_options[j].control == EXACTLY_TWO_DASHES);
-                  
+
                   printf ("%s-%s%s",
                           comma ? ", " : "",
@@ -1241 +1307 @@
                       len += 1 + strlen (_(ld_options[j].arg));
                     }
-                  comma = true;
+                  comma = TRUE;
                 }
               ++j;