Changeset 618 for trunk/src/binutils/ld/ldmain.c

Timestamp:

Aug 16, 2003, 11:33:53 PM (22 years ago)

Author:

bird

Message:

Joined the port of 2.11.2 with 2.14.

File:

• trunk/src/binutils/ld/ldmain.c (modified) (75 diffs, 1 prop)

trunk/src/binutils/ld/ldmain.c

@@ -1 +1 @@
 /* Main program of GNU linker.
-   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+   2002, 2003
    Free Software Foundation, Inc.
    Written by Steve Chamberlain steve@cygnus.com
 
-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"
 #include "sysdep.h"
 #include <stdio.h>
-#include <ctype.h>
+#include "safe-ctype.h"
 #include "libiberty.h"
 #include "progress.h"
@@ -34 +35 @@
 #include "ldmisc.h"
 #include "ldwrite.h"
-#include "ldgram.h"
 #include "ldexp.h"
 #include "ldlang.h"
+#include <ldgram.h>
 #include "ldlex.h"
 #include "ldfile.h"
@@ -42 +43 @@
 #include "ldctor.h"
 
-/* Somewhere above, sys/stat.h got included . . . .  */
+/* Somewhere above, sys/stat.h got included.  */
 #if !defined(S_ISDIR) && defined(S_IFDIR)
 #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
@@ -55 +56 @@
 #endif
 
-static char *get_emulation PARAMS ((int, char **));
-static void set_scripts_dir PARAMS ((void));
+#ifndef TARGET_SYSTEM_ROOT
+#define TARGET_SYSTEM_ROOT ""
+#endif
+
+int main PARAMS ((int, char **));
 
 /* EXPORTS */
@@ -66 +70 @@
 char *program_name;
 
+/* The prefix for system library directories.  */
+char *ld_sysroot;
+
+/* The canonical representation of ld_sysroot.  */
+char * ld_canon_sysroot;
+int ld_canon_sysroot_len;
+
 /* The file that we're creating.  */
 bfd *output_bfd = 0;
@@ -73 +84 @@
 
 /* Nonzero means print names of input files as processed.  */
-boolean trace_files;
+bfd_boolean trace_files;
 
 /* Nonzero means same, but note open failures, too.  */
-boolean trace_file_tries;
+bfd_boolean trace_file_tries;
 
 /* Nonzero means version number was printed, so exit successfully
    instead of complaining if no input files are given.  */
-boolean version_printed;
+bfd_boolean version_printed;
 
 /* Nonzero means link in every member of an archive.  */
-boolean whole_archive;
-
-/* True if we should demangle symbol names.  */
-boolean demangling;
+bfd_boolean whole_archive;
+
+/* TRUE if we should demangle symbol names.  */
+bfd_boolean demangling;
 
 args_type command_line;
@@ -92 +103 @@
 ld_config_type config;
 
-static void remove_output PARAMS ((void));
-static boolean check_for_scripts_dir PARAMS ((char *dir));
-static boolean add_archive_element PARAMS ((struct bfd_link_info *, bfd *,
-                                            const char *));
-static boolean multiple_definition PARAMS ((struct bfd_link_info *,
-                                            const char *,
-                                            bfd *, asection *, bfd_vma,
-                                            bfd *, asection *, bfd_vma));
-static boolean multiple_common PARAMS ((struct bfd_link_info *,
-                                        const char *, bfd *,
-                                        enum bfd_link_hash_type, bfd_vma,
-                                        bfd *, enum bfd_link_hash_type,
-                                        bfd_vma));
-static boolean add_to_set PARAMS ((struct bfd_link_info *,
-                                   struct bfd_link_hash_entry *,
-                                   bfd_reloc_code_real_type,
-                                   bfd *, asection *, bfd_vma));
-static boolean constructor_callback PARAMS ((struct bfd_link_info *,
-                                             boolean constructor,
-                                             const char *name,
-                                             bfd *, asection *, bfd_vma));
-static boolean warning_callback PARAMS ((struct bfd_link_info *,
-                                         const char *, const char *, bfd *,
-                                         asection *, bfd_vma));
-static void warning_find_reloc PARAMS ((bfd *, asection *, PTR));
-static boolean undefined_symbol PARAMS ((struct bfd_link_info *,
-                                         const char *, bfd *,
-                                         asection *, bfd_vma, boolean));
-static boolean reloc_overflow PARAMS ((struct bfd_link_info *, const char *,
-                                       const char *, bfd_vma,
-                                       bfd *, asection *, bfd_vma));
-static boolean reloc_dangerous PARAMS ((struct bfd_link_info *, const char *,
-                                        bfd *, asection *, bfd_vma));
-static boolean unattached_reloc PARAMS ((struct bfd_link_info *,
-                                         const char *, bfd *, asection *,
-                                         bfd_vma));
-static boolean notice PARAMS ((struct bfd_link_info *, const char *,
-                               bfd *, asection *, bfd_vma));
-
-static struct bfd_link_callbacks link_callbacks = {
+static char *get_emulation
+  PARAMS ((int, char **));
+static void set_scripts_dir
+  PARAMS ((void));
+static void remove_output
+  PARAMS ((void));
+static bfd_boolean check_for_scripts_dir
+  PARAMS ((char *));
+static bfd_boolean add_archive_element
+  PARAMS ((struct bfd_link_info *, bfd *, const char *));
+static bfd_boolean multiple_definition
+  PARAMS ((struct bfd_link_info *, const char *, bfd *, asection *, bfd_vma,
+           bfd *, asection *, bfd_vma));
+static bfd_boolean multiple_common
+  PARAMS ((struct bfd_link_info *, const char *, bfd *,
+           enum bfd_link_hash_type, bfd_vma, bfd *, enum bfd_link_hash_type,
+           bfd_vma));
+static bfd_boolean add_to_set
+  PARAMS ((struct bfd_link_info *, struct bfd_link_hash_entry *,
+           bfd_reloc_code_real_type, bfd *, asection *, bfd_vma));
+static bfd_boolean constructor_callback
+  PARAMS ((struct bfd_link_info *, bfd_boolean, const char *, bfd *,
+           asection *, bfd_vma));
+static bfd_boolean warning_callback
+  PARAMS ((struct bfd_link_info *, const char *, const char *, bfd *,
+           asection *, bfd_vma));
+static void warning_find_reloc
+  PARAMS ((bfd *, asection *, PTR));
+static bfd_boolean undefined_symbol
+  PARAMS ((struct bfd_link_info *, const char *, bfd *, asection *, bfd_vma,
+           bfd_boolean));
+static bfd_boolean reloc_overflow
+  PARAMS ((struct bfd_link_info *, const char *, const char *, bfd_vma,
+           bfd *, asection *, bfd_vma));
+static bfd_boolean reloc_dangerous
+  PARAMS ((struct bfd_link_info *, const char *, bfd *, asection *, bfd_vma));
+static bfd_boolean unattached_reloc
+  PARAMS ((struct bfd_link_info *, const char *, bfd *, asection *, bfd_vma));
+static bfd_boolean notice
+  PARAMS ((struct bfd_link_info *, const char *, bfd *, asection *, bfd_vma));
+
+static struct bfd_link_callbacks link_callbacks =
+{
   add_archive_element,
   multiple_definition,
@@ -142 +156 @@
   reloc_dangerous,
   unattached_reloc,
-  notice
+  notice,
+  error_handler
 };
 
@@ -170 +185 @@
 #if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
   setlocale (LC_MESSAGES, "");
+#endif
+#if defined (HAVE_SETLOCALE)
+  setlocale (LC_CTYPE, "");
 #endif
   bindtextdomain (PACKAGE, LOCALEDIR);
@@ -190 +208 @@
   xatexit (remove_output);
 
+#ifdef TARGET_SYSTEM_ROOT_RELOCATABLE
+  ld_sysroot = make_relative_prefix (program_name, BINDIR,
+                                     TARGET_SYSTEM_ROOT);
+
+  if (ld_sysroot)
+    {
+      struct stat s;
+      int res = stat (ld_sysroot, &s) == 0 && S_ISDIR (s.st_mode);
+
+      if (!res)
+        {
+          free (ld_sysroot);
+          ld_sysroot = NULL;
+        }
+    }
+
+  if (! ld_sysroot)
+    {
+      ld_sysroot = make_relative_prefix (program_name, TOOLBINDIR,
+                                         TARGET_SYSTEM_ROOT);
+
+      if (ld_sysroot)
+        {
+          struct stat s;
+          int res = stat (ld_sysroot, &s) == 0 && S_ISDIR (s.st_mode);
+
+          if (!res)
+            {
+              free (ld_sysroot);
+              ld_sysroot = NULL;
+            }
+        }
+    }
+
+  if (! ld_sysroot)
+#endif
+    ld_sysroot = TARGET_SYSTEM_ROOT;
+
+  if (ld_sysroot && *ld_sysroot)
+    ld_canon_sysroot = lrealpath (ld_sysroot);
+
+  if (ld_canon_sysroot)
+    ld_canon_sysroot_len = strlen (ld_canon_sysroot);
+  else
+    ld_canon_sysroot_len = -1;
+
   /* Set the default BFD target based on the configured target.  Doing
      this permits the linker to be configured for a particular target,
@@ -200 +264 @@
     }
 
+#if YYDEBUG
+  {
+    extern int yydebug;
+    yydebug = 1;
+  }
+#endif
+
   /* Initialize the data about options.  */
-  trace_files = trace_file_tries = version_printed = false;
-  whole_archive = false;
-  config.build_constructors = true;
-  config.dynamic_link = false;
-  config.has_shared = false;
+  trace_files = trace_file_tries = version_printed = FALSE;
+  whole_archive = FALSE;
+  config.build_constructors = TRUE;
+  config.dynamic_link = FALSE;
+  config.has_shared = FALSE;
   config.split_by_reloc = (unsigned) -1;
   config.split_by_file = (bfd_size_type) -1;
-  command_line.force_common_definition = false;
+  command_line.force_common_definition = FALSE;
+  command_line.inhibit_common_definition = FALSE;
   command_line.interpreter = NULL;
   command_line.rpath = NULL;
-  command_line.warn_mismatch = true;
-  command_line.check_section_addresses = true;
+  command_line.warn_mismatch = TRUE;
+  command_line.check_section_addresses = TRUE;
+  command_line.accept_unknown_input_arch = FALSE;
 
   /* We initialize DEMANGLING based on the environment variable
@@ -221 +294 @@
   demangling = getenv ("COLLECT_NO_DEMANGLE") == NULL;
 
+  link_info.relocateable = FALSE;
+  link_info.emitrelocations = FALSE;
+  link_info.task_link = FALSE;
+  link_info.shared = FALSE;
+  link_info.symbolic = FALSE;
+  link_info.export_dynamic = FALSE;
+  link_info.static_link = FALSE;
+  link_info.traditional_format = FALSE;
+  link_info.optimize = FALSE;
+  link_info.no_undefined = FALSE;
+  link_info.allow_shlib_undefined = TRUE;
+  link_info.allow_multiple_definition = FALSE;
+  link_info.allow_undefined_version = TRUE;
+  link_info.keep_memory = TRUE;
+  link_info.notice_all = FALSE;
+  link_info.nocopyreloc = FALSE;
+  link_info.new_dtags = FALSE;
+  link_info.combreloc = TRUE;
+  link_info.eh_frame_hdr = FALSE;
+  link_info.strip_discarded = TRUE;
+  link_info.strip = strip_none;
+  link_info.discard = discard_sec_merge;
+  link_info.common_skip_ar_aymbols = bfd_link_common_skip_none;
   link_info.callbacks = &link_callbacks;
-  link_info.relocateable = false;
-  link_info.emitrelocations = false;
-  link_info.shared = false;
-  link_info.symbolic = false;
-  link_info.static_link = false;
-  link_info.traditional_format = false;
-  link_info.optimize = false;
-  link_info.no_undefined = false;
-  link_info.allow_shlib_undefined = false;
-  link_info.strip = strip_none;
-  link_info.discard = discard_none;
-  link_info.keep_memory = true;
+  link_info.hash = NULL;
+  link_info.keep_hash = NULL;
+  link_info.notice_hash = NULL;
+  link_info.wrap_hash = NULL;
   link_info.input_bfds = NULL;
   link_info.create_object_symbols_section = NULL;
-  link_info.hash = NULL;
-  link_info.keep_hash = NULL;
-  link_info.notice_all = false;
-  link_info.notice_hash = NULL;
-  link_info.wrap_hash = NULL;
-  link_info.mpc860c0 = 0;
+  link_info.gc_sym_list = NULL;
+  link_info.base_file = NULL;
   /* SVR4 linkers seem to set DT_INIT and DT_FINI based on magic _init
      and _fini symbols.  We are compatible.  */
   link_info.init_function = "_init";
   link_info.fini_function = "_fini";
-  link_info.new_dtags = false;
+  link_info.mpc860c0 = 0;
+  link_info.pei386_auto_import = -1;
+  link_info.pei386_runtime_pseudo_reloc = FALSE;
+  link_info.spare_dynamic_tags = 5;
   link_info.flags = (bfd_vma) 0;
   link_info.flags_1 = (bfd_vma) 0;
+  link_info.relax_finalizing = FALSE;
 
   ldfile_add_arch ("");
 
-  config.make_executable = true;
-  force_make_executable = false;
-  config.magic_demand_paged = true;
-  config.text_read_only = true;
+  config.make_executable = TRUE;
+  force_make_executable = FALSE;
+  config.magic_demand_paged = TRUE;
+  config.text_read_only = TRUE;
 
   emulation = get_emulation (argc, argv);
   ldemul_choose_mode (emulation);
-  default_target = ldemul_choose_target ();
+  default_target = ldemul_choose_target (argc, argv);
   lang_init ();
   ldemul_before_parse ();
-  lang_has_input_file = false;
+  lang_has_input_file = FALSE;
   parse_args (argc, argv);
 
@@ -279 +367 @@
     }
 
+  if (! link_info.shared)
+    {
+      if (command_line.filter_shlib)
+        einfo (_("%P%F: -F may not be used without -shared\n"));
+      if (command_line.auxiliary_filters)
+        einfo (_("%P%F: -f may not be used without -shared\n"));
+    }
+
   /* Treat ld -r -s as ld -r -S -x (i.e., strip all local symbols).  I
      don't see how else this can be handled, since in this case we
@@ -285 +381 @@
     {
       link_info.strip = strip_debugger;
-      if (link_info.discard == discard_none)
+      if (link_info.discard == discard_sec_merge)
         link_info.discard = discard_all;
     }
@@ -293 +389 @@
   set_scripts_dir ();
 
-  if (had_script == false)
-    {
-      /* Read the emulation's appropriate default script.  */
+  /* If we have not already opened and parsed a linker script
+     read the emulation's appropriate default script.  */
+  if (saved_script_handle == NULL)
+    {
       int isfile;
       char *s = ldemul_get_script (&isfile);
@@ -303 +400 @@
       else
         {
-          if (trace_file_tries)
-            {
-              info_msg (_("using internal linker script:\n"));
-              info_msg ("==================================================\n");
-              info_msg (s);
-              info_msg ("\n==================================================\n");
-            }
           lex_string = s;
           lex_redirect (s);
@@ -318 +408 @@
     }
 
+  if (trace_file_tries)
+    {
+      if (saved_script_handle)
+        info_msg (_("using external linker script:"));
+      else
+        info_msg (_("using internal linker script:"));
+      info_msg ("\n==================================================\n");
+
+      if (saved_script_handle)
+        {
+          static const int ld_bufsz = 8193;
+          size_t n;
+          char *buf = xmalloc (ld_bufsz);
+
+          rewind (saved_script_handle);
+          while ((n = fread (buf, 1, ld_bufsz - 1, saved_script_handle)) > 0)
+            {
+              buf[n] = 0;
+              info_msg (buf);
+            }
+          rewind (saved_script_handle);
+          free (buf);
+        }
+      else
+        {
+          int isfile;
+
+          info_msg (ldemul_get_script (&isfile));
+        }
+
+      info_msg ("\n==================================================\n");
+    }
+
   lang_final ();
 
-  if (lang_has_input_file == false)
+  if (!lang_has_input_file)
     {
       if (version_printed)
@@ -328 +451 @@
 
   if (trace_files)
-    {
-      info_msg (_("%P: mode %s\n"), emulation);
-    }
+    info_msg (_("%P: mode %s\n"), emulation);
 
   ldemul_after_parse ();
@@ -356 +477 @@
   /* Print error messages for any missing symbols, for any warning
      symbols, and possibly multiple definitions.  */
-
-  if (! link_info.relocateable)
-    {
-      /* Look for a text section and switch the readonly attribute in it.  */
-      asection *found = bfd_get_section_by_name (output_bfd, ".text");
-
-      if (found != (asection *) NULL)
-        {
-          if (config.text_read_only)
-            found->flags |= SEC_READONLY;
-          else
-            found->flags &= ~SEC_READONLY;
-        }
-    }
-
   if (link_info.relocateable)
     output_bfd->flags &= ~EXEC_P;
@@ -388 +494 @@
      be reported in the exit status.  (What non-fatal errors, if any, do we
      want to ignore for relocateable output?)  */
-
-  if (config.make_executable == false && force_make_executable == false)
-    {
-      if (trace_files == true)
-        {
-          einfo (_("%P: link errors found, deleting executable `%s'\n"),
-                 output_filename);
-        }
+  if (!config.make_executable && !force_make_executable)
+    {
+      if (trace_files)
+        einfo (_("%P: link errors found, deleting executable `%s'\n"),
+               output_filename);
 
       /* The file will be removed by remove_output.  */
-
       xexit (1);
     }
@@ -416 +518 @@
         {
           int len = strlen (output_filename);
+
           if (len < 4
               || (strcasecmp (output_filename + len - 4, ".exe") != 0
@@ -426 +529 @@
               int l;
               char *dst_name = xmalloc (len + 5);
+
               strcpy (dst_name, output_filename);
               strcat (dst_name, ".exe");
@@ -438 +542 @@
                 {
                   int done = fwrite (buf, 1, l, dst);
+
                   if (done != l)
-                    {
-                      einfo (_("%P: Error writing file `%s'\n"), dst_name);
-                    }
+                    einfo (_("%P: Error writing file `%s'\n"), dst_name);
                 }
+
               fclose (src);
               if (fclose (dst) == EOF)
-                {
-                  einfo (_("%P: Error closing file `%s'\n"), dst_name);
-                }
+                einfo (_("%P: Error closing file `%s'\n"), dst_name);
               free (dst_name);
               free (buf);
@@ -506 +608 @@
                 }
               else
-                {
-                  einfo (_("%P%F: missing argument to -m\n"));
-                }
+                einfo (_("%P%F: missing argument to -m\n"));
             }
           else if (strcmp (argv[i], "-mips1") == 0
                    || strcmp (argv[i], "-mips2") == 0
                    || strcmp (argv[i], "-mips3") == 0
-                   || strcmp (argv[i], "-mips4") == 0)
+                   || strcmp (argv[i], "-mips4") == 0
+                   || strcmp (argv[i], "-mips5") == 0
+                   || strcmp (argv[i], "-mips32") == 0
+                   || strcmp (argv[i], "-mips32r2") == 0
+                   || strcmp (argv[i], "-mips64") == 0)
             {
-              /* FIXME: The arguments -mips1, -mips2 and -mips3 are
+              /* FIXME: The arguments -mips1, -mips2, -mips3, etc. are
                  passed to the linker by some MIPS compilers.  They
                  generally tell the linker to use a slightly different
@@ -541 +645 @@
 
 /* If directory DIR contains an "ldscripts" subdirectory,
-   add DIR to the library search path and return true,
-   else return false.  */
-
-static boolean
+   add DIR to the library search path and return TRUE,
+   else return FALSE.  */
+
+static bfd_boolean
 check_for_scripts_dir (dir)
      char *dir;
@@ -551 +655 @@
   char *buf;
   struct stat s;
-  boolean res;
+  bfd_boolean res;
 
   dirlen = strlen (dir);
@@ -561 +665 @@
   free (buf);
   if (res)
-    ldfile_add_library_path (dir, false);
+    ldfile_add_library_path (dir, FALSE);
   return res;
 }
@@ -570 +674 @@
 
    SCRIPTDIR (passed from Makefile)
+             (adjusted according to the current location of the binary)
+   SCRIPTDIR (passed from Makefile)
    the dir where this program is (for using it from the build tree)
-   the dir where this program is/../lib (for installing the tool suite elsewhere) */
+   the dir where this program is/../lib
+             (for installing the tool suite elsewhere).  */
 
 static void
@@ -578 +685 @@
   char *end, *dir;
   size_t dirlen;
+  bfd_boolean found;
+
+  dir = make_relative_prefix (program_name, BINDIR, SCRIPTDIR);
+  if (dir)
+    {
+      found = check_for_scripts_dir (dir);
+      free (dir);
+      if (found)
+        return;
+    }
+
+  dir = make_relative_prefix (program_name, TOOLBINDIR, SCRIPTDIR);
+  if (dir)
+    {
+      found = check_for_scripts_dir (dir);
+      free (dir);
+      if (found)
+        return;
+    }
 
   if (check_for_scripts_dir (SCRIPTDIR))
@@ -589 +715 @@
     /* We could have \foo\bar, or /foo\bar.  */
     char *bslash = strrchr (program_name, '\\');
+
     if (end == NULL || (bslash != NULL && bslash > end))
       end = bslash;
@@ -595 +722 @@
 
   if (end == NULL)
-    {
-      /* Don't look for ldscripts in the current directory.  There is
-         too much potential for confusion.  */
-      return;
-    }
+    /* Don't look for ldscripts in the current directory.  There is
+       too much potential for confusion.  */
+    return;
 
   dirlen = end - program_name;
@@ -609 +734 @@
 
   if (check_for_scripts_dir (dir))
-    /* Don't free dir.  */
-    return;
+    {
+      free (dir);
+      return;
+    }
 
   /* Look for "ldscripts" in <the dir where our binary is>/../lib.  */
   strcpy (dir + dirlen, "/../lib");
-  if (check_for_scripts_dir (dir))
-    return;
-
-  /* Well, we tried.  */
+  check_for_scripts_dir (dir);
   free (dir);
 }
@@ -635 +759 @@
     }
 
-  if (bfd_hash_lookup (link_info.notice_hash, name, true, true)
+  if (bfd_hash_lookup (link_info.notice_hash, name, TRUE, TRUE)
       == (struct bfd_hash_entry *) NULL)
     einfo (_("%P%F: bfd_hash_lookup failed: %E\n"));
@@ -655 +779 @@
         einfo (_("%P%F: bfd_hash_table_init failed: %E\n"));
     }
-  if (bfd_hash_lookup (link_info.wrap_hash, name, true, true) == NULL)
+
+  if (bfd_hash_lookup (link_info.wrap_hash, name, TRUE, TRUE) == NULL)
     einfo (_("%P%F: bfd_hash_lookup failed: %E\n"));
 }
@@ -692 +817 @@
   while (c != EOF)
     {
-      while (isspace (c))
+      while (ISSPACE (c))
         c = getc (file);
 
@@ -699 +824 @@
           size_t len = 0;
 
-          while (! isspace (c) && c != EOF)
+          while (! ISSPACE (c) && c != EOF)
             {
               buf[len] = c;
@@ -713 +838 @@
           buf[len] = '\0';
 
-          if (bfd_hash_lookup (link_info.keep_hash, buf, true, true)
+          if (bfd_hash_lookup (link_info.keep_hash, buf, TRUE, TRUE)
               == (struct bfd_hash_entry *) NULL)
             einfo (_("%P%F: bfd_hash_lookup for insertion failed: %E\n"));
@@ -722 +847 @@
     einfo (_("%P: `-retain-symbols-file' overrides `-s' and `-S'\n"));
 
+  free (buf);
   link_info.strip = strip_some;
 }
@@ -731 +857 @@
    a link.  */
 
-static boolean
+static bfd_boolean
 add_archive_element (info, abfd, name)
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -746 +872 @@
   input->asymbols = NULL;
   input->next = NULL;
-  input->just_syms_flag = false;
-  input->loaded = false;
-  input->search_dirs_flag = false;
+  input->just_syms_flag = FALSE;
+  input->loaded = FALSE;
+  input->search_dirs_flag = FALSE;
 
   /* FIXME: The following fields are not set: header.next,
@@ -760 +886 @@
   if (config.map_file != (FILE *) NULL)
     {
-      static boolean header_printed;
+      static bfd_boolean header_printed;
       struct bfd_link_hash_entry *h;
       bfd *from;
       int len;
 
-      h = bfd_link_hash_lookup (link_info.hash, name, false, false, true);
+      h = bfd_link_hash_lookup (link_info.hash, name, FALSE, FALSE, TRUE);
 
       if (h == NULL)
@@ -797 +923 @@
           char buf[100];
 
-          sprintf (buf, "%-29s %s\n\n", _("Archive member included"),
-                   _("because of file (symbol)"));
+          sprintf (buf, _("Archive member included because of file (symbol)\n\n"));
           minfo ("%s", buf);
-          header_printed = true;
+          header_printed = TRUE;
         }
 
@@ -839 +964 @@
     info_msg ("%I\n", input);
 
-  return true;
+  return TRUE;
 }
 
@@ -845 +970 @@
    multiple times.  */
 
-static boolean
+static bfd_boolean
 multiple_definition (info, name, obfd, osec, oval, nbfd, nsec, nval)
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -867 +992 @@
           && ! bfd_is_abs_section (nsec)
           && bfd_is_abs_section (nsec->output_section)))
-    return true;
+    return TRUE;
 
   einfo (_("%X%C: multiple definition of `%T'\n"),
@@ -880 +1005 @@
     }
 
-  return true;
+  return TRUE;
 }
 
@@ -888 +1013 @@
    -warn-common was used.  */
 
-static boolean
+static bfd_boolean
 multiple_common (info, name, obfd, otype, osize, nbfd, ntype, nsize)
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -900 +1025 @@
 {
   if (! config.warn_common)
-    return true;
+    return TRUE;
 
   if (ntype == bfd_link_hash_defined
@@ -947 +1072 @@
     }
 
-  return true;
+  return TRUE;
 }
 
@@ -954 +1079 @@
    represent a value which should be added to the set.  */
 
-static boolean
+static bfd_boolean
 add_to_set (info, h, reloc, abfd, section, value)
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -968 +1093 @@
 
   if (! config.build_constructors)
-    return true;
+    return TRUE;
 
   ldctor_add_set_entry (h, reloc, (const char *) NULL, section, value);
@@ -981 +1106 @@
     }
 
-  return true;
+  return TRUE;
 }
 
@@ -989 +1114 @@
    adding an element to a set, but less general.  */
 
-static boolean
+static bfd_boolean
 constructor_callback (info, constructor, name, abfd, section, value)
      struct bfd_link_info *info;
-     boolean constructor;
+     bfd_boolean constructor;
      const char *name;
      bfd *abfd;
@@ -1006 +1131 @@
 
   if (! config.build_constructors)
-    return true;
+    return TRUE;
 
   /* Ensure that BFD_RELOC_CTOR exists now, so that we can give a
@@ -1023 +1148 @@
     strcpy (s, "__DTOR_LIST__");
 
-  h = bfd_link_hash_lookup (info->hash, set_name, true, true, true);
+  h = bfd_link_hash_lookup (info->hash, set_name, TRUE, TRUE, TRUE);
   if (h == (struct bfd_link_hash_entry *) NULL)
     einfo (_("%P%F: bfd_link_hash_lookup failed: %E\n"));
@@ -1036 +1161 @@
 
   ldctor_add_set_entry (h, BFD_RELOC_CTOR, name, section, value);
-  return true;
+  return TRUE;
 }
 
@@ -1042 +1167 @@
    bfd_map_over_sections.  */
 
-struct warning_callback_info {
-  boolean found;
+struct warning_callback_info
+{
+  bfd_boolean found;
   const char *warning;
   const char *symbol;
@@ -1051 +1177 @@
 /* This is called when there is a reference to a warning symbol.  */
 
-static boolean
+static bfd_boolean
 warning_callback (info, warning, symbol, abfd, section, address)
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -1064 +1190 @@
   if (! config.warn_multiple_gp
       && strcmp (warning, "using multiple gp values") == 0)
-    return true;
+    return TRUE;
 
   if (section != NULL)
@@ -1080 +1206 @@
       /* Look through the relocs to see if we can find a plausible
          address.  */
-
       entry = (lang_input_statement_type *) abfd->usrdata;
       if (entry != NULL && entry->asymbols != NULL)
@@ -1103 +1228 @@
         }
 
-      info.found = false;
+      info.found = FALSE;
       info.warning = warning;
       info.symbol = symbol;
@@ -1116 +1241 @@
     }
 
-  return true;
+  return TRUE;
 }
 
@@ -1162 +1287 @@
           /* We found a reloc for the symbol we are looking for.  */
           einfo ("%C: %s\n", abfd, sec, q->address, info->warning);
-          info->found = true;
+          info->found = TRUE;
           break;
         }
@@ -1172 +1297 @@
 /* This is called when an undefined symbol is found.  */
 
-static boolean
+static bfd_boolean
 undefined_symbol (info, name, abfd, section, address, fatal)
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -1179 +1304 @@
      asection *section;
      bfd_vma address;
-     boolean fatal ATTRIBUTE_UNUSED;
+     bfd_boolean fatal ATTRIBUTE_UNUSED;
 {
   static char *error_name;
@@ -1191 +1316 @@
 
       /* Only warn once about a particular undefined symbol.  */
-
       if (hash == NULL)
         {
@@ -1200 +1324 @@
         }
 
-      if (bfd_hash_lookup (hash, name, false, false) != NULL)
-        return true;
-
-      if (bfd_hash_lookup (hash, name, true, true) == NULL)
+      if (bfd_hash_lookup (hash, name, FALSE, FALSE) != NULL)
+        return TRUE;
+
+      if (bfd_hash_lookup (hash, name, TRUE, TRUE) == NULL)
         einfo (_("%F%P: bfd_hash_lookup failed: %E\n"));
     }
@@ -1247 +1371 @@
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This is called when a reloc overflows.  */
 
-static boolean
+static bfd_boolean
 reloc_overflow (info, name, reloc_name, addend, abfd, section, address)
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -1270 +1394 @@
     einfo ("+%v", addend);
   einfo ("\n");
-  return true;
+  return TRUE;
 }
 
 /* This is called when a dangerous relocation is made.  */
 
-static boolean
+static bfd_boolean
 reloc_dangerous (info, message, abfd, section, address)
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -1288 +1412 @@
     einfo ("%X%C:", abfd, section, address);
   einfo (_("dangerous relocation: %s\n"), message);
-  return true;
+  return TRUE;
 }
 
@@ -1294 +1418 @@
    that is not being output.  */
 
-static boolean
+static bfd_boolean
 unattached_reloc (info, name, abfd, section, address)
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@ -1307 +1431 @@
     einfo ("%X%C:", abfd, section, address);
   einfo (_(" reloc refers to symbol `%T' which is not being output\n"), name);
-  return true;
+  return TRUE;
 }
 
@@ -1314 +1438 @@
    using the -y option.  */
 
-static boolean
+static bfd_boolean
 notice (info, name, abfd, section, value)
      struct bfd_link_info *info;
@@ -1324 +1448 @@
   if (! info->notice_all
       || (info->notice_hash != NULL
-          && bfd_hash_lookup (info->notice_hash, name, false, false) != NULL))
+          && bfd_hash_lookup (info->notice_hash, name, FALSE, FALSE) != NULL))
     {
       if (bfd_is_und_section (section))
@@ -1335 +1459 @@
     add_cref (name, abfd, section, value);
 
-  return true;
-}
+  return TRUE;
+}