Automatic date update in version.in

[platform/upstream/binutils.git] / bfd / opncls.c

diff --git a/bfd/opncls.c b/bfd/opncls.c
index 34b39ae..75af627 100644 (file)
--- a/bfd/opncls.c
+++ b/bfd/opncls.c
@@ -1,7 +1,5 @@
 /* opncls.c -- open and close a BFD.
 /* opncls.c -- open and close a BFD.

-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
-   2001, 2002, 2003
-   Free Software Foundation, Inc.
+   Copyright (C) 1990-2014 Free Software Foundation, Inc.

 
    Written by Cygnus Support.
 
 
    Written by Cygnus Support.
 


@@ -9,7 +7,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program 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 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -19,10 +17,11 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software

-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */

 
 

-#include "bfd.h"

 #include "sysdep.h"
 #include "sysdep.h"

+#include "bfd.h"

 #include "objalloc.h"
 #include "libbfd.h"
 #include "libiberty.h"
 #include "objalloc.h"
 #include "libbfd.h"
 #include "libiberty.h"


@@ -37,9 +36,17 @@
 #define S_IXOTH 0001   /* Execute by others.  */
 #endif
 
 #define S_IXOTH 0001   /* Execute by others.  */
 #endif
 

-/* Counter used to initialize the bfd identifier.  */
+/* Counters used to initialize the bfd identifier.  */

 
 

-static unsigned int _bfd_id_counter = 0;
+static unsigned int bfd_id_counter = 0;
+static unsigned int bfd_reserved_id_counter = 0;
+
+/*
+CODE_FRAGMENT
+.{* Set to N to open the next N BFDs using an alternate id space.  *}
+.extern unsigned int bfd_use_reserved_id;
+*/
+unsigned int bfd_use_reserved_id = 0;

 
 /* fdopen is a loser -- we should use stdio exclusively.  Unfortunately
    if we do that we can't use fcntl.  */
 
 /* fdopen is a loser -- we should use stdio exclusively.  Unfortunately
    if we do that we can't use fcntl.  */


@@ -51,11 +58,17 @@ _bfd_new_bfd (void)
 {
   bfd *nbfd;
 
 {
   bfd *nbfd;
 

-  nbfd = bfd_zmalloc (sizeof (bfd));
+  nbfd = (bfd *) bfd_zmalloc (sizeof (bfd));

   if (nbfd == NULL)
     return NULL;
 
   if (nbfd == NULL)
     return NULL;
 

-  nbfd->id = _bfd_id_counter++;
+  if (bfd_use_reserved_id)
+    {
+      nbfd->id = --bfd_reserved_id_counter;
+      --bfd_use_reserved_id;
+    }
+  else
+    nbfd->id = bfd_id_counter++;

 
   nbfd->memory = objalloc_create ();
   if (nbfd->memory == NULL)
 
   nbfd->memory = objalloc_create ();
   if (nbfd->memory == NULL)


@@ -67,32 +80,18 @@ _bfd_new_bfd (void)
 
   nbfd->arch_info = &bfd_default_arch_struct;
 
 
   nbfd->arch_info = &bfd_default_arch_struct;
 

-  nbfd->direction = no_direction;
-  nbfd->iostream = NULL;
-  nbfd->where = 0;
-  if (!bfd_hash_table_init_n (&nbfd->section_htab,
-                             bfd_section_hash_newfunc,
-                             251))
+  if (!bfd_hash_table_init_n (& nbfd->section_htab, bfd_section_hash_newfunc,
+                             sizeof (struct section_hash_entry), 13))

     {
       free (nbfd);
       return NULL;
     }
     {
       free (nbfd);
       return NULL;
     }

-  nbfd->sections = NULL;
-  nbfd->section_tail = &nbfd->sections;
-  nbfd->format = bfd_unknown;
-  nbfd->my_archive = NULL;
-  nbfd->origin = 0;
-  nbfd->opened_once = FALSE;
-  nbfd->output_has_begun = FALSE;
-  nbfd->section_count = 0;
-  nbfd->usrdata = NULL;
-  nbfd->cacheable = FALSE;
-  nbfd->flags = BFD_NO_FLAGS;
-  nbfd->mtime_set = FALSE;

 
   return nbfd;
 }
 
 
   return nbfd;
 }
 

+static const struct bfd_iovec opncls_iovec;
+

 /* Allocate a new BFD as a member of archive OBFD.  */
 
 bfd *
 /* Allocate a new BFD as a member of archive OBFD.  */
 
 bfd *


@@ -104,6 +103,9 @@ _bfd_new_bfd_contained_in (bfd *obfd)
   if (nbfd == NULL)
     return NULL;
   nbfd->xvec = obfd->xvec;
   if (nbfd == NULL)
     return NULL;
   nbfd->xvec = obfd->xvec;

+  nbfd->iovec = obfd->iovec;
+  if (obfd->iovec == &opncls_iovec)
+    nbfd->iostream = obfd->iostream;

   nbfd->my_archive = obfd;
   nbfd->direction = read_direction;
   nbfd->target_defaulted = obfd->target_defaulted;
   nbfd->my_archive = obfd;
   nbfd->direction = read_direction;
   nbfd->target_defaulted = obfd->target_defaulted;


@@ -112,70 +114,177 @@ _bfd_new_bfd_contained_in (bfd *obfd)
 
 /* Delete a BFD.  */
 
 
 /* Delete a BFD.  */
 

-void
+static void

 _bfd_delete_bfd (bfd *abfd)
 {
 _bfd_delete_bfd (bfd *abfd)
 {

-  bfd_hash_table_free (&abfd->section_htab);
-  objalloc_free ((struct objalloc *) abfd->memory);
+  if (abfd->memory)
+    {
+      bfd_hash_table_free (&abfd->section_htab);
+      objalloc_free ((struct objalloc *) abfd->memory);
+    }
+
+  if (abfd->filename)
+    free ((char *) abfd->filename);
+  free (abfd->arelt_data);

   free (abfd);
 }
 
   free (abfd);
 }
 

+/* Free objalloc memory.  */
+
+bfd_boolean
+_bfd_free_cached_info (bfd *abfd)
+{
+  if (abfd->memory)
+    {
+      bfd_hash_table_free (&abfd->section_htab);
+      objalloc_free ((struct objalloc *) abfd->memory);
+
+      abfd->sections = NULL;
+      abfd->section_last = NULL;
+      abfd->outsymbols = NULL;
+      abfd->tdata.any = NULL;
+      abfd->usrdata = NULL;
+      abfd->memory = NULL;
+    }
+
+  return TRUE;
+}
+

 /*
 SECTION
        Opening and closing BFDs
 
 /*
 SECTION
        Opening and closing BFDs
 

+SUBSECTION
+       Functions for opening and closing

 */
 
 /*
 FUNCTION
 */
 
 /*
 FUNCTION

-       bfd_openr
+       bfd_fopen

 
 SYNOPSIS
 
 SYNOPSIS

-       bfd *bfd_openr (const char *filename, const char *target);
+       bfd *bfd_fopen (const char *filename, const char *target,
+                        const char *mode, int fd);

 
 DESCRIPTION
 
 DESCRIPTION

-       Open the file @var{filename} (using <<fopen>>) with the target
-       @var{target}.  Return a pointer to the created BFD.
+       Open the file @var{filename} with the target @var{target}.
+       Return a pointer to the created BFD.  If @var{fd} is not -1,
+       then <<fdopen>> is used to open the file; otherwise, <<fopen>>
+       is used.  @var{mode} is passed directly to <<fopen>> or
+       <<fdopen>>.

 
        Calls <<bfd_find_target>>, so @var{target} is interpreted as by
        that function.
 
 
        Calls <<bfd_find_target>>, so @var{target} is interpreted as by
        that function.
 

+       The new BFD is marked as cacheable iff @var{fd} is -1.
+

        If <<NULL>> is returned then an error has occured.   Possible errors
        are <<bfd_error_no_memory>>, <<bfd_error_invalid_target>> or
        <<system_call>> error.
        If <<NULL>> is returned then an error has occured.   Possible errors
        are <<bfd_error_no_memory>>, <<bfd_error_invalid_target>> or
        <<system_call>> error.

+
+       On error, @var{fd} is always closed.
+
+       A copy of the @var{filename} argument is stored in the newly created
+       BFD.  It can be accessed via the bfd_get_filename() macro.

 */
 
 bfd *
 */
 
 bfd *

-bfd_openr (const char *filename, const char *target)
+bfd_fopen (const char *filename, const char *target, const char *mode, int fd)

 {
   bfd *nbfd;
   const bfd_target *target_vec;
 
   nbfd = _bfd_new_bfd ();
   if (nbfd == NULL)
 {
   bfd *nbfd;
   const bfd_target *target_vec;
 
   nbfd = _bfd_new_bfd ();
   if (nbfd == NULL)

-    return NULL;
+    {
+      if (fd != -1)
+       close (fd);
+      return NULL;
+    }

 
   target_vec = bfd_find_target (target, nbfd);
   if (target_vec == NULL)
     {
 
   target_vec = bfd_find_target (target, nbfd);
   if (target_vec == NULL)
     {

+      if (fd != -1)
+       close (fd);

       _bfd_delete_bfd (nbfd);
       return NULL;
     }
 
       _bfd_delete_bfd (nbfd);
       return NULL;
     }
 

-  nbfd->filename = filename;
-  nbfd->direction = read_direction;
-
-  if (bfd_open_file (nbfd) == NULL)
+#ifdef HAVE_FDOPEN
+  if (fd != -1)
+    nbfd->iostream = fdopen (fd, mode);
+  else
+#endif
+    nbfd->iostream = real_fopen (filename, mode);
+  if (nbfd->iostream == NULL)

     {
     {

-      /* File didn't exist, or some such.  */

       bfd_set_error (bfd_error_system_call);
       _bfd_delete_bfd (nbfd);
       return NULL;
     }
 
       bfd_set_error (bfd_error_system_call);
       _bfd_delete_bfd (nbfd);
       return NULL;
     }
 

+  /* OK, put everything where it belongs.  */
+
+  /* PR 11983: Do not cache the original filename, but
+     rather make a copy - the original might go away.  */
+  nbfd->filename = xstrdup (filename);
+
+  /* Figure out whether the user is opening the file for reading,
+     writing, or both, by looking at the MODE argument.  */
+  if ((mode[0] == 'r' || mode[0] == 'w' || mode[0] == 'a')
+      && mode[1] == '+')
+    nbfd->direction = both_direction;
+  else if (mode[0] == 'r')
+    nbfd->direction = read_direction;
+  else
+    nbfd->direction = write_direction;
+
+  if (! bfd_cache_init (nbfd))
+    {
+      _bfd_delete_bfd (nbfd);
+      return NULL;
+    }
+  nbfd->opened_once = TRUE;
+
+  /* If we opened the file by name, mark it cacheable; we can close it
+     and reopen it later.  However, if a file descriptor was provided,
+     then it may have been opened with special flags that make it
+     unsafe to close and reopen the file.  */
+  if (fd == -1)
+    (void) bfd_set_cacheable (nbfd, TRUE);
+

   return nbfd;
 }
 
   return nbfd;
 }
 

+/*
+FUNCTION
+       bfd_openr
+
+SYNOPSIS
+       bfd *bfd_openr (const char *filename, const char *target);
+
+DESCRIPTION
+       Open the file @var{filename} (using <<fopen>>) with the target
+       @var{target}.  Return a pointer to the created BFD.
+
+       Calls <<bfd_find_target>>, so @var{target} is interpreted as by
+       that function.
+
+       If <<NULL>> is returned then an error has occured.   Possible errors
+       are <<bfd_error_no_memory>>, <<bfd_error_invalid_target>> or
+       <<system_call>> error.
+
+       A copy of the @var{filename} argument is stored in the newly created
+       BFD.  It can be accessed via the bfd_get_filename() macro.
+*/
+
+bfd *
+bfd_openr (const char *filename, const char *target)
+{
+  return bfd_fopen (filename, target, FOPEN_RB, -1);
+}
+

 /* Don't try to `optimize' this function:
 
    o - We lock using stack space so that interrupting the locking
 /* Don't try to `optimize' this function:
 
    o - We lock using stack space so that interrupting the locking


@@ -201,104 +310,271 @@ DESCRIPTION
        descriptors for other opens), with the supplied @var{fd} used as
        an initial file descriptor (but subject to closure at any time),
        call bfd_set_cacheable(bfd, 1) on the returned BFD.  The default
        descriptors for other opens), with the supplied @var{fd} used as
        an initial file descriptor (but subject to closure at any time),
        call bfd_set_cacheable(bfd, 1) on the returned BFD.  The default

-       is to assume no cacheing; the file descriptor will remain open
+       is to assume no caching; the file descriptor will remain open

        until <<bfd_close>>, and will not be affected by BFD operations
        on other files.
 
        Possible errors are <<bfd_error_no_memory>>,
        <<bfd_error_invalid_target>> and <<bfd_error_system_call>>.
        until <<bfd_close>>, and will not be affected by BFD operations
        on other files.
 
        Possible errors are <<bfd_error_no_memory>>,
        <<bfd_error_invalid_target>> and <<bfd_error_system_call>>.

+
+       On error, @var{fd} is closed.
+
+       A copy of the @var{filename} argument is stored in the newly created
+       BFD.  It can be accessed via the bfd_get_filename() macro.

 */
 
 bfd *
 bfd_fdopenr (const char *filename, const char *target, int fd)
 {
 */
 
 bfd *
 bfd_fdopenr (const char *filename, const char *target, int fd)
 {

-  bfd *nbfd;
-  const bfd_target *target_vec;
+  const char *mode;
+#if defined(HAVE_FCNTL) && defined(F_GETFL)

   int fdflags;
   int fdflags;

+#endif

 
 

-  bfd_set_error (bfd_error_system_call);

 #if ! defined(HAVE_FCNTL) || ! defined(F_GETFL)
 #if ! defined(HAVE_FCNTL) || ! defined(F_GETFL)

-  fdflags = O_RDWR;                    /* Assume full access.  */
+  mode = FOPEN_RUB; /* Assume full access.  */

 #else
   fdflags = fcntl (fd, F_GETFL, NULL);
 #else
   fdflags = fcntl (fd, F_GETFL, NULL);

-#endif

   if (fdflags == -1)
   if (fdflags == -1)

-    return NULL;
-
-  nbfd = _bfd_new_bfd ();
-  if (nbfd == NULL)
-    return NULL;
-
-  target_vec = bfd_find_target (target, nbfd);
-  if (target_vec == NULL)

     {
     {

-      _bfd_delete_bfd (nbfd);
+      int save = errno;
+
+      close (fd);
+      errno = save;
+      bfd_set_error (bfd_error_system_call);

       return NULL;
     }
 
       return NULL;
     }
 

-#ifndef HAVE_FDOPEN
-  nbfd->iostream = fopen (filename, FOPEN_RB);
-#else

   /* (O_ACCMODE) parens are to avoid Ultrix header file bug.  */
   switch (fdflags & (O_ACCMODE))
     {
   /* (O_ACCMODE) parens are to avoid Ultrix header file bug.  */
   switch (fdflags & (O_ACCMODE))
     {

-    case O_RDONLY: nbfd->iostream = fdopen (fd, FOPEN_RB);   break;
-    case O_WRONLY: nbfd->iostream = fdopen (fd, FOPEN_RUB);  break;
-    case O_RDWR:   nbfd->iostream = fdopen (fd, FOPEN_RUB);  break;
+    case O_RDONLY: mode = FOPEN_RB; break;
+    case O_WRONLY: mode = FOPEN_RUB; break;
+    case O_RDWR:   mode = FOPEN_RUB; break;

     default: abort ();
     }
 #endif
 
     default: abort ();
     }
 #endif
 

-  if (nbfd->iostream == NULL)
+  return bfd_fopen (filename, target, mode, fd);
+}
+
+/*
+FUNCTION
+       bfd_openstreamr
+
+SYNOPSIS
+       bfd *bfd_openstreamr (const char * filename, const char * target, void * stream);
+
+DESCRIPTION
+
+       Open a BFD for read access on an existing stdio stream.  When
+       the BFD is passed to <<bfd_close>>, the stream will be closed.
+
+       A copy of the @var{filename} argument is stored in the newly created
+       BFD.  It can be accessed via the bfd_get_filename() macro.
+*/
+
+bfd *
+bfd_openstreamr (const char *filename, const char *target, void *streamarg)
+{
+  FILE *stream = (FILE *) streamarg;
+  bfd *nbfd;
+  const bfd_target *target_vec;
+
+  nbfd = _bfd_new_bfd ();
+  if (nbfd == NULL)
+    return NULL;
+
+  target_vec = bfd_find_target (target, nbfd);
+  if (target_vec == NULL)

     {
       _bfd_delete_bfd (nbfd);
       return NULL;
     }
 
     {
       _bfd_delete_bfd (nbfd);
       return NULL;
     }
 

-  /* OK, put everything where it belongs.  */
-  nbfd->filename = filename;
-
-  /* As a special case we allow a FD open for read/write to
-     be written through, although doing so requires that we end
-     the previous clause with a preposition.  */
-  /* (O_ACCMODE) parens are to avoid Ultrix header file bug.  */
-  switch (fdflags & (O_ACCMODE))
-    {
-    case O_RDONLY: nbfd->direction = read_direction; break;
-    case O_WRONLY: nbfd->direction = write_direction; break;
-    case O_RDWR: nbfd->direction = both_direction; break;
-    default: abort ();
-    }
+  nbfd->iostream = stream;
+  /* PR 11983: Do not cache the original filename, but
+     rather make a copy - the original might go away.  */
+  nbfd->filename = xstrdup (filename);
+  nbfd->direction = read_direction;

 
   if (! bfd_cache_init (nbfd))
     {
       _bfd_delete_bfd (nbfd);
       return NULL;
     }
 
   if (! bfd_cache_init (nbfd))
     {
       _bfd_delete_bfd (nbfd);
       return NULL;
     }

-  nbfd->opened_once = TRUE;

 
   return nbfd;
 }
 
 /*
 FUNCTION
 
   return nbfd;
 }
 
 /*
 FUNCTION

-       bfd_openstreamr
+       bfd_openr_iovec

 
 SYNOPSIS
 
 SYNOPSIS

-       bfd *bfd_openstreamr (const char *, const char *, void *);
+        bfd *bfd_openr_iovec (const char *filename, const char *target,
+                              void *(*open_func) (struct bfd *nbfd,
+                                                  void *open_closure),
+                              void *open_closure,
+                              file_ptr (*pread_func) (struct bfd *nbfd,
+                                                      void *stream,
+                                                      void *buf,
+                                                      file_ptr nbytes,
+                                                      file_ptr offset),
+                              int (*close_func) (struct bfd *nbfd,
+                                                 void *stream),
+                             int (*stat_func) (struct bfd *abfd,
+                                               void *stream,
+                                               struct stat *sb));

 
 DESCRIPTION
 
 
 DESCRIPTION
 

-       Open a BFD for read access on an existing stdio stream.  When
-       the BFD is passed to <<bfd_close>>, the stream will be closed.
+        Create and return a BFD backed by a read-only @var{stream}.
+        The @var{stream} is created using @var{open_func}, accessed using
+        @var{pread_func} and destroyed using @var{close_func}.
+
+       Calls <<bfd_find_target>>, so @var{target} is interpreted as by
+       that function.
+
+       Calls @var{open_func} (which can call <<bfd_zalloc>> and
+       <<bfd_get_filename>>) to obtain the read-only stream backing
+       the BFD.  @var{open_func} either succeeds returning the
+       non-<<NULL>> @var{stream}, or fails returning <<NULL>>
+       (setting <<bfd_error>>).
+
+       Calls @var{pread_func} to request @var{nbytes} of data from
+       @var{stream} starting at @var{offset} (e.g., via a call to
+       <<bfd_read>>).  @var{pread_func} either succeeds returning the
+       number of bytes read (which can be less than @var{nbytes} when
+       end-of-file), or fails returning -1 (setting <<bfd_error>>).
+
+       Calls @var{close_func} when the BFD is later closed using
+       <<bfd_close>>.  @var{close_func} either succeeds returning 0, or
+       fails returning -1 (setting <<bfd_error>>).
+
+       Calls @var{stat_func} to fill in a stat structure for bfd_stat,
+       bfd_get_size, and bfd_get_mtime calls.  @var{stat_func} returns 0
+       on success, or returns -1 on failure (setting <<bfd_error>>).
+
+       If <<bfd_openr_iovec>> returns <<NULL>> then an error has
+       occurred.  Possible errors are <<bfd_error_no_memory>>,
+       <<bfd_error_invalid_target>> and <<bfd_error_system_call>>.
+
+       A copy of the @var{filename} argument is stored in the newly created
+       BFD.  It can be accessed via the bfd_get_filename() macro.

 */
 
 */
 

+struct opncls
+{
+  void *stream;
+  file_ptr (*pread) (struct bfd *abfd, void *stream, void *buf,
+                    file_ptr nbytes, file_ptr offset);
+  int (*close) (struct bfd *abfd, void *stream);
+  int (*stat) (struct bfd *abfd, void *stream, struct stat *sb);
+  file_ptr where;
+};
+
+static file_ptr
+opncls_btell (struct bfd *abfd)
+{
+  struct opncls *vec = (struct opncls *) abfd->iostream;
+  return vec->where;
+}
+
+static int
+opncls_bseek (struct bfd *abfd, file_ptr offset, int whence)
+{
+  struct opncls *vec = (struct opncls *) abfd->iostream;
+  switch (whence)
+    {
+    case SEEK_SET: vec->where = offset; break;
+    case SEEK_CUR: vec->where += offset; break;
+    case SEEK_END: return -1;
+    }
+  return 0;
+}
+
+static file_ptr
+opncls_bread (struct bfd *abfd, void *buf, file_ptr nbytes)
+{
+  struct opncls *vec = (struct opncls *) abfd->iostream;
+  file_ptr nread = (vec->pread) (abfd, vec->stream, buf, nbytes, vec->where);
+  if (nread < 0)
+    return nread;
+  vec->where += nread;
+  return nread;
+}
+
+static file_ptr
+opncls_bwrite (struct bfd *abfd ATTRIBUTE_UNUSED,
+             const void *where ATTRIBUTE_UNUSED,
+             file_ptr nbytes ATTRIBUTE_UNUSED)
+{
+  return -1;
+}
+
+static int
+opncls_bclose (struct bfd *abfd)
+{
+  struct opncls *vec = (struct opncls *) abfd->iostream;
+  /* Since the VEC's memory is bound to the bfd deleting the bfd will
+     free it.  */
+  int status = 0;
+  if (vec->close != NULL)
+    status = (vec->close) (abfd, vec->stream);
+  abfd->iostream = NULL;
+  return status;
+}
+
+static int
+opncls_bflush (struct bfd *abfd ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static int
+opncls_bstat (struct bfd *abfd, struct stat *sb)
+{
+  struct opncls *vec = (struct opncls *) abfd->iostream;
+
+  memset (sb, 0, sizeof (*sb));
+  if (vec->stat == NULL)
+    return 0;
+
+  return (vec->stat) (abfd, vec->stream, sb);
+}
+
+static void *
+opncls_bmmap (struct bfd *abfd ATTRIBUTE_UNUSED,
+             void *addr ATTRIBUTE_UNUSED,
+             bfd_size_type len ATTRIBUTE_UNUSED,
+             int prot ATTRIBUTE_UNUSED,
+             int flags ATTRIBUTE_UNUSED,
+             file_ptr offset ATTRIBUTE_UNUSED,
+              void **map_addr ATTRIBUTE_UNUSED,
+              bfd_size_type *map_len ATTRIBUTE_UNUSED)
+{
+  return (void *) -1;
+}
+
+static const struct bfd_iovec opncls_iovec = {
+  &opncls_bread, &opncls_bwrite, &opncls_btell, &opncls_bseek,
+  &opncls_bclose, &opncls_bflush, &opncls_bstat, &opncls_bmmap
+};
+

 bfd *
 bfd *

-bfd_openstreamr (const char *filename, const char *target, void *streamarg)
+bfd_openr_iovec (const char *filename, const char *target,
+                void *(*open_p) (struct bfd *, void *),
+                void *open_closure,
+                file_ptr (*pread_p) (struct bfd *, void *, void *,
+                                     file_ptr, file_ptr),
+                int (*close_p) (struct bfd *, void *),
+                int (*stat_p) (struct bfd *, void *, struct stat *))

 {
 {

-  FILE *stream = streamarg;

   bfd *nbfd;
   const bfd_target *target_vec;
   bfd *nbfd;
   const bfd_target *target_vec;

+  struct opncls *vec;
+  void *stream;

 
   nbfd = _bfd_new_bfd ();
   if (nbfd == NULL)
 
   nbfd = _bfd_new_bfd ();
   if (nbfd == NULL)


@@ -311,16 +587,28 @@ bfd_openstreamr (const char *filename, const char *target, void *streamarg)
       return NULL;
     }
 
       return NULL;
     }
 

-  nbfd->iostream = stream;
-  nbfd->filename = filename;
+  /* PR 11983: Do not cache the original filename, but
+     rather make a copy - the original might go away.  */
+  nbfd->filename = xstrdup (filename);

   nbfd->direction = read_direction;
 
   nbfd->direction = read_direction;
 

-  if (! bfd_cache_init (nbfd))
+  /* `open_p (...)' would get expanded by an the open(2) syscall macro.  */
+  stream = (*open_p) (nbfd, open_closure);
+  if (stream == NULL)

     {
       _bfd_delete_bfd (nbfd);
       return NULL;
     }
 
     {
       _bfd_delete_bfd (nbfd);
       return NULL;
     }
 

+  vec = (struct opncls *) bfd_zalloc (nbfd, sizeof (struct opncls));
+  vec->stream = stream;
+  vec->pread = pread_p;
+  vec->close = close_p;
+  vec->stat = stat_p;
+
+  nbfd->iovec = &opncls_iovec;
+  nbfd->iostream = vec;
+

   return nbfd;
 }
 \f
   return nbfd;
 }
 \f


@@ -342,6 +630,9 @@ DESCRIPTION
 
        Possible errors are <<bfd_error_system_call>>, <<bfd_error_no_memory>>,
        <<bfd_error_invalid_target>>.
 
        Possible errors are <<bfd_error_system_call>>, <<bfd_error_no_memory>>,
        <<bfd_error_invalid_target>>.

+
+       A copy of the @var{filename} argument is stored in the newly created
+       BFD.  It can be accessed via the bfd_get_filename() macro.

 */
 
 bfd *
 */
 
 bfd *


@@ -363,7 +654,9 @@ bfd_openw (const char *filename, const char *target)
       return NULL;
     }
 
       return NULL;
     }
 

-  nbfd->filename = filename;
+  /* PR 11983: Do not cache the original filename, but
+     rather make a copy - the original might go away.  */
+  nbfd->filename = xstrdup (filename);

   nbfd->direction = write_direction;
 
   if (bfd_open_file (nbfd) == NULL)
   nbfd->direction = write_direction;
 
   if (bfd_open_file (nbfd) == NULL)


@@ -377,6 +670,32 @@ bfd_openw (const char *filename, const char *target)
   return nbfd;
 }
 
   return nbfd;
 }
 

+static inline void
+_maybe_make_executable (bfd * abfd)
+{
+  /* If the file was open for writing and is now executable,
+     make it so.  */
+  if (abfd->direction == write_direction
+      && (abfd->flags & (EXEC_P | DYNAMIC)) != 0)
+    {
+      struct stat buf;
+
+      if (stat (abfd->filename, &buf) == 0
+         /* Do not attempt to change non-regular files.  This is
+            here especially for configure scripts and kernel builds
+            which run tests with "ld [...] -o /dev/null".  */
+         && S_ISREG(buf.st_mode))
+       {
+         unsigned int mask = umask (0);
+
+         umask (mask);
+         chmod (abfd->filename,
+                (0777
+                 & (buf.st_mode | ((S_IXUSR | S_IXGRP | S_IXOTH) &~ mask))));
+       }
+    }
+}
+

 /*
 
 FUNCTION
 /*
 
 FUNCTION


@@ -416,26 +735,10 @@ bfd_close (bfd *abfd)
   if (! BFD_SEND (abfd, _close_and_cleanup, (abfd)))
     return FALSE;
 
   if (! BFD_SEND (abfd, _close_and_cleanup, (abfd)))
     return FALSE;
 

-  ret = bfd_cache_close (abfd);
+  ret = abfd->iovec->bclose (abfd) == 0;

 
 

-  /* If the file was open for writing and is now executable,
-     make it so.  */
-  if (ret
-      && abfd->direction == write_direction
-      && abfd->flags & EXEC_P)
-    {
-      struct stat buf;
-
-      if (stat (abfd->filename, &buf) == 0)
-       {
-         unsigned int mask = umask (0);
-
-         umask (mask);
-         chmod (abfd->filename,
-                (0777
-                 & (buf.st_mode | ((S_IXUSR | S_IXGRP | S_IXOTH) &~ mask))));
-       }
-    }
+  if (ret)
+    _maybe_make_executable (abfd);

 
   _bfd_delete_bfd (abfd);
 
 
   _bfd_delete_bfd (abfd);
 


@@ -471,24 +774,8 @@ bfd_close_all_done (bfd *abfd)
 
   ret = bfd_cache_close (abfd);
 
 
   ret = bfd_cache_close (abfd);
 

-  /* If the file was open for writing and is now executable,
-     make it so.  */
-  if (ret
-      && abfd->direction == write_direction
-      && abfd->flags & EXEC_P)
-    {
-      struct stat buf;
-
-      if (stat (abfd->filename, &buf) == 0)
-       {
-         unsigned int mask = umask (0);
-
-         umask (mask);
-         chmod (abfd->filename,
-                (0777
-                 & (buf.st_mode | ((S_IXUSR | S_IXGRP | S_IXOTH) &~ mask))));
-       }
-    }
+  if (ret)
+    _maybe_make_executable (abfd);

 
   _bfd_delete_bfd (abfd);
 
 
   _bfd_delete_bfd (abfd);
 


@@ -505,7 +792,10 @@ SYNOPSIS
 DESCRIPTION
        Create a new BFD in the manner of <<bfd_openw>>, but without
        opening a file. The new BFD takes the target from the target
 DESCRIPTION
        Create a new BFD in the manner of <<bfd_openw>>, but without
        opening a file. The new BFD takes the target from the target

-       used by @var{template}. The format is always set to <<bfd_object>>.
+       used by @var{templ}. The format is always set to <<bfd_object>>.
+
+       A copy of the @var{filename} argument is stored in the newly created
+       BFD.  It can be accessed via the bfd_get_filename() macro.

 */
 
 bfd *
 */
 
 bfd *


@@ -516,7 +806,9 @@ bfd_create (const char *filename, bfd *templ)
   nbfd = _bfd_new_bfd ();
   if (nbfd == NULL)
     return NULL;
   nbfd = _bfd_new_bfd ();
   if (nbfd == NULL)
     return NULL;

-  nbfd->filename = filename;
+  /* PR 11983: Do not cache the original filename, but
+     rather make a copy - the original might go away.  */
+  nbfd->filename = xstrdup (filename);

   if (templ)
     nbfd->xvec = templ->xvec;
   nbfd->direction = no_direction;
   if (templ)
     nbfd->xvec = templ->xvec;
   nbfd->direction = no_direction;


@@ -553,13 +845,17 @@ bfd_make_writable (bfd *abfd)
       return FALSE;
     }
 
       return FALSE;
     }
 

-  bim = bfd_malloc (sizeof (struct bfd_in_memory));
+  bim = (struct bfd_in_memory *) bfd_malloc (sizeof (struct bfd_in_memory));
+  if (bim == NULL)
+    return FALSE;      /* bfd_error already set.  */

   abfd->iostream = bim;
   /* bfd_bwrite will grow these as needed.  */
   bim->size = 0;
   bim->buffer = 0;
 
   abfd->flags |= BFD_IN_MEMORY;
   abfd->iostream = bim;
   /* bfd_bwrite will grow these as needed.  */
   bim->size = 0;
   bim->buffer = 0;
 
   abfd->flags |= BFD_IN_MEMORY;

+  abfd->iovec = &_bfd_memory_iovec;
+  abfd->origin = 0;

   abfd->direction = write_direction;
   abfd->where = 0;
 
   abfd->direction = write_direction;
   abfd->where = 0;
 


@@ -598,7 +894,6 @@ bfd_make_readable (bfd *abfd)
   if (! BFD_SEND (abfd, _close_and_cleanup, (abfd)))
     return FALSE;
 
   if (! BFD_SEND (abfd, _close_and_cleanup, (abfd)))
     return FALSE;
 

-

   abfd->arch_info = &bfd_default_arch_struct;
 
   abfd->where = 0;
   abfd->arch_info = &bfd_default_arch_struct;
 
   abfd->where = 0;


@@ -610,7 +905,7 @@ bfd_make_readable (bfd *abfd)
   abfd->section_count = 0;
   abfd->usrdata = NULL;
   abfd->cacheable = FALSE;
   abfd->section_count = 0;
   abfd->usrdata = NULL;
   abfd->cacheable = FALSE;

-  abfd->flags = BFD_IN_MEMORY;
+  abfd->flags |= BFD_IN_MEMORY;

   abfd->mtime_set = FALSE;
 
   abfd->target_defaulted = TRUE;
   abfd->mtime_set = FALSE;
 
   abfd->target_defaulted = TRUE;


@@ -627,35 +922,77 @@ bfd_make_readable (bfd *abfd)
 }
 
 /*
 }
 
 /*

-INTERNAL_FUNCTION
+FUNCTION

        bfd_alloc
 
 SYNOPSIS
        bfd_alloc
 
 SYNOPSIS

-       void *bfd_alloc (bfd *abfd, size_t wanted);
+       void *bfd_alloc (bfd *abfd, bfd_size_type wanted);

 
 DESCRIPTION
        Allocate a block of @var{wanted} bytes of memory attached to
        <<abfd>> and return a pointer to it.
 */
 
 
 DESCRIPTION
        Allocate a block of @var{wanted} bytes of memory attached to
        <<abfd>> and return a pointer to it.
 */
 

-

 void *
 bfd_alloc (bfd *abfd, bfd_size_type size)
 {
   void *ret;
 void *
 bfd_alloc (bfd *abfd, bfd_size_type size)
 {
   void *ret;

+  unsigned long ul_size = (unsigned long) size;

 
 

-  if (size != (unsigned long) size)
+  if (size != ul_size
+      /* A small negative size can result in objalloc_alloc allocating just
+        1 byte of memory, but the caller will be expecting more.  So catch
+        this case here.  */
+      || (size != 0 && (((ul_size + OBJALLOC_ALIGN - 1) &~ (OBJALLOC_ALIGN - 1)) == 0)))

     {
       bfd_set_error (bfd_error_no_memory);
       return NULL;
     }
     {
       bfd_set_error (bfd_error_no_memory);
       return NULL;
     }

-
-  ret = objalloc_alloc (abfd->memory, (unsigned long) size);
+                                                       
+  ret = objalloc_alloc ((struct objalloc *) abfd->memory, ul_size);

   if (ret == NULL)
     bfd_set_error (bfd_error_no_memory);
   return ret;
 }
 
   if (ret == NULL)
     bfd_set_error (bfd_error_no_memory);
   return ret;
 }
 

+/*
+INTERNAL_FUNCTION
+       bfd_alloc2
+
+SYNOPSIS
+       void *bfd_alloc2 (bfd *abfd, bfd_size_type nmemb, bfd_size_type size);
+
+DESCRIPTION
+       Allocate a block of @var{nmemb} elements of @var{size} bytes each
+       of memory attached to <<abfd>> and return a pointer to it.
+*/
+
+void *
+bfd_alloc2 (bfd *abfd, bfd_size_type nmemb, bfd_size_type size)
+{
+  if ((nmemb | size) >= HALF_BFD_SIZE_TYPE
+      && size != 0
+      && nmemb > ~(bfd_size_type) 0 / size)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return NULL;
+    }
+
+  return bfd_alloc (abfd, size * nmemb);
+}
+
+/*
+FUNCTION
+       bfd_zalloc
+
+SYNOPSIS
+       void *bfd_zalloc (bfd *abfd, bfd_size_type wanted);
+
+DESCRIPTION
+       Allocate a block of @var{wanted} bytes of zeroed memory
+       attached to <<abfd>> and return a pointer to it.
+*/
+

 void *
 bfd_zalloc (bfd *abfd, bfd_size_type size)
 {
 void *
 bfd_zalloc (bfd *abfd, bfd_size_type size)
 {


@@ -667,6 +1004,39 @@ bfd_zalloc (bfd *abfd, bfd_size_type size)
   return res;
 }
 
   return res;
 }
 

+/*
+INTERNAL_FUNCTION
+       bfd_zalloc2
+
+SYNOPSIS
+       void *bfd_zalloc2 (bfd *abfd, bfd_size_type nmemb, bfd_size_type size);
+
+DESCRIPTION
+       Allocate a block of @var{nmemb} elements of @var{size} bytes each
+       of zeroed memory attached to <<abfd>> and return a pointer to it.
+*/
+
+void *
+bfd_zalloc2 (bfd *abfd, bfd_size_type nmemb, bfd_size_type size)
+{
+  void *res;
+
+  if ((nmemb | size) >= HALF_BFD_SIZE_TYPE
+      && size != 0
+      && nmemb > ~(bfd_size_type) 0 / size)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return NULL;
+    }
+
+  size *= nmemb;
+
+  res = bfd_alloc (abfd, size);
+  if (res)
+    memset (res, 0, (size_t) size);
+  return res;
+}
+

 /* Free a block allocated for a BFD.
    Note:  Also frees all more recently allocated blocks!  */
 
 /* Free a block allocated for a BFD.
    Note:  Also frees all more recently allocated blocks!  */
 


@@ -677,9 +1047,9 @@ bfd_release (bfd *abfd, void *block)
 }
 
 
 }
 
 

-/* 
-   GNU Extension: separate debug-info files 
-   
+/*
+   GNU Extension: separate debug-info files
+

    The idea here is that a special section called .gnu_debuglink might be
    embedded in a binary file, which indicates that some *other* file
    contains the real debugging information. This special section contains a
    The idea here is that a special section called .gnu_debuglink might be
    embedded in a binary file, which indicates that some *other* file
    contains the real debugging information. This special section contains a


@@ -688,10 +1058,11 @@ bfd_release (bfd *abfd, void *block)
 
    This facilitates "optional" provision of debugging information, without
    having to provide two complete copies of every binary object (with and
 
    This facilitates "optional" provision of debugging information, without
    having to provide two complete copies of every binary object (with and

-   without debug symbols).
-*/
+   without debug symbols).  */
+
+#define GNU_DEBUGLINK          ".gnu_debuglink"
+#define GNU_DEBUGALTLINK       ".gnu_debugaltlink"

 
 

-#define GNU_DEBUGLINK  ".gnu_debuglink"

 /*
 FUNCTION
        bfd_calc_gnu_debuglink_crc32
 /*
 FUNCTION
        bfd_calc_gnu_debuglink_crc32


@@ -707,7 +1078,7 @@ DESCRIPTION
 
 RETURNS
        Return the updated CRC32 value.
 
 RETURNS
        Return the updated CRC32 value.

-*/     
+*/

 
 unsigned long
 bfd_calc_gnu_debuglink_crc32 (unsigned long crc,
 
 unsigned long
 bfd_calc_gnu_debuglink_crc32 (unsigned long crc,


@@ -774,32 +1145,33 @@ bfd_calc_gnu_debuglink_crc32 (unsigned long crc,
   crc = ~crc & 0xffffffff;
   for (end = buf + len; buf < end; ++ buf)
     crc = crc32_table[(crc ^ *buf) & 0xff] ^ (crc >> 8);
   crc = ~crc & 0xffffffff;
   for (end = buf + len; buf < end; ++ buf)
     crc = crc32_table[(crc ^ *buf) & 0xff] ^ (crc >> 8);

-  return ~crc & 0xffffffff;;
+  return ~crc & 0xffffffff;

 }
 
 
 /*
 }
 
 
 /*

-INTERNAL_FUNCTION
-       get_debug_link_info
+FUNCTION
+       bfd_get_debug_link_info

 
 SYNOPSIS
 
 SYNOPSIS

-       char *get_debug_link_info (bfd *abfd, unsigned long *crc32_out);
+       char *bfd_get_debug_link_info (bfd *abfd, unsigned long *crc32_out);

 
 DESCRIPTION
 
 DESCRIPTION

-       fetch the filename and CRC32 value for any separate debuginfo
-       associated with @var{abfd}. Return NULL if no such info found,
-       otherwise return filename and update @var{crc32_out}.
+       Fetch the filename and CRC32 value for any separate debuginfo
+       associated with @var{abfd}.  Return NULL if no such info found,
+       otherwise return filename and update @var{crc32_out}.  The
+       returned filename is allocated with @code{malloc}; freeing it
+       is the responsibility of the caller.

 */
 
 */
 

-static char *
-get_debug_link_info (bfd *abfd, unsigned long *crc32_out)
+char *
+bfd_get_debug_link_info (bfd *abfd, unsigned long *crc32_out)

 {
 {

-  asection * sect;
-  bfd_size_type debuglink_size;
+  asection *sect;

   unsigned long crc32;
   unsigned long crc32;

-  char * contents;
-  int crc_offset;
-  bfd_boolean ret;
+  bfd_byte *contents;
+  unsigned int crc_offset;
+  char *name;

 
   BFD_ASSERT (abfd);
   BFD_ASSERT (crc32_out);
 
   BFD_ASSERT (abfd);
   BFD_ASSERT (crc32_out);


@@ -809,27 +1181,81 @@ get_debug_link_info (bfd *abfd, unsigned long *crc32_out)
   if (sect == NULL)
     return NULL;
 
   if (sect == NULL)
     return NULL;
 

-  debuglink_size = bfd_section_size (abfd, sect);  
-
-  contents = malloc (debuglink_size);
-  if (contents == NULL)
-    return NULL;
-
-  ret = bfd_get_section_contents (abfd, sect, contents, 0, debuglink_size);
-  if (! ret)
+  if (!bfd_malloc_and_get_section (abfd, sect, &contents))

     {
     {

-      free (contents);
+      if (contents != NULL)
+       free (contents);

       return NULL;
     }
 
       return NULL;
     }
 

-  /* Crc value is stored after the filename, aligned up to 4 bytes.  */
-  crc_offset = strlen (contents) + 1;
+  /* CRC value is stored after the filename, aligned up to 4 bytes.  */
+  name = (char *) contents;
+  /* PR 17597: avoid reading off the end of the buffer.  */
+  crc_offset = strnlen (name, bfd_get_section_size (sect)) + 1;

   crc_offset = (crc_offset + 3) & ~3;
   crc_offset = (crc_offset + 3) & ~3;

+  if (crc_offset >= bfd_get_section_size (sect))
+    return NULL;

 
   crc32 = bfd_get_32 (abfd, contents + crc_offset);
 
   *crc32_out = crc32;
 
   crc32 = bfd_get_32 (abfd, contents + crc_offset);
 
   *crc32_out = crc32;

-  return contents;
+  return name;
+}
+
+/*
+FUNCTION
+       bfd_get_alt_debug_link_info
+
+SYNOPSIS
+       char *bfd_get_alt_debug_link_info (bfd * abfd,
+                                          bfd_size_type *buildid_len,
+                                          bfd_byte **buildid_out);
+
+DESCRIPTION
+       Fetch the filename and BuildID value for any alternate debuginfo
+       associated with @var{abfd}.  Return NULL if no such info found,
+       otherwise return filename and update @var{buildid_len} and
+       @var{buildid_out}.  The returned filename and build_id are
+       allocated with @code{malloc}; freeing them is the
+       responsibility of the caller.
+*/
+
+char *
+bfd_get_alt_debug_link_info (bfd * abfd, bfd_size_type *buildid_len,
+                            bfd_byte **buildid_out)
+{
+  asection *sect;
+  bfd_byte *contents;
+  unsigned int buildid_offset;
+  char *name;
+
+  BFD_ASSERT (abfd);
+  BFD_ASSERT (buildid_len);
+  BFD_ASSERT (buildid_out);
+
+  sect = bfd_get_section_by_name (abfd, GNU_DEBUGALTLINK);
+
+  if (sect == NULL)
+    return NULL;
+
+  if (!bfd_malloc_and_get_section (abfd, sect, & contents))
+    {
+      if (contents != NULL)
+       free (contents);
+      return NULL;
+    }
+
+  /* BuildID value is stored after the filename.  */
+  name = (char *) contents;
+  buildid_offset = strnlen (name, bfd_get_section_size (sect)) + 1;
+  if (buildid_offset >= bfd_get_section_size (sect))
+    return NULL;
+
+  *buildid_len = bfd_get_section_size (sect) - buildid_offset;
+  *buildid_out = bfd_malloc (*buildid_len);
+  memcpy (*buildid_out, contents + buildid_offset, *buildid_len);
+
+  return name;

 }
 
 /*
 }
 
 /*


@@ -848,25 +1274,56 @@ DESCRIPTION
 static bfd_boolean
 separate_debug_file_exists (const char *name, const unsigned long crc)
 {
 static bfd_boolean
 separate_debug_file_exists (const char *name, const unsigned long crc)
 {

-  static char buffer [8 * 1024];
+  static unsigned char buffer [8 * 1024];

   unsigned long file_crc = 0;
   unsigned long file_crc = 0;

-  int fd;
+  FILE *f;

   bfd_size_type count;
 
   BFD_ASSERT (name);
 
   bfd_size_type count;
 
   BFD_ASSERT (name);
 

-  fd = open (name, O_RDONLY);
-  if (fd < 0)
+  f = real_fopen (name, FOPEN_RB);
+  if (f == NULL)

     return FALSE;
 
     return FALSE;
 

-  while ((count = read (fd, buffer, sizeof (buffer))) > 0)
+  while ((count = fread (buffer, 1, sizeof (buffer), f)) > 0)

     file_crc = bfd_calc_gnu_debuglink_crc32 (file_crc, buffer, count);
 
     file_crc = bfd_calc_gnu_debuglink_crc32 (file_crc, buffer, count);
 

-  close (fd);
+  fclose (f);

 
   return crc == file_crc;
 }
 
 
   return crc == file_crc;
 }
 

+/*
+INTERNAL_FUNCTION
+       separate_alt_debug_file_exists
+
+SYNOPSIS
+       bfd_boolean separate_alt_debug_file_exists
+         (char *name, unsigned long crc32);
+
+DESCRIPTION
+       Checks to see if @var{name} is a file and if its BuildID
+       matches @var{buildid}.
+*/
+
+static bfd_boolean
+separate_alt_debug_file_exists (const char *name,
+                               const unsigned long buildid ATTRIBUTE_UNUSED)
+{
+  FILE *f;
+
+  BFD_ASSERT (name);
+
+  f = real_fopen (name, FOPEN_RB);
+  if (f == NULL)
+    return FALSE;
+
+  /* FIXME: Add code to check buildid.  */
+
+  fclose (f);
+
+  return TRUE;
+}

 
 /*
 INTERNAL_FUNCTION
 
 /*
 INTERNAL_FUNCTION


@@ -876,113 +1333,123 @@ SYNOPSIS
        char *find_separate_debug_file (bfd *abfd);
 
 DESCRIPTION
        char *find_separate_debug_file (bfd *abfd);
 
 DESCRIPTION

-       Searches @var{abfd} for a reference to separate debugging
-       information, scans various locations in the filesystem, including
-       the file tree rooted at @var{debug_file_directory}, and returns a
-       filename of such debugging information if the file is found and has
-       matching CRC32.  Returns NULL if no reference to debugging file
-       exists, or file cannot be found.
+       Searches @var{abfd} for a section called @var{section_name} which
+       is expected to contain a reference to a file containing separate
+       debugging information.  The function scans various locations in
+       the filesystem, including the file tree rooted at
+       @var{debug_file_directory}, and returns the first matching
+       filename that it finds.  If @var{check_crc} is TRUE then the
+       contents of the file must also match the CRC value contained in
+       @var{section_name}.  Returns NULL if no valid file could be found.

 */
 
 */
 

+typedef char *      (* get_func_type) (bfd *, unsigned long *);
+typedef bfd_boolean (* check_func_type) (const char *, const unsigned long);
+

 static char *
 static char *

-find_separate_debug_file (bfd *abfd, const char *debug_file_directory)
+find_separate_debug_file (bfd *           abfd,
+                         const char *    debug_file_directory,
+                         get_func_type   get_func,
+                         check_func_type check_func)

 {
 {

-  char *basename;
+  char *base;

   char *dir;
   char *debugfile;
   char *dir;
   char *debugfile;

+  char *canon_dir;

   unsigned long crc32;
   unsigned long crc32;

-  int i;
+  size_t dirlen;
+  size_t canon_dirlen;

 
   BFD_ASSERT (abfd);
   if (debug_file_directory == NULL)
     debug_file_directory = ".";
 
   /* BFD may have been opened from a stream.  */
 
   BFD_ASSERT (abfd);
   if (debug_file_directory == NULL)
     debug_file_directory = ".";
 
   /* BFD may have been opened from a stream.  */

-  if (! abfd->filename)
-    return NULL;
+  if (abfd->filename == NULL)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return NULL;
+    }

 
 

-  basename = get_debug_link_info (abfd, & crc32);
-  if (basename == NULL)
+  base = get_func (abfd, & crc32);
+    
+  if (base == NULL)

     return NULL;
 
     return NULL;
 

-  if (strlen (basename) < 1)
+  if (base[0] == '\0')

     {
     {

-      free (basename);
+      free (base);
+      bfd_set_error (bfd_error_no_debug_section);

       return NULL;
     }
 
       return NULL;
     }
 

-  dir = strdup (abfd->filename);
+  for (dirlen = strlen (abfd->filename); dirlen > 0; dirlen--)
+    if (IS_DIR_SEPARATOR (abfd->filename[dirlen - 1]))
+      break;
+
+  dir = (char *) bfd_malloc (dirlen + 1);

   if (dir == NULL)
     {
   if (dir == NULL)
     {

-      free (basename);
+      free (base);

       return NULL;
     }
       return NULL;
     }

-  BFD_ASSERT (strlen (dir) != 0);
-  
-  /* Strip off filename part.  */
-  for (i = strlen (dir) - 1; i >= 0; i--)
-    if (IS_DIR_SEPARATOR (dir[i]))
+  memcpy (dir, abfd->filename, dirlen);
+  dir[dirlen] = '\0';
+
+  /* Compute the canonical name of the bfd object with all symbolic links
+     resolved, for use in the global debugfile directory.  */
+  canon_dir = lrealpath (abfd->filename);
+  for (canon_dirlen = strlen (canon_dir); canon_dirlen > 0; canon_dirlen--)
+    if (IS_DIR_SEPARATOR (canon_dir[canon_dirlen - 1]))

       break;
       break;

-  
-  dir[i + 1] = '\0';
-  BFD_ASSERT (dir[i] == '/' || dir[0] == '\0')
-
-  debugfile = malloc (strlen (debug_file_directory) + 1
-                     + strlen (dir)
-                     + strlen (".debug/")
-                     + strlen (basename) 
-                     + 1);
+  canon_dir[canon_dirlen] = '\0';
+
+  debugfile = (char *)
+      bfd_malloc (strlen (debug_file_directory) + 1
+                  + (canon_dirlen > dirlen ? canon_dirlen : dirlen)
+                  + strlen (".debug/")
+                  + strlen (base)
+                  + 1);

   if (debugfile == NULL)
   if (debugfile == NULL)

-    {
-      free (basename);
-      free (dir);
-      return NULL;
-    }
+    goto found; /* Actually this returns NULL.  */

 
   /* First try in the same directory as the original file:  */
   strcpy (debugfile, dir);
 
   /* First try in the same directory as the original file:  */
   strcpy (debugfile, dir);

-  strcat (debugfile, basename);
+  strcat (debugfile, base);

 
 

-  if (separate_debug_file_exists (debugfile, crc32))
-    {
-      free (basename);
-      free (dir);
-      return debugfile;
-    }
+  if (check_func (debugfile, crc32))
+    goto found;

 
   /* Then try in a subdirectory called .debug.  */
   strcpy (debugfile, dir);
   strcat (debugfile, ".debug/");
 
   /* Then try in a subdirectory called .debug.  */
   strcpy (debugfile, dir);
   strcat (debugfile, ".debug/");

-  strcat (debugfile, basename);
+  strcat (debugfile, base);

 
 

-  if (separate_debug_file_exists (debugfile, crc32))
-    {
-      free (basename);
-      free (dir);
-      return debugfile;
-    }
+  if (check_func (debugfile, crc32))
+    goto found;

 
   /* Then try in the global debugfile directory.  */
   strcpy (debugfile, debug_file_directory);
 
   /* Then try in the global debugfile directory.  */
   strcpy (debugfile, debug_file_directory);

-  i = strlen (debug_file_directory) - 1;
-  if (i > 0
-      && debug_file_directory[i] != '/'
-      && dir[0] != '/')
+  dirlen = strlen (debug_file_directory) - 1;
+  if (dirlen > 0
+      && debug_file_directory[dirlen] != '/'
+      && canon_dir[0] != '/')

     strcat (debugfile, "/");
     strcat (debugfile, "/");

-  strcat (debugfile, dir);
-  strcat (debugfile, basename);
+  strcat (debugfile, canon_dir);
+  strcat (debugfile, base);

 
 

-  if (separate_debug_file_exists (debugfile, crc32))
-    {
-      free (basename);
-      free (dir);
-      return debugfile;
-    }
+  if (check_func (debugfile, crc32))
+    goto found;

 
 

+  /* Failed to find the file.  */

   free (debugfile);
   free (debugfile);

-  free (basename);
+  debugfile = NULL;
+
+ found:
+  free (base);

   free (dir);
   free (dir);

-  return NULL;
+  free (canon_dir);
+  return debugfile;

 }
 
 
 }
 
 


@@ -996,27 +1463,80 @@ SYNOPSIS
 DESCRIPTION
 
        Takes a BFD and searches it for a .gnu_debuglink section.  If this
 DESCRIPTION
 
        Takes a BFD and searches it for a .gnu_debuglink section.  If this

-       section is found, examines the section for the name and checksum of
-       a '.debug' file containing auxiliary debugging
-       information. Searches filesystem for .debug file in some standard
+       section is found, it examines the section for the name and checksum
+       of a '.debug' file containing auxiliary debugging information.  It
+       then searches the filesystem for this .debug file in some standard

        locations, including the directory tree rooted at @var{dir}, and if
        locations, including the directory tree rooted at @var{dir}, and if

-       found returns the full filename. If @var{dir} is NULL, will search
-       default path configured into libbfd at build time.
+       found returns the full filename.
+
+       If @var{dir} is NULL, it will search a default path configured into
+       libbfd at build time.  [XXX this feature is not currently
+       implemented].

 
 RETURNS
        <<NULL>> on any errors or failure to locate the .debug file,
        otherwise a pointer to a heap-allocated string containing the
 
 RETURNS
        <<NULL>> on any errors or failure to locate the .debug file,
        otherwise a pointer to a heap-allocated string containing the

-       filename. The caller is responsible for freeing this string.
+       filename.  The caller is responsible for freeing this string.

 */
 
 char *
 bfd_follow_gnu_debuglink (bfd *abfd, const char *dir)
 {
 */
 
 char *
 bfd_follow_gnu_debuglink (bfd *abfd, const char *dir)
 {

-#if 0 /* Disabled until DEBUGDIR can be defined by configure.in  */
-  if (dir == NULL)
-    dir = DEBUGDIR;
-#endif
-  return find_separate_debug_file (abfd, dir);
+  return find_separate_debug_file (abfd, dir,
+                                  bfd_get_debug_link_info,
+                                  separate_debug_file_exists);
+}
+
+/* Helper for bfd_follow_gnu_debugaltlink.  It just pretends to return
+   a CRC.  .gnu_debugaltlink supplies a build-id, which is different,
+   but this is ok because separate_alt_debug_file_exists ignores the
+   CRC anyway.  */
+
+static char *
+get_alt_debug_link_info_shim (bfd * abfd, unsigned long *crc32_out)
+{
+  bfd_size_type len;
+  bfd_byte *buildid = NULL;
+  char *result = bfd_get_alt_debug_link_info (abfd, &len, &buildid);
+
+  *crc32_out = 0;
+  free (buildid);
+
+  return result;
+}
+
+/*
+FUNCTION
+       bfd_follow_gnu_debugaltlink
+
+SYNOPSIS
+       char *bfd_follow_gnu_debugaltlink (bfd *abfd, const char *dir);
+
+DESCRIPTION
+
+       Takes a BFD and searches it for a .gnu_debugaltlink section.  If this
+       section is found, it examines the section for the name of a file
+       containing auxiliary debugging information.  It then searches the
+       filesystem for this file in a set of standard locations, including
+       the directory tree rooted at @var{dir}, and if found returns the
+       full filename.
+
+       If @var{dir} is NULL, it will search a default path configured into
+       libbfd at build time.  [FIXME: This feature is not currently
+       implemented].
+
+RETURNS
+       <<NULL>> on any errors or failure to locate the debug file,
+       otherwise a pointer to a heap-allocated string containing the
+       filename.  The caller is responsible for freeing this string.
+*/
+
+char *
+bfd_follow_gnu_debugaltlink (bfd *abfd, const char *dir)
+{
+  return find_separate_debug_file (abfd, dir,
+                                  get_alt_debug_link_info_shim,
+                                  separate_alt_debug_file_exists);

 }
 
 /*
 }
 
 /*


@@ -1034,7 +1554,7 @@ DESCRIPTION
 
 RETURNS
        A pointer to the new section is returned if all is ok.  Otherwise <<NULL>> is
 
 RETURNS
        A pointer to the new section is returned if all is ok.  Otherwise <<NULL>> is

-       returned and bfd_error is set.  
+       returned and bfd_error is set.

 */
 
 asection *
 */
 
 asection *


@@ -1042,6 +1562,7 @@ bfd_create_gnu_debuglink_section (bfd *abfd, const char *filename)
 {
   asection *sect;
   bfd_size_type debuglink_size;
 {
   asection *sect;
   bfd_size_type debuglink_size;

+  flagword flags;

 
   if (abfd == NULL || filename == NULL)
     {
 
   if (abfd == NULL || filename == NULL)
     {


@@ -1051,7 +1572,7 @@ bfd_create_gnu_debuglink_section (bfd *abfd, const char *filename)
 
   /* Strip off any path components in filename.  */
   filename = lbasename (filename);
 
   /* Strip off any path components in filename.  */
   filename = lbasename (filename);

-  
+

   sect = bfd_get_section_by_name (abfd, GNU_DEBUGLINK);
   if (sect)
     {
   sect = bfd_get_section_by_name (abfd, GNU_DEBUGLINK);
   if (sect)
     {


@@ -1060,16 +1581,11 @@ bfd_create_gnu_debuglink_section (bfd *abfd, const char *filename)
       return NULL;
     }
 
       return NULL;
     }
 

-  sect = bfd_make_section (abfd, GNU_DEBUGLINK);
+  flags = SEC_HAS_CONTENTS | SEC_READONLY | SEC_DEBUGGING;
+  sect = bfd_make_section_with_flags (abfd, GNU_DEBUGLINK, flags);

   if (sect == NULL)
     return NULL;
 
   if (sect == NULL)
     return NULL;
 

-  if (! bfd_set_section_flags (abfd, sect,
-                              SEC_HAS_CONTENTS | SEC_READONLY | SEC_DEBUGGING))
-    /* XXX Should we delete the section from the bfd ?  */
-    return NULL;
-
-  

   debuglink_size = strlen (filename) + 1;
   debuglink_size += 3;
   debuglink_size &= ~3;
   debuglink_size = strlen (filename) + 1;
   debuglink_size += 3;
   debuglink_size &= ~3;


@@ -1078,7 +1594,7 @@ bfd_create_gnu_debuglink_section (bfd *abfd, const char *filename)
   if (! bfd_set_section_size (abfd, sect, debuglink_size))
     /* XXX Should we delete the section from the bfd ?  */
     return NULL;
   if (! bfd_set_section_size (abfd, sect, debuglink_size))
     /* XXX Should we delete the section from the bfd ?  */
     return NULL;

-  
+

   return sect;
 }
 
   return sect;
 }
 


@@ -1100,7 +1616,7 @@ DESCRIPTION
 
 RETURNS
        <<TRUE>> is returned if all is ok.  Otherwise <<FALSE>> is returned
 
 RETURNS
        <<TRUE>> is returned if all is ok.  Otherwise <<FALSE>> is returned

-       and bfd_error is set.  
+       and bfd_error is set.

 */
 
 bfd_boolean
 */
 
 bfd_boolean


@@ -1113,8 +1629,9 @@ bfd_fill_in_gnu_debuglink_section (bfd *abfd,
   char * contents;
   bfd_size_type crc_offset;
   FILE * handle;
   char * contents;
   bfd_size_type crc_offset;
   FILE * handle;

-  static char buffer[8 * 1024];
+  static unsigned char buffer[8 * 1024];

   size_t count;
   size_t count;

+  size_t filelen;

 
   if (abfd == NULL || sect == NULL || filename == NULL)
     {
 
   if (abfd == NULL || sect == NULL || filename == NULL)
     {


@@ -1128,7 +1645,7 @@ bfd_fill_in_gnu_debuglink_section (bfd *abfd,
      .gnu_debuglink section, we insist upon the user providing us with a
      correct-for-section-creation-time path, but this need not conform to
      the gdb location algorithm.  */
      .gnu_debuglink section, we insist upon the user providing us with a
      correct-for-section-creation-time path, but this need not conform to
      the gdb location algorithm.  */

-  handle = fopen (filename, FOPEN_RB);
+  handle = real_fopen (filename, FOPEN_RB);

   if (handle == NULL)
     {
       bfd_set_error (bfd_error_system_call);
   if (handle == NULL)
     {
       bfd_set_error (bfd_error_system_call);


@@ -1143,22 +1660,23 @@ bfd_fill_in_gnu_debuglink_section (bfd *abfd,
   /* Strip off any path components in filename,
      now that we no longer need them.  */
   filename = lbasename (filename);
   /* Strip off any path components in filename,
      now that we no longer need them.  */
   filename = lbasename (filename);

-  
-  debuglink_size = strlen (filename) + 1;
+
+  filelen = strlen (filename);
+  debuglink_size = filelen + 1;

   debuglink_size += 3;
   debuglink_size &= ~3;
   debuglink_size += 4;
 
   debuglink_size += 3;
   debuglink_size &= ~3;
   debuglink_size += 4;
 

-  contents = malloc (debuglink_size);
+  contents = (char *) bfd_malloc (debuglink_size);

   if (contents == NULL)
     {
       /* XXX Should we delete the section from the bfd ?  */
   if (contents == NULL)
     {
       /* XXX Should we delete the section from the bfd ?  */

-      bfd_set_error (bfd_error_no_memory);

       return FALSE;
     }
 
       return FALSE;
     }
 

-  strcpy (contents, filename);

   crc_offset = debuglink_size - 4;
   crc_offset = debuglink_size - 4;

+  memcpy (contents, filename, filelen);
+  memset (contents + filelen, 0, crc_offset - filelen);

 
   bfd_put_32 (abfd, crc32, contents + crc_offset);
 
 
   bfd_put_32 (abfd, crc32, contents + crc_offset);