Automatic date update in version.in

[deliverable/binutils-gdb.git] / bfd / bfd.c

diff --git a/bfd/bfd.c b/bfd/bfd.c
index 288b5b14fe202e9f14d1b2b2ee1b53ce1e552cb5..538bdfa5d7df9dfbd3fb1e73bf57e145a4fc543e 100644 (file)
--- a/bfd/bfd.c
+++ b/bfd/bfd.c
@@ -1,5 +1,5 @@
 /* Generic BFD library interface and support routines.
 /* Generic BFD library interface and support routines.

-   Copyright (C) 1990-2018 Free Software Foundation, Inc.
+   Copyright (C) 1990-2020 Free Software Foundation, Inc.

    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.


@@ -74,8 +74,9 @@ CODE_FRAGMENT
 .     least-recently-used list of BFDs.  *}
 .  struct bfd *lru_prev, *lru_next;
 .
 .     least-recently-used list of BFDs.  *}
 .  struct bfd *lru_prev, *lru_next;
 .

-.  {* When a file is closed by the caching routines, BFD retains
-.     state information on the file here...  *}
+.  {* Track current file position (or current buffer offset for
+.     in-memory BFDs).  When a file is closed by the caching routines,
+.     BFD retains state information on the file here.  *}

 .  ufile_ptr where;
 .
 .  {* File modified time, if mtime_set is TRUE.  *}
 .  ufile_ptr where;
 .
 .  {* File modified time, if mtime_set is TRUE.  *}


@@ -84,14 +85,8 @@ CODE_FRAGMENT
 .  {* A unique identifier of the BFD  *}
 .  unsigned int id;
 .
 .  {* A unique identifier of the BFD  *}
 .  unsigned int id;
 .

-.  {* The format which belongs to the BFD. (object, core, etc.)  *}
-.  ENUM_BITFIELD (bfd_format) format : 3;
-.
-.  {* The direction with which the BFD was opened.  *}
-.  ENUM_BITFIELD (bfd_direction) direction : 2;
-.

 .  {* Format_specific flags.  *}
 .  {* Format_specific flags.  *}

-.  flagword flags : 20;
+.  flagword flags;

 .
 .  {* Values that may appear in the flags field of a BFD.  These also
 .     appear in the object_flags field of the bfd_target structure, where
 .
 .  {* Values that may appear in the flags field of a BFD.  These also
 .     appear in the object_flags field of the bfd_target structure, where


@@ -178,6 +173,9 @@ CODE_FRAGMENT
 .  {* Use the ELF STT_COMMON type in this BFD.  *}
 .#define BFD_USE_ELF_STT_COMMON  0x80000
 .
 .  {* Use the ELF STT_COMMON type in this BFD.  *}
 .#define BFD_USE_ELF_STT_COMMON  0x80000
 .

+.  {* Put pathnames into archives (non-POSIX).  *}
+.#define BFD_ARCHIVE_FULL_PATH  0x100000
+.

 .  {* Flags bits to be saved in bfd_preserve_save.  *}
 .#define BFD_FLAGS_SAVED \
 .  (BFD_IN_MEMORY | BFD_COMPRESS | BFD_DECOMPRESS | BFD_LINKER_CREATED \
 .  {* Flags bits to be saved in bfd_preserve_save.  *}
 .#define BFD_FLAGS_SAVED \
 .  (BFD_IN_MEMORY | BFD_COMPRESS | BFD_DECOMPRESS | BFD_LINKER_CREATED \


@@ -190,6 +188,12 @@ CODE_FRAGMENT
 .   | BFD_PLUGIN | BFD_TRADITIONAL_FORMAT | BFD_DETERMINISTIC_OUTPUT \
 .   | BFD_COMPRESS_GABI | BFD_CONVERT_ELF_COMMON | BFD_USE_ELF_STT_COMMON)
 .
 .   | BFD_PLUGIN | BFD_TRADITIONAL_FORMAT | BFD_DETERMINISTIC_OUTPUT \
 .   | BFD_COMPRESS_GABI | BFD_CONVERT_ELF_COMMON | BFD_USE_ELF_STT_COMMON)
 .

+.  {* The format which belongs to the BFD. (object, core, etc.)  *}
+.  ENUM_BITFIELD (bfd_format) format : 3;
+.
+.  {* The direction with which the BFD was opened.  *}
+.  ENUM_BITFIELD (bfd_direction) direction : 2;
+.

 .  {* Is the file descriptor being cached?  That is, can it be closed as
 .     needed, and re-opened when accessed later?  *}
 .  unsigned int cacheable : 1;
 .  {* Is the file descriptor being cached?  That is, can it be closed as
 .     needed, and re-opened when accessed later?  *}
 .  unsigned int cacheable : 1;


@@ -219,6 +223,9 @@ CODE_FRAGMENT
 .  {* Set if this is a thin archive.  *}
 .  unsigned int is_thin_archive : 1;
 .
 .  {* Set if this is a thin archive.  *}
 .  unsigned int is_thin_archive : 1;
 .

+.  {* Set if this archive should not cache element positions.  *}
+.  unsigned int no_element_cache : 1;
+.

 .  {* Set if only required symbols should be added in the link hash table for
 .     this object.  Used by VMS linkers.  *}
 .  unsigned int selective_search : 1;
 .  {* Set if only required symbols should be added in the link hash table for
 .     this object.  Used by VMS linkers.  *}
 .  unsigned int selective_search : 1;


@@ -235,13 +242,15 @@ CODE_FRAGMENT
 .  {* Set if this is a plugin output file.  *}
 .  unsigned int lto_output : 1;
 .
 .  {* Set if this is a plugin output file.  *}
 .  unsigned int lto_output : 1;
 .

+.  {* Set if this is a slim LTO object not loaded with a compiler plugin.  *}
+.  unsigned int lto_slim_object : 1;
+.

 .  {* Set to dummy BFD created when claimed by a compiler plug-in
 .     library.  *}
 .  bfd *plugin_dummy_bfd;
 .
 .  {* Set to dummy BFD created when claimed by a compiler plug-in
 .     library.  *}
 .  bfd *plugin_dummy_bfd;
 .

-.  {* Currently my_archive is tested before adding origin to
-.     anything. I believe that this can become always an add of
-.     origin, with origin set to 0 for non archive files.  *}
+.  {* The offset of this bfd in the file, typically 0 if it is not
+.     contained in an archive.  *}

 .  ufile_ptr origin;
 .
 .  {* The origin in the archive of the proxy entry.  This will
 .  ufile_ptr origin;
 .
 .  {* The origin in the archive of the proxy entry.  This will


@@ -273,7 +282,7 @@ CODE_FRAGMENT
 .
 .  {* Symbol table for output BFD (with symcount entries).
 .     Also used by the linker to cache input BFD symbols.  *}
 .
 .  {* Symbol table for output BFD (with symcount entries).
 .     Also used by the linker to cache input BFD symbols.  *}

-.  struct bfd_symbol  **outsymbols;
+.  struct bfd_symbol **outsymbols;

 .
 .  {* Used for input and output.  *}
 .  unsigned int symcount;
 .
 .  {* Used for input and output.  *}
 .  unsigned int symcount;


@@ -284,6 +293,11 @@ CODE_FRAGMENT
 .  {* Pointer to structure which contains architecture information.  *}
 .  const struct bfd_arch_info *arch_info;
 .
 .  {* Pointer to structure which contains architecture information.  *}
 .  const struct bfd_arch_info *arch_info;
 .

+.  {* Cached length of file for bfd_get_size.  0 until bfd_get_size is
+.     called, 1 if stat returns an error or the file size is too large to
+.     return in ufile_ptr.  Both 0 and 1 should be treated as "unknown".  *}
+.  ufile_ptr size;
+.

 .  {* Stuff only useful for archives.  *}
 .  void *arelt_data;
 .  struct bfd *my_archive;      {* The containing archive BFD.  *}
 .  {* Stuff only useful for archives.  *}
 .  void *arelt_data;
 .  struct bfd *my_archive;      {* The containing archive BFD.  *}


@@ -304,21 +318,15 @@ CODE_FRAGMENT
 .    {
 .      struct aout_data_struct *aout_data;
 .      struct artdata *aout_ar_data;
 .    {
 .      struct aout_data_struct *aout_data;
 .      struct artdata *aout_ar_data;

-.      struct _oasys_data *oasys_obj_data;
-.      struct _oasys_ar_data *oasys_ar_data;

 .      struct coff_tdata *coff_obj_data;
 .      struct pe_tdata *pe_obj_data;
 .      struct xcoff_tdata *xcoff_obj_data;
 .      struct ecoff_tdata *ecoff_obj_data;
 .      struct coff_tdata *coff_obj_data;
 .      struct pe_tdata *pe_obj_data;
 .      struct xcoff_tdata *xcoff_obj_data;
 .      struct ecoff_tdata *ecoff_obj_data;

-.      struct ieee_data_struct *ieee_data;
-.      struct ieee_ar_data_struct *ieee_ar_data;

 .      struct srec_data_struct *srec_data;
 .      struct verilog_data_struct *verilog_data;
 .      struct ihex_data_struct *ihex_data;
 .      struct tekhex_data_struct *tekhex_data;
 .      struct elf_obj_tdata *elf_obj_data;
 .      struct srec_data_struct *srec_data;
 .      struct verilog_data_struct *verilog_data;
 .      struct ihex_data_struct *ihex_data;
 .      struct tekhex_data_struct *tekhex_data;
 .      struct elf_obj_tdata *elf_obj_data;

-.      struct nlm_obj_tdata *nlm_obj_data;
-.      struct bout_data_struct *bout_data;

 .      struct mmo_data_struct *mmo_data;
 .      struct sun_core_struct *sun_core_data;
 .      struct sco5_core_struct *sco5_core_data;
 .      struct mmo_data_struct *mmo_data;
 .      struct sun_core_struct *sun_core_data;
 .      struct sco5_core_struct *sco5_core_data;


@@ -354,6 +362,78 @@ CODE_FRAGMENT
 .  const struct bfd_build_id *build_id;
 .};
 .
 .  const struct bfd_build_id *build_id;
 .};
 .

+.static inline const char *
+.bfd_get_filename (const bfd *abfd)
+.{
+.  return abfd->filename;
+.}
+.
+.static inline bfd_boolean
+.bfd_get_cacheable (const bfd *abfd)
+.{
+.  return abfd->cacheable;
+.}
+.
+.static inline enum bfd_format
+.bfd_get_format (const bfd *abfd)
+.{
+.  return abfd->format;
+.}
+.
+.static inline flagword
+.bfd_get_file_flags (const bfd *abfd)
+.{
+.  return abfd->flags;
+.}
+.
+.static inline bfd_vma
+.bfd_get_start_address (const bfd *abfd)
+.{
+.  return abfd->start_address;
+.}
+.
+.static inline unsigned int
+.bfd_get_symcount (const bfd *abfd)
+.{
+.  return abfd->symcount;
+.}
+.
+.static inline unsigned int
+.bfd_get_dynamic_symcount (const bfd *abfd)
+.{
+.  return abfd->dynsymcount;
+.}
+.
+.static inline struct bfd_symbol **
+.bfd_get_outsymbols (const bfd *abfd)
+.{
+.  return abfd->outsymbols;
+.}
+.
+.static inline unsigned int
+.bfd_count_sections (const bfd *abfd)
+.{
+.  return abfd->section_count;
+.}
+.
+.static inline bfd_boolean
+.bfd_has_map (const bfd *abfd)
+.{
+.  return abfd->has_armap;
+.}
+.
+.static inline bfd_boolean
+.bfd_is_thin_archive (const bfd *abfd)
+.{
+.  return abfd->is_thin_archive;
+.}
+.
+.static inline void *
+.bfd_usrdata (const bfd *abfd)
+.{
+.  return abfd->usrdata;
+.}
+.

 .{* See note beside bfd_set_section_userdata.  *}
 .static inline bfd_boolean
 .bfd_set_cacheable (bfd * abfd, bfd_boolean val)
 .{* See note beside bfd_set_section_userdata.  *}
 .static inline bfd_boolean
 .bfd_set_cacheable (bfd * abfd, bfd_boolean val)


@@ -362,6 +442,148 @@ CODE_FRAGMENT
 .  return TRUE;
 .}
 .
 .  return TRUE;
 .}
 .

+.static inline void
+.bfd_set_thin_archive (bfd *abfd, bfd_boolean val)
+.{
+.  abfd->is_thin_archive = val;
+.}
+.
+.static inline void
+.bfd_set_usrdata (bfd *abfd, void *val)
+.{
+.  abfd->usrdata = val;
+.}
+.
+.static inline asection *
+.bfd_asymbol_section (const asymbol *sy)
+.{
+.  return sy->section;
+.}
+.
+.static inline bfd_vma
+.bfd_asymbol_value (const asymbol *sy)
+.{
+.  return sy->section->vma + sy->value;
+.}
+.
+.static inline const char *
+.bfd_asymbol_name (const asymbol *sy)
+.{
+.  return sy->name;
+.}
+.
+.static inline struct bfd *
+.bfd_asymbol_bfd (const asymbol *sy)
+.{
+.  return sy->the_bfd;
+.}
+.
+.static inline void
+.bfd_set_asymbol_name (asymbol *sy, const char *name)
+.{
+.  sy->name = name;
+.}
+.
+.static inline bfd_size_type
+.bfd_get_section_limit_octets (const bfd *abfd, const asection *sec)
+.{
+.  if (abfd->direction != write_direction && sec->rawsize != 0)
+.    return sec->rawsize;
+.  return sec->size;
+.}
+.
+.{* Find the address one past the end of SEC.  *}
+.static inline bfd_size_type
+.bfd_get_section_limit (const bfd *abfd, const asection *sec)
+.{
+.  return (bfd_get_section_limit_octets (abfd, sec)
+.         / bfd_octets_per_byte (abfd, sec));
+.}
+.
+.{* Functions to handle insertion and deletion of a bfd's sections.  These
+.   only handle the list pointers, ie. do not adjust section_count,
+.   target_index etc.  *}
+.static inline void
+.bfd_section_list_remove (bfd *abfd, asection *s)
+.{
+.  asection *next = s->next;
+.  asection *prev = s->prev;
+.  if (prev)
+.    prev->next = next;
+.  else
+.    abfd->sections = next;
+.  if (next)
+.    next->prev = prev;
+.  else
+.    abfd->section_last = prev;
+.}
+.
+.static inline void
+.bfd_section_list_append (bfd *abfd, asection *s)
+.{
+.  s->next = 0;
+.  if (abfd->section_last)
+.    {
+.      s->prev = abfd->section_last;
+.      abfd->section_last->next = s;
+.    }
+.  else
+.    {
+.      s->prev = 0;
+.      abfd->sections = s;
+.    }
+.  abfd->section_last = s;
+.}
+.
+.static inline void
+.bfd_section_list_prepend (bfd *abfd, asection *s)
+.{
+.  s->prev = 0;
+.  if (abfd->sections)
+.    {
+.      s->next = abfd->sections;
+.      abfd->sections->prev = s;
+.    }
+.  else
+.    {
+.      s->next = 0;
+.      abfd->section_last = s;
+.    }
+.  abfd->sections = s;
+.}
+.
+.static inline void
+.bfd_section_list_insert_after (bfd *abfd, asection *a, asection *s)
+.{
+.  asection *next = a->next;
+.  s->next = next;
+.  s->prev = a;
+.  a->next = s;
+.  if (next)
+.    next->prev = s;
+.  else
+.    abfd->section_last = s;
+.}
+.
+.static inline void
+.bfd_section_list_insert_before (bfd *abfd, asection *b, asection *s)
+.{
+.  asection *prev = b->prev;
+.  s->prev = prev;
+.  s->next = b;
+.  b->prev = s;
+.  if (prev)
+.    prev->next = s;
+.  else
+.    abfd->sections = s;
+.}
+.
+.static inline bfd_boolean
+.bfd_section_removed_from_list (const bfd *abfd, const asection *s)
+.{
+.  return s->next ? s->next->prev != s : abfd->section_last != s;
+.}
+.

 */
 
 #include "sysdep.h"
 */
 
 #include "sysdep.h"


@@ -438,6 +660,7 @@ CODE_FRAGMENT
 .  bfd_error_bad_value,
 .  bfd_error_file_truncated,
 .  bfd_error_file_too_big,
 .  bfd_error_bad_value,
 .  bfd_error_file_truncated,
 .  bfd_error_file_too_big,

+.  bfd_error_sorry,

 .  bfd_error_on_input,
 .  bfd_error_invalid_error_code
 .}
 .  bfd_error_on_input,
 .  bfd_error_invalid_error_code
 .}


@@ -471,6 +694,7 @@ const char *const bfd_errmsgs[] =
   N_("bad value"),
   N_("file truncated"),
   N_("file too big"),
   N_("bad value"),
   N_("file truncated"),
   N_("file too big"),

+  N_("sorry, cannot handle this file"),

   N_("error reading %s: %s"),
   N_("#<invalid error code>")
 };
   N_("error reading %s: %s"),
   N_("#<invalid error code>")
 };


@@ -563,8 +787,8 @@ bfd_errmsg (bfd_error_type error_tag)
       char *buf;
       const char *msg = bfd_errmsg (input_error);
 
       char *buf;
       const char *msg = bfd_errmsg (input_error);
 

-      if (asprintf (&buf, _(bfd_errmsgs [error_tag]), input_bfd->filename, msg)
-         != -1)
+      if (asprintf (&buf, _(bfd_errmsgs [error_tag]),
+                   bfd_get_filename (input_bfd), msg) != -1)

        return buf;
 
       /* Ick, what to do on out of memory?  */
        return buf;
 
       /* Ick, what to do on out of memory?  */


@@ -890,10 +1114,10 @@ _bfd_doprnt (FILE *stream, const char *format, union _bfd_doprnt_args *args)
                  else if (abfd->my_archive
                           && !bfd_is_thin_archive (abfd->my_archive))
                    result = fprintf (stream, "%s(%s)",
                  else if (abfd->my_archive
                           && !bfd_is_thin_archive (abfd->my_archive))
                    result = fprintf (stream, "%s(%s)",

-                                     abfd->my_archive->filename,
-                                     abfd->filename);
+                                     bfd_get_filename (abfd->my_archive),
+                                     bfd_get_filename (abfd));

                  else
                  else

-                   result = fprintf (stream, "%s", abfd->filename);
+                   result = fprintf (stream, "%s", bfd_get_filename (abfd));

                }
              else
                PRINT_TYPE (void *, p);
                }
              else
                PRINT_TYPE (void *, p);


@@ -1093,14 +1317,6 @@ _bfd_doprnt_scan (const char *format, union _bfd_doprnt_args *args)
   return arg_count;
 }
 
   return arg_count;
 }
 

-/* This is the default routine to handle BFD error messages.
-   Like fprintf (stderr, ...), but also handles some extra format specifiers.
-
-   %pA section name from section.  For group components, prints group name too.
-   %pB file name from bfd.  For archive components, prints archive too.
-
-   Beware: Only supports a maximum of 9 format arguments.  */
-

 static void
 error_handler_internal (const char *fmt, va_list ap)
 {
 static void
 error_handler_internal (const char *fmt, va_list ap)
 {


@@ -1162,6 +1378,26 @@ error_handler_internal (const char *fmt, va_list ap)
 
 static bfd_error_handler_type _bfd_error_internal = error_handler_internal;
 
 
 static bfd_error_handler_type _bfd_error_internal = error_handler_internal;
 

+/*
+FUNCTION
+       _bfd_error_handler
+
+SYNOPSIS
+       void _bfd_error_handler (const char *fmt, ...) ATTRIBUTE_PRINTF_1;
+
+DESCRIPTION
+       This is the default routine to handle BFD error messages.
+       Like fprintf (stderr, ...), but also handles some extra format
+       specifiers.
+
+       %pA section name from section.  For group components, prints
+       group name too.
+       %pB file name from bfd.  For archive components, prints
+       archive too.
+
+       Beware: Only supports a maximum of 9 format arguments.
+*/
+

 void
 _bfd_error_handler (const char *fmt, ...)
 {
 void
 _bfd_error_handler (const char *fmt, ...)
 {


@@ -1405,7 +1641,7 @@ bfd_set_file_flags (bfd *abfd, flagword flags)
       return FALSE;
     }
 
       return FALSE;
     }
 

-  bfd_get_file_flags (abfd) = flags;
+  abfd->flags = flags;

   if ((flags & bfd_applicable_file_flags (abfd)) != flags)
     {
       bfd_set_error (bfd_error_invalid_operation);
   if ((flags & bfd_applicable_file_flags (abfd)) != flags)
     {
       bfd_set_error (bfd_error_invalid_operation);


@@ -1494,7 +1730,7 @@ RETURNS
 int
 bfd_get_sign_extend_vma (bfd *abfd)
 {
 int
 bfd_get_sign_extend_vma (bfd *abfd)
 {

-  char *name;
+  const char *name;

 
   if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
     return get_elf_backend_data (abfd)->sign_extend_vma;
 
   if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
     return get_elf_backend_data (abfd)->sign_extend_vma;


@@ -1826,7 +2062,8 @@ DESCRIPTION
 .      BFD_SEND (abfd, _bfd_debug_info_accumulate, (abfd, section))
 .
 .#define bfd_stat_arch_elt(abfd, stat) \
 .      BFD_SEND (abfd, _bfd_debug_info_accumulate, (abfd, section))
 .
 .#define bfd_stat_arch_elt(abfd, stat) \

-.      BFD_SEND (abfd, _bfd_stat_arch_elt,(abfd, stat))
+.      BFD_SEND (abfd->my_archive ? abfd->my_archive : abfd, \
+.                _bfd_stat_arch_elt, (abfd, stat))

 .
 .#define bfd_update_armap_timestamp(abfd) \
 .      BFD_SEND (abfd, _bfd_update_armap_timestamp, (abfd))
 .
 .#define bfd_update_armap_timestamp(abfd) \
 .      BFD_SEND (abfd, _bfd_update_armap_timestamp, (abfd))


@@ -1849,6 +2086,9 @@ DESCRIPTION
 .#define bfd_is_group_section(abfd, sec) \
 .      BFD_SEND (abfd, _bfd_is_group_section, (abfd, sec))
 .
 .#define bfd_is_group_section(abfd, sec) \
 .      BFD_SEND (abfd, _bfd_is_group_section, (abfd, sec))
 .

+.#define bfd_group_name(abfd, sec) \
+.      BFD_SEND (abfd, _bfd_group_name, (abfd, sec))
+.

 .#define bfd_discard_group(abfd, sec) \
 .      BFD_SEND (abfd, _bfd_discard_group, (abfd, sec))
 .
 .#define bfd_discard_group(abfd, sec) \
 .      BFD_SEND (abfd, _bfd_discard_group, (abfd, sec))
 .


@@ -1927,14 +2167,15 @@ bfd_record_phdr (bfd *abfd,
                 bfd_boolean flags_valid,
                 flagword flags,
                 bfd_boolean at_valid,
                 bfd_boolean flags_valid,
                 flagword flags,
                 bfd_boolean at_valid,

-                bfd_vma at,
+                bfd_vma at,  /* Bytes.  */

                 bfd_boolean includes_filehdr,
                 bfd_boolean includes_phdrs,
                 unsigned int count,
                 asection **secs)
 {
   struct elf_segment_map *m, **pm;
                 bfd_boolean includes_filehdr,
                 bfd_boolean includes_phdrs,
                 unsigned int count,
                 asection **secs)
 {
   struct elf_segment_map *m, **pm;

-  bfd_size_type amt;
+  size_t amt;
+  unsigned int opb = bfd_octets_per_byte (abfd, NULL);

 
   if (bfd_get_flavour (abfd) != bfd_target_elf_flavour)
     return TRUE;
 
   if (bfd_get_flavour (abfd) != bfd_target_elf_flavour)
     return TRUE;


@@ -1947,7 +2188,7 @@ bfd_record_phdr (bfd *abfd,
 
   m->p_type = type;
   m->p_flags = flags;
 
   m->p_type = type;
   m->p_flags = flags;

-  m->p_paddr = at;
+  m->p_paddr = at * opb;

   m->p_flags_valid = flags_valid;
   m->p_paddr_valid = at_valid;
   m->includes_filehdr = includes_filehdr;
   m->p_flags_valid = flags_valid;
   m->p_paddr_valid = at_valid;
   m->includes_filehdr = includes_filehdr;


@@ -2138,7 +2379,7 @@ FUNCTION
        bfd_emul_get_commonpagesize
 
 SYNOPSIS
        bfd_emul_get_commonpagesize
 
 SYNOPSIS

-       bfd_vma bfd_emul_get_commonpagesize (const char *);
+       bfd_vma bfd_emul_get_commonpagesize (const char *, bfd_boolean);

 
 DESCRIPTION
        Returns the common page size, in bytes, as determined by
 
 DESCRIPTION
        Returns the common page size, in bytes, as determined by


@@ -2149,15 +2390,22 @@ RETURNS
 */
 
 bfd_vma
 */
 
 bfd_vma

-bfd_emul_get_commonpagesize (const char *emul)
+bfd_emul_get_commonpagesize (const char *emul, bfd_boolean relro)

 {
   const bfd_target *target;
 
   target = bfd_find_target (emul, NULL);
   if (target != NULL
       && target->flavour == bfd_target_elf_flavour)
 {
   const bfd_target *target;
 
   target = bfd_find_target (emul, NULL);
   if (target != NULL
       && target->flavour == bfd_target_elf_flavour)

-    return xvec_get_elf_backend_data (target)->commonpagesize;
+    {
+      const struct elf_backend_data *bed;

 
 

+      bed = xvec_get_elf_backend_data (target);
+      if (relro)
+       return bed->relropagesize;
+      else
+       return bed->commonpagesize;
+    }

   return 0;
 }
 
   return 0;
 }
 


@@ -2239,8 +2487,7 @@ bfd_demangle (bfd *abfd, const char *name, int options)
 
   res = cplus_demangle (name, options);
 
 
   res = cplus_demangle (name, options);
 

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

 
   if (res == NULL)
     {
 
   if (res == NULL)
     {


@@ -2298,53 +2545,57 @@ void
 bfd_update_compression_header (bfd *abfd, bfd_byte *contents,
                               asection *sec)
 {
 bfd_update_compression_header (bfd *abfd, bfd_byte *contents,
                               asection *sec)
 {

-  if ((abfd->flags & BFD_COMPRESS) != 0)
+  if ((abfd->flags & BFD_COMPRESS) == 0)
+    abort ();
+
+  switch (bfd_get_flavour (abfd))

     {
     {

-      if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
+    case bfd_target_elf_flavour:
+      if ((abfd->flags & BFD_COMPRESS_GABI) != 0)

        {
        {

-         if ((abfd->flags & BFD_COMPRESS_GABI) != 0)
-           {
-             const struct elf_backend_data *bed
-               = get_elf_backend_data (abfd);
+         const struct elf_backend_data *bed = get_elf_backend_data (abfd);

 
 

-             /* Set the SHF_COMPRESSED bit.  */
-             elf_section_flags (sec) |= SHF_COMPRESSED;
+         /* Set the SHF_COMPRESSED bit.  */
+         elf_section_flags (sec) |= SHF_COMPRESSED;

 
 

-             if (bed->s->elfclass == ELFCLASS32)
-               {
-                 Elf32_External_Chdr *echdr
-                   = (Elf32_External_Chdr *) contents;
-                 bfd_put_32 (abfd, ELFCOMPRESS_ZLIB, &echdr->ch_type);
-                 bfd_put_32 (abfd, sec->size, &echdr->ch_size);
-                 bfd_put_32 (abfd, 1 << sec->alignment_power,
-                             &echdr->ch_addralign);
-               }
-             else
-               {
-                 Elf64_External_Chdr *echdr
-                   = (Elf64_External_Chdr *) contents;
-                 bfd_put_32 (abfd, ELFCOMPRESS_ZLIB, &echdr->ch_type);
-                 bfd_put_32 (abfd, 0, &echdr->ch_reserved);
-                 bfd_put_64 (abfd, sec->size, &echdr->ch_size);
-                 bfd_put_64 (abfd, 1 << sec->alignment_power,
-                             &echdr->ch_addralign);
-               }
+         if (bed->s->elfclass == ELFCLASS32)
+           {
+             Elf32_External_Chdr *echdr = (Elf32_External_Chdr *) contents;
+             bfd_put_32 (abfd, ELFCOMPRESS_ZLIB, &echdr->ch_type);
+             bfd_put_32 (abfd, sec->size, &echdr->ch_size);
+             bfd_put_32 (abfd, 1 << sec->alignment_power,
+                         &echdr->ch_addralign);
+             /* bfd_log2 (alignof (Elf32_Chdr)) */
+             bfd_set_section_alignment (sec, 2);

            }
          else
            {
            }
          else
            {

-             /* Clear the SHF_COMPRESSED bit.  */
-             elf_section_flags (sec) &= ~SHF_COMPRESSED;
-
-             /* Write the zlib header.  It should be "ZLIB" followed by
-                the uncompressed section size, 8 bytes in big-endian
-                order.  */
-             memcpy (contents, "ZLIB", 4);
-             bfd_putb64 (sec->size, contents + 4);
+             Elf64_External_Chdr *echdr = (Elf64_External_Chdr *) contents;
+             bfd_put_32 (abfd, ELFCOMPRESS_ZLIB, &echdr->ch_type);
+             bfd_put_32 (abfd, 0, &echdr->ch_reserved);
+             bfd_put_64 (abfd, sec->size, &echdr->ch_size);
+             bfd_put_64 (abfd, 1 << sec->alignment_power,
+                         &echdr->ch_addralign);
+             /* bfd_log2 (alignof (Elf64_Chdr)) */
+             bfd_set_section_alignment (sec, 3);

            }
            }

+         break;

        }
        }

+
+      /* Clear the SHF_COMPRESSED bit.  */
+      elf_section_flags (sec) &= ~SHF_COMPRESSED;
+      /* Fall through.  */
+
+    default:
+      /* Write the zlib header.  It should be "ZLIB" followed by
+        the uncompressed section size, 8 bytes in big-endian
+        order.  */
+      memcpy (contents, "ZLIB", 4);
+      bfd_putb64 (sec->size, contents + 4);
+      /* No way to keep the original alignment, just use 1 always. */
+      bfd_set_section_alignment (sec, 0);
+      break;

     }
     }

-  else
-    abort ();

 }
 
 /*
 }
 
 /*


@@ -2354,12 +2605,14 @@ bfd_update_compression_header (bfd *abfd, bfd_byte *contents,
    SYNOPSIS
        bfd_boolean bfd_check_compression_header
          (bfd *abfd, bfd_byte *contents, asection *sec,
    SYNOPSIS
        bfd_boolean bfd_check_compression_header
          (bfd *abfd, bfd_byte *contents, asection *sec,

-         bfd_size_type *uncompressed_size);
+         bfd_size_type *uncompressed_size,
+         unsigned int *uncompressed_alignment_power);

 
 DESCRIPTION
        Check the compression header at CONTENTS of SEC in ABFD and
 
 DESCRIPTION
        Check the compression header at CONTENTS of SEC in ABFD and

-       store the uncompressed size in UNCOMPRESSED_SIZE if the
-       compression header is valid.
+       store the uncompressed size in UNCOMPRESSED_SIZE and the
+       uncompressed data alignment in UNCOMPRESSED_ALIGNMENT_POWER
+       if the compression header is valid.

 
 RETURNS
        Return TRUE if the compression header is valid.
 
 RETURNS
        Return TRUE if the compression header is valid.


@@ -2368,7 +2621,8 @@ RETURNS
 bfd_boolean
 bfd_check_compression_header (bfd *abfd, bfd_byte *contents,
                              asection *sec,
 bfd_boolean
 bfd_check_compression_header (bfd *abfd, bfd_byte *contents,
                              asection *sec,

-                             bfd_size_type *uncompressed_size)
+                             bfd_size_type *uncompressed_size,
+                             unsigned int *uncompressed_alignment_power)

 {
   if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
       && (elf_section_flags (sec) & SHF_COMPRESSED) != 0)
 {
   if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
       && (elf_section_flags (sec) & SHF_COMPRESSED) != 0)


@@ -2390,9 +2644,10 @@ bfd_check_compression_header (bfd *abfd, bfd_byte *contents,
          chdr.ch_addralign = bfd_get_64 (abfd, &echdr->ch_addralign);
        }
       if (chdr.ch_type == ELFCOMPRESS_ZLIB
          chdr.ch_addralign = bfd_get_64 (abfd, &echdr->ch_addralign);
        }
       if (chdr.ch_type == ELFCOMPRESS_ZLIB

-         && chdr.ch_addralign == 1U << sec->alignment_power)
+         && chdr.ch_addralign == (chdr.ch_addralign & -chdr.ch_addralign))

        {
          *uncompressed_size = chdr.ch_size;
        {
          *uncompressed_size = chdr.ch_size;

+         *uncompressed_alignment_power = bfd_log2 (chdr.ch_addralign);

          return TRUE;
        }
     }
          return TRUE;
        }
     }


@@ -2455,10 +2710,6 @@ bfd_convert_section_size (bfd *ibfd, sec_ptr isec, bfd *obfd,
 {
   bfd_size_type hdr_size;
 
 {
   bfd_size_type hdr_size;
 

-  /* Do nothing if input file will be decompressed.  */
-  if ((ibfd->flags & BFD_DECOMPRESS))
-    return size;
-

   /* Do nothing if either input or output aren't ELF.  */
   if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
   /* Do nothing if either input or output aren't ELF.  */
   if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)


@@ -2469,6 +2720,14 @@ bfd_convert_section_size (bfd *ibfd, sec_ptr isec, bfd *obfd,
       == get_elf_backend_data (obfd)->s->elfclass)
     return size;
 
       == get_elf_backend_data (obfd)->s->elfclass)
     return size;
 

+  /* Convert GNU property size.  */
+  if (CONST_STRNEQ (isec->name, NOTE_GNU_PROPERTY_SECTION_NAME))
+    return _bfd_elf_convert_gnu_property_size (ibfd, obfd);
+
+  /* Do nothing if input file will be decompressed.  */
+  if ((ibfd->flags & BFD_DECOMPRESS))
+    return size;
+

   /* Do nothing if the input section isn't a SHF_COMPRESSED section. */
   hdr_size = bfd_get_compression_header_size (ibfd, isec);
   if (hdr_size == 0)
   /* Do nothing if the input section isn't a SHF_COMPRESSED section. */
   hdr_size = bfd_get_compression_header_size (ibfd, isec);
   if (hdr_size == 0)


@@ -2509,25 +2768,36 @@ bfd_convert_section_contents (bfd *ibfd, sec_ptr isec, bfd *obfd,
   Elf_Internal_Chdr chdr;
   bfd_boolean use_memmove;
 
   Elf_Internal_Chdr chdr;
   bfd_boolean use_memmove;
 

-  /* Do nothing if input file will be decompressed.  */
-  if ((ibfd->flags & BFD_DECOMPRESS))
-    return TRUE;
-

   /* Do nothing if either input or output aren't ELF.  */
   if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
     return TRUE;
 
   /* Do nothing if either input or output aren't ELF.  */
   if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
     return TRUE;
 

-  /* Do nothing if ELF classes of input and output are the same. */
+  /* Do nothing if ELF classes of input and output are the same.  */

   if (get_elf_backend_data (ibfd)->s->elfclass
       == get_elf_backend_data (obfd)->s->elfclass)
     return TRUE;
 
   if (get_elf_backend_data (ibfd)->s->elfclass
       == get_elf_backend_data (obfd)->s->elfclass)
     return TRUE;
 

-  /* Do nothing if the input section isn't a SHF_COMPRESSED section. */
+  /* Convert GNU properties.  */
+  if (CONST_STRNEQ (isec->name, NOTE_GNU_PROPERTY_SECTION_NAME))
+    return _bfd_elf_convert_gnu_properties (ibfd, isec, obfd, ptr,
+                                           ptr_size);
+
+  /* Do nothing if input file will be decompressed.  */
+  if ((ibfd->flags & BFD_DECOMPRESS))
+    return TRUE;
+
+  /* Do nothing if the input section isn't a SHF_COMPRESSED section.  */

   ihdr_size = bfd_get_compression_header_size (ibfd, isec);
   if (ihdr_size == 0)
     return TRUE;
 
   ihdr_size = bfd_get_compression_header_size (ibfd, isec);
   if (ihdr_size == 0)
     return TRUE;
 

+  /* PR 25221.  Check for corrupt input sections.  */
+  if (ihdr_size > bfd_get_section_limit (ibfd, isec))
+    /* FIXME: Issue a warning about a corrupt
+       compression header size field ?  */
+    return FALSE;
+

   contents = *ptr;
 
   /* Convert the contents of the input SHF_COMPRESSED section to
   contents = *ptr;
 
   /* Convert the contents of the input SHF_COMPRESSED section to


@@ -2544,6 +2814,12 @@ bfd_convert_section_contents (bfd *ibfd, sec_ptr isec, bfd *obfd,
 
       use_memmove = FALSE;
     }
 
       use_memmove = FALSE;
     }

+  else if (ihdr_size != sizeof (Elf64_External_Chdr))
+    {
+      /* FIXME: Issue a warning about a corrupt
+        compression header size field ?  */
+      return FALSE;
+    }

   else
     {
       Elf64_External_Chdr *echdr = (Elf64_External_Chdr *) contents;
   else
     {
       Elf64_External_Chdr *echdr = (Elf64_External_Chdr *) contents;


@@ -2555,7 +2831,7 @@ bfd_convert_section_contents (bfd *ibfd, sec_ptr isec, bfd *obfd,
       use_memmove = TRUE;
     }
 
       use_memmove = TRUE;
     }
 

-  size = bfd_get_section_size (isec) - ihdr_size + ohdr_size;
+  size = bfd_section_size (isec) - ihdr_size + ohdr_size;

   if (!use_memmove)
     {
       contents = (bfd_byte *) bfd_malloc (size);
   if (!use_memmove)
     {
       contents = (bfd_byte *) bfd_malloc (size);