* Makefile.am (libbfd.h): Add "Extracted from.." comment.

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

diff --git a/bfd/section.c b/bfd/section.c
index 469b0262e50ef2120b92dcd22c20ed2eb223ca79..70c7f27d029c5e6f38027da3d705026b9871b1a4 100644 (file)
--- a/bfd/section.c
+++ b/bfd/section.c
@@ -1,5 +1,7 @@
 /* Object file "section" support for the BFD library.
 /* Object file "section" support for the BFD library.

-   Copyright (C) 1990, 91, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002
+   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.


@@ -110,7 +112,6 @@ SUBSECTION
 |     size            0x103   |
 |     output_section  --------|
 
 |     size            0x103   |
 |     output_section  --------|
 

-

 SUBSECTION
        Link orders
 
 SUBSECTION
        Link orders
 


@@ -132,11 +133,10 @@ SUBSECTION
 
 */
 
 
 */
 

-

 #include "bfd.h"
 #include "sysdep.h"
 #include "libbfd.h"
 #include "bfd.h"
 #include "sysdep.h"
 #include "libbfd.h"

-
+#include "bfdlink.h"

 
 /*
 DOCDD
 
 /*
 DOCDD


@@ -149,310 +149,474 @@ SUBSECTION
 
 CODE_FRAGMENT
 .
 
 CODE_FRAGMENT
 .

-.typedef struct sec
-.{
-.        {* The name of the section; the name isn't a copy, the pointer is
-.        the same as that passed to bfd_make_section. *}
+.{* This structure is used for a comdat section, as in PE.  A comdat
+.   section is associated with a particular symbol.  When the linker
+.   sees a comdat section, it keeps only one of the sections with a
+.   given name and associated with a given symbol.  *}

 .
 .

-.    CONST char *name;
+.struct bfd_comdat_info
+.{
+.  {* The name of the symbol associated with a comdat section.  *}
+.  const char *name;

 .
 .

-.        {* Which section is it; 0..nth.      *}
+.  {* The local symbol table index of the symbol associated with a
+.     comdat section.  This is only meaningful to the object file format
+.     specific code; it is not an index into the list returned by
+.     bfd_canonicalize_symtab.  *}
+.  long symbol;
+.};

 .
 .

-.   int index;
+.typedef struct sec
+.{
+.  {* The name of the section; the name isn't a copy, the pointer is
+.     the same as that passed to bfd_make_section.  *}
+.  const char *name;

 .
 .

-.        {* The next section in the list belonging to the BFD, or NULL. *}
+.  {* A unique sequence number.  *}
+.  int id;

 .
 .

-.    struct sec *next;
+.  {* Which section in the bfd; 0..n-1 as sections are created in a bfd.  *}
+.  int index;

 .
 .

-.        {* The field flags contains attributes of the section. Some
-.           flags are read in from the object file, and some are
-.           synthesized from other information.  *}
+.  {* The next section in the list belonging to the BFD, or NULL.  *}
+.  struct sec *next;

 .
 .

-.    flagword flags;
+.  {* The field flags contains attributes of the section. Some
+.     flags are read in from the object file, and some are
+.     synthesized from other information.  *}
+.  flagword flags;

 .
 .#define SEC_NO_FLAGS   0x000
 .
 .
 .#define SEC_NO_FLAGS   0x000
 .

-.        {* Tells the OS to allocate space for this section when loading.
-.           This is clear for a section containing debug information
-.           only. *}
+.  {* Tells the OS to allocate space for this section when loading.
+.     This is clear for a section containing debug information only.  *}

 .#define SEC_ALLOC      0x001
 .
 .#define SEC_ALLOC      0x001
 .

-.        {* Tells the OS to load the section from the file when loading.
-.           This is clear for a .bss section. *}
+.  {* Tells the OS to load the section from the file when loading.
+.     This is clear for a .bss section.  *}

 .#define SEC_LOAD       0x002
 .
 .#define SEC_LOAD       0x002
 .

-.        {* The section contains data still to be relocated, so there is
-.           some relocation information too. *}
+.  {* The section contains data still to be relocated, so there is
+.     some relocation information too.  *}

 .#define SEC_RELOC      0x004
 .
 .#define SEC_RELOC      0x004
 .

-.#if 0   {* Obsolete ? *}
-.#define SEC_BALIGN     0x008
-.#endif
+.  {* ELF reserves 4 processor specific bits and 8 operating system
+.     specific bits in sh_flags; at present we can get away with just
+.     one in communicating between the assembler and BFD, but this
+.     isn't a good long-term solution.  *}
+.#define SEC_ARCH_BIT_0 0x008

 .
 .

-.        {* A signal to the OS that the section contains read only
-.          data. *}
+.  {* A signal to the OS that the section contains read only data.  *}

 .#define SEC_READONLY   0x010
 .
 .#define SEC_READONLY   0x010
 .

-.        {* The section contains code only. *}
+.  {* The section contains code only.  *}

 .#define SEC_CODE       0x020
 .
 .#define SEC_CODE       0x020
 .

-.        {* The section contains data only. *}
+.  {* The section contains data only.  *}

 .#define SEC_DATA       0x040
 .
 .#define SEC_DATA       0x040
 .

-.        {* The section will reside in ROM. *}
+.  {* The section will reside in ROM.  *}

 .#define SEC_ROM        0x080
 .
 .#define SEC_ROM        0x080
 .

-.        {* The section contains constructor information. This section
-.           type is used by the linker to create lists of constructors and
-.           destructors used by <<g++>>. When a back end sees a symbol
-.           which should be used in a constructor list, it creates a new
-.           section for the type of name (e.g., <<__CTOR_LIST__>>), attaches
-.           the symbol to it, and builds a relocation. To build the lists
-.           of constructors, all the linker has to do is catenate all the
-.           sections called <<__CTOR_LIST__>> and relocate the data
-.           contained within - exactly the operations it would peform on
-.           standard data. *}
+.  {* The section contains constructor information. This section
+.     type is used by the linker to create lists of constructors and
+.     destructors used by <<g++>>. When a back end sees a symbol
+.     which should be used in a constructor list, it creates a new
+.     section for the type of name (e.g., <<__CTOR_LIST__>>), attaches
+.     the symbol to it, and builds a relocation. To build the lists
+.     of constructors, all the linker has to do is catenate all the
+.     sections called <<__CTOR_LIST__>> and relocate the data
+.     contained within - exactly the operations it would peform on
+.     standard data.  *}

 .#define SEC_CONSTRUCTOR 0x100
 .
 .#define SEC_CONSTRUCTOR 0x100
 .

-.        {* The section is a constuctor, and should be placed at the
-.          end of the text, data, or bss section(?). *}
-.#define SEC_CONSTRUCTOR_TEXT 0x1100
-.#define SEC_CONSTRUCTOR_DATA 0x2100
-.#define SEC_CONSTRUCTOR_BSS  0x3100
-.
-.        {* The section has contents - a data section could be
-.           <<SEC_ALLOC>> | <<SEC_HAS_CONTENTS>>; a debug section could be
-.           <<SEC_HAS_CONTENTS>> *}
+.  {* The section has contents - a data section could be
+.     <<SEC_ALLOC>> | <<SEC_HAS_CONTENTS>>; a debug section could be
+.     <<SEC_HAS_CONTENTS>>  *}

 .#define SEC_HAS_CONTENTS 0x200
 .
 .#define SEC_HAS_CONTENTS 0x200
 .

-.        {* An instruction to the linker to not output the section
-.           even if it has information which would normally be written. *}
+.  {* An instruction to the linker to not output the section
+.     even if it has information which would normally be written.  *}

 .#define SEC_NEVER_LOAD 0x400
 .
 .#define SEC_NEVER_LOAD 0x400
 .

-.        {* The section is a COFF shared library section.  This flag is
-.           only for the linker.  If this type of section appears in
-.           the input file, the linker must copy it to the output file
-.           without changing the vma or size.  FIXME: Although this
-.           was originally intended to be general, it really is COFF
-.           specific (and the flag was renamed to indicate this).  It
-.           might be cleaner to have some more general mechanism to
-.           allow the back end to control what the linker does with
-.           sections. *}
+.  {* The section is a COFF shared library section.  This flag is
+.     only for the linker.  If this type of section appears in
+.     the input file, the linker must copy it to the output file
+.     without changing the vma or size.  FIXME: Although this
+.     was originally intended to be general, it really is COFF
+.     specific (and the flag was renamed to indicate this).  It
+.     might be cleaner to have some more general mechanism to
+.     allow the back end to control what the linker does with
+.     sections.  *}

 .#define SEC_COFF_SHARED_LIBRARY 0x800
 .
 .#define SEC_COFF_SHARED_LIBRARY 0x800
 .

-.        {* The section is a common section (symbols may be defined
-.           multiple times, the value of a symbol is the amount of
-.           space it requires, and the largest symbol value is the one
-.           used).  Most targets have exactly one of these (which we
-.          translate to bfd_com_section_ptr), but ECOFF has two. *}
+.  {* The section contains thread local data.  *}
+.#define SEC_THREAD_LOCAL 0x1000
+.
+.  {* The section has GOT references.  This flag is only for the
+.     linker, and is currently only used by the elf32-hppa back end.
+.     It will be set if global offset table references were detected
+.     in this section, which indicate to the linker that the section
+.     contains PIC code, and must be handled specially when doing a
+.     static link.  *}
+.#define SEC_HAS_GOT_REF 0x4000
+.
+.  {* The section contains common symbols (symbols may be defined
+.     multiple times, the value of a symbol is the amount of
+.     space it requires, and the largest symbol value is the one
+.     used).  Most targets have exactly one of these (which we
+.     translate to bfd_com_section_ptr), but ECOFF has two.  *}

 .#define SEC_IS_COMMON 0x8000
 .
 .#define SEC_IS_COMMON 0x8000
 .

-.        {* The section contains only debugging information.  For
-.           example, this is set for ELF .debug and .stab sections.
-.           strip tests this flag to see if a section can be
-.           discarded. *}
+.  {* The section contains only debugging information.  For
+.     example, this is set for ELF .debug and .stab sections.
+.     strip tests this flag to see if a section can be
+.     discarded.  *}

 .#define SEC_DEBUGGING 0x10000
 .
 .#define SEC_DEBUGGING 0x10000
 .

-.        {* The contents of this section are held in memory pointed to
-.           by the contents field.  This is checked by
-.           bfd_get_section_contents, and the data is retrieved from
-.           memory if appropriate.  *}
+.  {* The contents of this section are held in memory pointed to
+.     by the contents field.  This is checked by bfd_get_section_contents,
+.     and the data is retrieved from memory if appropriate.  *}

 .#define SEC_IN_MEMORY 0x20000
 .
 .#define SEC_IN_MEMORY 0x20000
 .

-.        {* The contents of this section are to be excluded by the
-.          linker for executable and shared objects unless those
-.          objects are to be further relocated.  *}
+.  {* The contents of this section are to be excluded by the
+.     linker for executable and shared objects unless those
+.     objects are to be further relocated.  *}

 .#define SEC_EXCLUDE 0x40000
 .
 .#define SEC_EXCLUDE 0x40000
 .

-.      {* The contents of this section are to be sorted by the
-.         based on the address specified in the associated symbol
-.         table.  *}
+.  {* The contents of this section are to be sorted based on the sum of
+.     the symbol and addend values specified by the associated relocation
+.     entries.  Entries without associated relocation entries will be
+.     appended to the end of the section in an unspecified order.  *}

 .#define SEC_SORT_ENTRIES 0x80000
 .
 .#define SEC_SORT_ENTRIES 0x80000
 .

-.      {*  End of section flags.  *}
-.
-.      {* Some internal packed boolean fields.  *}
-.
-.      {* See the vma field.  *}
-.      unsigned int user_set_vma : 1;
-.
-.      {* Whether relocations have been processed.  *}
-.      unsigned int reloc_done : 1;
-.
-.      {* A mark flag used by some of the linker backends.  *}
-.      unsigned int linker_mark : 1;
+.  {* When linking, duplicate sections of the same name should be
+.     discarded, rather than being combined into a single section as
+.     is usually done.  This is similar to how common symbols are
+.     handled.  See SEC_LINK_DUPLICATES below.  *}
+.#define SEC_LINK_ONCE 0x100000

 .
 .

-.      {* End of internal packed boolean fields.  *}
+.  {* If SEC_LINK_ONCE is set, this bitfield describes how the linker
+.     should handle duplicate sections.  *}
+.#define SEC_LINK_DUPLICATES 0x600000

 .
 .

-.       {*  The virtual memory address of the section - where it will be
-.           at run time.  The symbols are relocated against this.  The
-.          user_set_vma flag is maintained by bfd; if it's not set, the
-.          backend can assign addresses (for example, in <<a.out>>, where
-.          the default address for <<.data>> is dependent on the specific
-.          target and various flags).  *}
+.  {* This value for SEC_LINK_DUPLICATES means that duplicate
+.     sections with the same name should simply be discarded.  *}
+.#define SEC_LINK_DUPLICATES_DISCARD 0x0

 .
 .

-.   bfd_vma vma;
+.  {* This value for SEC_LINK_DUPLICATES means that the linker
+.     should warn if there are any duplicate sections, although
+.     it should still only link one copy.  *}
+.#define SEC_LINK_DUPLICATES_ONE_ONLY 0x200000
+.
+.  {* This value for SEC_LINK_DUPLICATES means that the linker
+.     should warn if any duplicate sections are a different size.  *}
+.#define SEC_LINK_DUPLICATES_SAME_SIZE 0x400000
+.
+.  {* This value for SEC_LINK_DUPLICATES means that the linker
+.     should warn if any duplicate sections contain different
+.     contents.  *}
+.#define SEC_LINK_DUPLICATES_SAME_CONTENTS 0x600000
+.
+.  {* This section was created by the linker as part of dynamic
+.     relocation or other arcane processing.  It is skipped when
+.     going through the first-pass output, trusting that someone
+.     else up the line will take care of it later.  *}
+.#define SEC_LINKER_CREATED 0x800000
+.
+.  {* This section should not be subject to garbage collection.  *}
+.#define SEC_KEEP 0x1000000
+.
+.  {* This section contains "short" data, and should be placed
+.     "near" the GP.  *}
+.#define SEC_SMALL_DATA 0x2000000
+.
+.  {* This section contains data which may be shared with other
+.     executables or shared objects.  *}
+.#define SEC_SHARED 0x4000000
+.
+.  {* When a section with this flag is being linked, then if the size of
+.     the input section is less than a page, it should not cross a page
+.     boundary.  If the size of the input section is one page or more, it
+.     should be aligned on a page boundary.  *}
+.#define SEC_BLOCK 0x8000000
+.
+.  {* Conditionally link this section; do not link if there are no
+.     references found to any symbol in the section.  *}
+.#define SEC_CLINK 0x10000000

 .
 .

-.       {*  The load address of the section - where it would be in a
-.           rom image; really only used for writing section header
-.          information. *}
+.  {* Attempt to merge identical entities in the section.
+.     Entity size is given in the entsize field.  *}
+.#define SEC_MERGE 0x20000000

 .
 .

-.   bfd_vma lma;
+.  {* If given with SEC_MERGE, entities to merge are zero terminated
+.     strings where entsize specifies character size instead of fixed
+.     size entries.  *}
+.#define SEC_STRINGS 0x40000000

 .
 .

-.        {* The size of the section in bytes, as it will be output.
-.           contains a value even if the section has no contents (e.g., the
-.           size of <<.bss>>). This will be filled in after relocation *}
+.  {* This section contains data about section groups.  *}
+.#define SEC_GROUP 0x80000000

 .
 .

-.   bfd_size_type _cooked_size;
+.  {*  End of section flags.  *}

 .
 .

-.        {* The original size on disk of the section, in bytes.  Normally this
-.          value is the same as the size, but if some relaxing has
-.          been done, then this value will be bigger.  *}
+.  {* Some internal packed boolean fields.  *}

 .
 .

-.   bfd_size_type _raw_size;
+.  {* See the vma field.  *}
+.  unsigned int user_set_vma : 1;

 .
 .

-.        {* If this section is going to be output, then this value is the
-.           offset into the output section of the first byte in the input
-.           section. E.g., if this was going to start at the 100th byte in
-.           the output section, this value would be 100. *}
+.  {* Whether relocations have been processed.  *}
+.  unsigned int reloc_done : 1;

 .
 .

-.   bfd_vma output_offset;
+.  {* A mark flag used by some of the linker backends.  *}
+.  unsigned int linker_mark : 1;

 .
 .

-.        {* The output section through which to map on output. *}
+.  {* Another mark flag used by some of the linker backends.  Set for
+.     output sections that have an input section.  *}
+.  unsigned int linker_has_input : 1;

 .
 .

-.   struct sec *output_section;
+.  {* A mark flag used by some linker backends for garbage collection.  *}
+.  unsigned int gc_mark : 1;

 .
 .

-.        {* The alignment requirement of the section, as an exponent of 2 -
-.           e.g., 3 aligns to 2^3 (or 8). *}
+.  {* Used by the ELF code to mark sections which have been allocated
+.     to segments.  *}
+.  unsigned int segment_mark : 1;

 .
 .

-.   unsigned int alignment_power;
+.  {* End of internal packed boolean fields.  *}

 .
 .

-.        {* If an input section, a pointer to a vector of relocation
-.           records for the data in this section. *}
+.  {*  The virtual memory address of the section - where it will be
+.      at run time.  The symbols are relocated against this.  The
+.      user_set_vma flag is maintained by bfd; if it's not set, the
+.      backend can assign addresses (for example, in <<a.out>>, where
+.      the default address for <<.data>> is dependent on the specific
+.      target and various flags).  *}
+.  bfd_vma vma;

 .
 .

-.   struct reloc_cache_entry *relocation;
+.  {*  The load address of the section - where it would be in a
+.      rom image; really only used for writing section header
+.      information.  *}
+.  bfd_vma lma;

 .
 .

-.        {* If an output section, a pointer to a vector of pointers to
-.           relocation records for the data in this section. *}
+.  {* The size of the section in octets, as it will be output.
+.     Contains a value even if the section has no contents (e.g., the
+.     size of <<.bss>>).  This will be filled in after relocation.  *}
+.  bfd_size_type _cooked_size;

 .
 .

-.   struct reloc_cache_entry **orelocation;
+.  {* The original size on disk of the section, in octets.  Normally this
+.     value is the same as the size, but if some relaxing has
+.     been done, then this value will be bigger.  *}
+.  bfd_size_type _raw_size;

 .
 .

-.        {* The number of relocation records in one of the above  *}
+.  {* If this section is going to be output, then this value is the
+.     offset in *bytes* into the output section of the first byte in the
+.     input section (byte ==> smallest addressable unit on the
+.     target).  In most cases, if this was going to start at the
+.     100th octet (8-bit quantity) in the output section, this value
+.     would be 100.  However, if the target byte size is 16 bits
+.     (bfd_octets_per_byte is "2"), this value would be 50.  *}
+.  bfd_vma output_offset;

 .
 .

-.   unsigned reloc_count;
+.  {* The output section through which to map on output.  *}
+.  struct sec *output_section;

 .
 .

-.        {* Information below is back end specific - and not always used
-.           or updated.  *}
+.  {* The alignment requirement of the section, as an exponent of 2 -
+.     e.g., 3 aligns to 2^3 (or 8).  *}
+.  unsigned int alignment_power;

 .
 .

-.        {* File position of section data    *}
+.  {* If an input section, a pointer to a vector of relocation
+.     records for the data in this section.  *}
+.  struct reloc_cache_entry *relocation;

 .
 .

-.   file_ptr filepos;
+.  {* If an output section, a pointer to a vector of pointers to
+.     relocation records for the data in this section.  *}
+.  struct reloc_cache_entry **orelocation;

 .
 .

-.        {* File position of relocation info *}
+.  {* The number of relocation records in one of the above.  *}
+.  unsigned reloc_count;

 .
 .

-.   file_ptr rel_filepos;
+.  {* Information below is back end specific - and not always used
+.     or updated.  *}

 .
 .

-.        {* File position of line data       *}
+.  {* File position of section data.  *}
+.  file_ptr filepos;

 .
 .

-.   file_ptr line_filepos;
+.  {* File position of relocation info.  *}
+.  file_ptr rel_filepos;

 .
 .

-.        {* Pointer to data for applications *}
+.  {* File position of line data.  *}
+.  file_ptr line_filepos;

 .
 .

-.   PTR userdata;
+.  {* Pointer to data for applications.  *}
+.  PTR userdata;

 .
 .

-.        {* If the SEC_IN_MEMORY flag is set, this points to the actual
-.           contents.  *}
-.   unsigned char *contents;
+.  {* If the SEC_IN_MEMORY flag is set, this points to the actual
+.     contents.  *}
+.  unsigned char *contents;

 .
 .

-.        {* Attached line number information *}
+.  {* Attached line number information.  *}
+.  alent *lineno;

 .
 .

-.   alent *lineno;
+.  {* Number of line number records.  *}
+.  unsigned int lineno_count;

 .
 .

-.        {* Number of line number records   *}
+.  {* Entity size for merging purposes.  *}
+.  unsigned int entsize;

 .
 .

-.   unsigned int lineno_count;
+.  {* Optional information about a COMDAT entry; NULL if not COMDAT.  *}
+.  struct bfd_comdat_info *comdat;

 .
 .

-.        {* When a section is being output, this value changes as more
-.           linenumbers are written out *}
+.  {* When a section is being output, this value changes as more
+.     linenumbers are written out.  *}
+.  file_ptr moving_line_filepos;

 .
 .

-.   file_ptr moving_line_filepos;
+.  {* What the section number is in the target world.  *}
+.  int target_index;

 .
 .

-.        {* What the section number is in the target world  *}
+.  PTR used_by_bfd;

 .
 .

-.   int target_index;
+.  {* If this is a constructor section then here is a list of the
+.     relocations created to relocate items within it.  *}
+.  struct relent_chain *constructor_chain;

 .
 .

-.   PTR used_by_bfd;
+.  {* The BFD which owns the section.  *}
+.  bfd *owner;

 .
 .

-.        {* If this is a constructor section then here is a list of the
-.           relocations created to relocate items within it. *}
+.  {* A symbol which points at this section only.  *}
+.  struct symbol_cache_entry *symbol;
+.  struct symbol_cache_entry **symbol_ptr_ptr;

 .
 .

-.   struct relent_chain *constructor_chain;
+.  struct bfd_link_order *link_order_head;
+.  struct bfd_link_order *link_order_tail;
+.} asection;

 .
 .

-.        {* The BFD which owns the section. *}
-.
-.   bfd *owner;
-.
-.       {* A symbol which points at this section only *}
-.   struct symbol_cache_entry *symbol;
-.   struct symbol_cache_entry **symbol_ptr_ptr;
-.
-.   struct bfd_link_order *link_order_head;
-.   struct bfd_link_order *link_order_tail;
-.} asection ;
-.
-.    {* These sections are global, and are managed by BFD.  The application
-.       and target back end are not permitted to change the values in
-.      these sections.  New code should use the section_ptr macros rather
-.       than referring directly to the const sections.  The const sections
-.       may eventually vanish.  *}
+.{* These sections are global, and are managed by BFD.  The application
+.   and target back end are not permitted to change the values in
+.   these sections.  New code should use the section_ptr macros rather
+.   than referring directly to the const sections.  The const sections
+.   may eventually vanish.  *}

 .#define BFD_ABS_SECTION_NAME "*ABS*"
 .#define BFD_UND_SECTION_NAME "*UND*"
 .#define BFD_COM_SECTION_NAME "*COM*"
 .#define BFD_IND_SECTION_NAME "*IND*"
 .
 .#define BFD_ABS_SECTION_NAME "*ABS*"
 .#define BFD_UND_SECTION_NAME "*UND*"
 .#define BFD_COM_SECTION_NAME "*COM*"
 .#define BFD_IND_SECTION_NAME "*IND*"
 .

-.    {* the absolute section *}
+.{* The absolute section.  *}

 .extern const asection bfd_abs_section;
 .#define bfd_abs_section_ptr ((asection *) &bfd_abs_section)
 .#define bfd_is_abs_section(sec) ((sec) == bfd_abs_section_ptr)
 .extern const asection bfd_abs_section;
 .#define bfd_abs_section_ptr ((asection *) &bfd_abs_section)
 .#define bfd_is_abs_section(sec) ((sec) == bfd_abs_section_ptr)

-.    {* Pointer to the undefined section *}
+.{* Pointer to the undefined section.  *}

 .extern const asection bfd_und_section;
 .#define bfd_und_section_ptr ((asection *) &bfd_und_section)
 .#define bfd_is_und_section(sec) ((sec) == bfd_und_section_ptr)
 .extern const asection bfd_und_section;
 .#define bfd_und_section_ptr ((asection *) &bfd_und_section)
 .#define bfd_is_und_section(sec) ((sec) == bfd_und_section_ptr)

-.    {* Pointer to the common section *}
+.{* Pointer to the common section.  *}

 .extern const asection bfd_com_section;
 .#define bfd_com_section_ptr ((asection *) &bfd_com_section)
 .extern const asection bfd_com_section;
 .#define bfd_com_section_ptr ((asection *) &bfd_com_section)

-.    {* Pointer to the indirect section *}
+.{* Pointer to the indirect section.  *}

 .extern const asection bfd_ind_section;
 .#define bfd_ind_section_ptr ((asection *) &bfd_ind_section)
 .#define bfd_is_ind_section(sec) ((sec) == bfd_ind_section_ptr)
 .
 .extern const asection bfd_ind_section;
 .#define bfd_ind_section_ptr ((asection *) &bfd_ind_section)
 .#define bfd_is_ind_section(sec) ((sec) == bfd_ind_section_ptr)
 .

+.#define bfd_is_const_section(SEC)             \
+. (   ((SEC) == bfd_abs_section_ptr)           \
+.  || ((SEC) == bfd_und_section_ptr)           \
+.  || ((SEC) == bfd_com_section_ptr)           \
+.  || ((SEC) == bfd_ind_section_ptr))
+.

 .extern const struct symbol_cache_entry * const bfd_abs_symbol;
 .extern const struct symbol_cache_entry * const bfd_com_symbol;
 .extern const struct symbol_cache_entry * const bfd_und_symbol;
 .extern const struct symbol_cache_entry * const bfd_ind_symbol;
 .#define bfd_get_section_size_before_reloc(section) \
 .extern const struct symbol_cache_entry * const bfd_abs_symbol;
 .extern const struct symbol_cache_entry * const bfd_com_symbol;
 .extern const struct symbol_cache_entry * const bfd_und_symbol;
 .extern const struct symbol_cache_entry * const bfd_ind_symbol;
 .#define bfd_get_section_size_before_reloc(section) \

-.     (section->reloc_done ? (abort(),1): (section)->_raw_size)
+.     ((section)->reloc_done ? (abort (), (bfd_size_type) 1) \
+.                            : (section)->_raw_size)

 .#define bfd_get_section_size_after_reloc(section) \
 .#define bfd_get_section_size_after_reloc(section) \

-.     ((section->reloc_done) ? (section)->_cooked_size: (abort(),1))
+.     ((section)->reloc_done ? (section)->_cooked_size \
+.                            : (abort (), (bfd_size_type) 1))
+.
+.{* Macros 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.  *}
+.#define bfd_section_list_remove(ABFD, PS) \
+.  do                                                  \
+.    {                                                 \
+.      asection **_ps = PS;                            \
+.      asection *_s = *_ps;                            \
+.      *_ps = _s->next;                                        \
+.      if (_s->next == NULL)                           \
+.        (ABFD)->section_tail = _ps;                   \
+.    }                                                 \
+.  while (0)
+.#define bfd_section_list_insert(ABFD, PS, S) \
+.  do                                                  \
+.    {                                                 \
+.      asection **_ps = PS;                            \
+.      asection *_s = S;                               \
+.      _s->next = *_ps;                                        \
+.      *_ps = _s;                                      \
+.      if (_s->next == NULL)                           \
+.        (ABFD)->section_tail = &_s->next;             \
+.    }                                                 \
+.  while (0)
+.

 */
 
 */
 

+/* We use a macro to initialize the static asymbol structures because
+   traditional C does not permit us to initialize a union member while
+   gcc warns if we don't initialize it.  */
+ /* the_bfd, name, value, attr, section [, udata] */
+#ifdef __STDC__
+#define GLOBAL_SYM_INIT(NAME, SECTION) \
+  { 0, NAME, 0, BSF_SECTION_SYM, (asection *) SECTION, { 0 }}
+#else
+#define GLOBAL_SYM_INIT(NAME, SECTION) \
+  { 0, NAME, 0, BSF_SECTION_SYM, (asection *) SECTION }
+#endif
+

 /* These symbols are global, not specific to any BFD.  Therefore, anything
    that tries to change them is broken, and should be repaired.  */
 /* These symbols are global, not specific to any BFD.  Therefore, anything
    that tries to change them is broken, and should be repaired.  */

+

 static const asymbol global_syms[] =
 {
 static const asymbol global_syms[] =
 {

- /* the_bfd, name, value, attr, section [, udata] */
-  {0, BFD_COM_SECTION_NAME, 0, BSF_SECTION_SYM, (asection *) &bfd_com_section},
-  {0, BFD_UND_SECTION_NAME, 0, BSF_SECTION_SYM, (asection *) &bfd_und_section},
-  {0, BFD_ABS_SECTION_NAME, 0, BSF_SECTION_SYM, (asection *) &bfd_abs_section},
-  {0, BFD_IND_SECTION_NAME, 0, BSF_SECTION_SYM, (asection *) &bfd_ind_section},
+  GLOBAL_SYM_INIT (BFD_COM_SECTION_NAME, &bfd_com_section),
+  GLOBAL_SYM_INIT (BFD_UND_SECTION_NAME, &bfd_und_section),
+  GLOBAL_SYM_INIT (BFD_ABS_SECTION_NAME, &bfd_abs_section),
+  GLOBAL_SYM_INIT (BFD_IND_SECTION_NAME, &bfd_ind_section)

 };
 
 };
 

-#define STD_SECTION(SEC, FLAGS, SYM, NAME, IDX)        \
-  const asymbol * const SYM = (asymbol *) &global_syms[IDX]; \
-  const asection SEC = \
-    { NAME, 0, 0, FLAGS, 0, 0, 0, 0, 0, 0, 0, 0, (asection *) &SEC, \
-      0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0, \
-      (asymbol *) &global_syms[IDX], (asymbol **) &SYM, 0, 0 }
+#define STD_SECTION(SEC, FLAGS, SYM, NAME, IDX)                                \
+  const asymbol * const SYM = (asymbol *) &global_syms[IDX];           \
+  const asection SEC =                                                         \
+    /* name, id,  index, next, flags, user_set_vma, reloc_done,      */        \
+    { NAME,  IDX, 0,     NULL, FLAGS, 0,            0,                 \
+                                                                       \
+    /* linker_mark, linker_has_input, gc_mark, segment_mark,         */        \
+       0,           0,                1,       0,                      \
+                                                                       \
+    /* vma, lma, _cooked_size, _raw_size,                            */        \
+       0,   0,   0,            0,                                      \
+                                                                       \
+    /* output_offset, output_section,      alignment_power,          */        \
+       0,             (struct sec *) &SEC, 0,                          \
+                                                                       \
+    /* relocation, orelocation, reloc_count, filepos, rel_filepos,   */        \
+       NULL,       NULL,        0,           0,       0,               \
+                                                                       \
+    /* line_filepos, userdata, contents, lineno, lineno_count,       */        \
+       0,            NULL,     NULL,     NULL,   0,                    \
+                                                                       \
+    /* entsize, comdat, moving_line_filepos,                         */        \
+       0,       NULL,   0,                                             \
+                                                                       \
+    /* target_index, used_by_bfd, constructor_chain, owner,          */        \
+       0,            NULL,        NULL,              NULL,             \
+                                                                       \
+    /* symbol,                                                       */        \
+       (struct symbol_cache_entry *) &global_syms[IDX],                        \
+                                                                       \
+    /* symbol_ptr_ptr,                                               */        \
+       (struct symbol_cache_entry **) &SYM,                            \
+                                                                       \
+    /* link_order_head, link_order_tail                              */        \
+       NULL,            NULL                                           \
+    }

 
 STD_SECTION (bfd_com_section, SEC_IS_COMMON, bfd_com_symbol,
             BFD_COM_SECTION_NAME, 0);
 
 STD_SECTION (bfd_com_section, SEC_IS_COMMON, bfd_com_symbol,
             BFD_COM_SECTION_NAME, 0);


@@ -461,6 +625,83 @@ STD_SECTION (bfd_abs_section, 0, bfd_abs_symbol, BFD_ABS_SECTION_NAME, 2);
 STD_SECTION (bfd_ind_section, 0, bfd_ind_symbol, BFD_IND_SECTION_NAME, 3);
 #undef STD_SECTION
 
 STD_SECTION (bfd_ind_section, 0, bfd_ind_symbol, BFD_IND_SECTION_NAME, 3);
 #undef STD_SECTION
 

+struct section_hash_entry
+{
+  struct bfd_hash_entry root;
+  asection section;
+};
+
+/* Initialize an entry in the section hash table.  */
+
+struct bfd_hash_entry *
+bfd_section_hash_newfunc (entry, table, string)
+     struct bfd_hash_entry *entry;
+     struct bfd_hash_table *table;
+     const char *string;
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    {
+      entry = bfd_hash_allocate (table, sizeof (struct section_hash_entry));
+      if (entry == NULL)
+       return entry;
+    }
+
+  /* Call the allocation method of the superclass.  */
+  entry = bfd_hash_newfunc (entry, table, string);
+  if (entry != NULL)
+    {
+      memset ((PTR) &((struct section_hash_entry *) entry)->section,
+             0, sizeof (asection));
+    }
+
+  return entry;
+}
+
+#define section_hash_lookup(table, string, create, copy) \
+  ((struct section_hash_entry *) \
+   bfd_hash_lookup ((table), (string), (create), (copy)))
+
+/* Initializes a new section.  NEWSECT->NAME is already set.  */
+
+static asection *bfd_section_init PARAMS ((bfd *, asection *));
+
+static asection *
+bfd_section_init (abfd, newsect)
+     bfd *abfd;
+     asection *newsect;
+{
+  static int section_id = 0x10;  /* id 0 to 3 used by STD_SECTION.  */
+
+  newsect->id = section_id;
+  newsect->index = abfd->section_count;
+  newsect->owner = abfd;
+
+  /* Create a symbol whose only job is to point to this section.  This
+     is useful for things like relocs which are relative to the base
+     of a section.  */
+  newsect->symbol = bfd_make_empty_symbol (abfd);
+  if (newsect->symbol == NULL)
+    return NULL;
+
+  newsect->symbol->name = newsect->name;
+  newsect->symbol->value = 0;
+  newsect->symbol->section = newsect;
+  newsect->symbol->flags = BSF_SECTION_SYM;
+
+  newsect->symbol_ptr_ptr = &newsect->symbol;
+
+  if (! BFD_SEND (abfd, _new_section_hook, (abfd, newsect)))
+    return NULL;
+
+  section_id++;
+  abfd->section_count++;
+  *abfd->section_tail = newsect;
+  abfd->section_tail = &newsect->next;
+  return newsect;
+}
+

 /*
 DOCDD
 INODE
 /*
 DOCDD
 INODE


@@ -471,12 +712,35 @@ SUBSECTION
 These are the functions exported by the section handling part of BFD.
 */
 
 These are the functions exported by the section handling part of BFD.
 */
 

+/*
+FUNCTION
+       bfd_section_list_clear
+
+SYNOPSIS
+       void bfd_section_list_clear (bfd *);
+
+DESCRIPTION
+       Clears the section list, and also resets the section count and
+       hash table entries.
+*/
+
+void
+bfd_section_list_clear (abfd)
+     bfd *abfd;
+{
+  abfd->sections = NULL;
+  abfd->section_tail = &abfd->sections;
+  abfd->section_count = 0;
+  memset ((PTR) abfd->section_htab.table, 0,
+         abfd->section_htab.size * sizeof (struct bfd_hash_entry *));
+}
+

 /*
 FUNCTION
        bfd_get_section_by_name
 
 SYNOPSIS
 /*
 FUNCTION
        bfd_get_section_by_name
 
 SYNOPSIS

-       asection *bfd_get_section_by_name(bfd *abfd, CONST char *name);
+       asection *bfd_get_section_by_name(bfd *abfd, const char *name);

 
 DESCRIPTION
        Run through @var{abfd} and return the one of the
 
 DESCRIPTION
        Run through @var{abfd} and return the one of the


@@ -492,23 +756,73 @@ DESCRIPTION
 asection *
 bfd_get_section_by_name (abfd, name)
      bfd *abfd;
 asection *
 bfd_get_section_by_name (abfd, name)
      bfd *abfd;

-     CONST char *name;
+     const char *name;

 {
 {

-  asection *sect;
+  struct section_hash_entry *sh;
+
+  sh = section_hash_lookup (&abfd->section_htab, name, false, false);
+  if (sh != NULL)
+    return &sh->section;

 
 

-  for (sect = abfd->sections; sect != NULL; sect = sect->next)
-    if (!strcmp (sect->name, name))
-      return sect;

   return NULL;
 }
 
   return NULL;
 }
 

+/*
+FUNCTION
+       bfd_get_unique_section_name
+
+SYNOPSIS
+       char *bfd_get_unique_section_name(bfd *abfd,
+                                         const char *templat,
+                                         int *count);
+
+DESCRIPTION
+       Invent a section name that is unique in @var{abfd} by tacking
+       a dot and a digit suffix onto the original @var{templat}.  If
+       @var{count} is non-NULL, then it specifies the first number
+       tried as a suffix to generate a unique name.  The value
+       pointed to by @var{count} will be incremented in this case.
+*/
+
+char *
+bfd_get_unique_section_name (abfd, templat, count)
+     bfd *abfd;
+     const char *templat;
+     int *count;
+{
+  int num;
+  unsigned int len;
+  char *sname;
+
+  len = strlen (templat);
+  sname = bfd_malloc ((bfd_size_type) len + 8);
+  if (sname == NULL)
+    return NULL;
+  strcpy (sname, templat);
+  num = 1;
+  if (count != NULL)
+    num = *count;
+
+  do
+    {
+      /* If we have a million sections, something is badly wrong.  */
+      if (num > 999999)
+       abort ();
+      sprintf (sname + len, ".%d", num++);
+    }
+  while (section_hash_lookup (&abfd->section_htab, sname, false, false));
+
+  if (count != NULL)
+    *count = num;
+  return sname;
+}

 
 /*
 FUNCTION
        bfd_make_section_old_way
 
 SYNOPSIS
 
 /*
 FUNCTION
        bfd_make_section_old_way
 
 SYNOPSIS

-       asection *bfd_make_section_old_way(bfd *abfd, CONST char *name);
+       asection *bfd_make_section_old_way(bfd *abfd, const char *name);

 
 DESCRIPTION
        Create a new empty section called @var{name}
 
 DESCRIPTION
        Create a new empty section called @var{name}


@@ -524,22 +838,49 @@ DESCRIPTION
        o <<bfd_error_invalid_operation>> -
        If output has already started for this BFD.
        o <<bfd_error_no_memory>> -
        o <<bfd_error_invalid_operation>> -
        If output has already started for this BFD.
        o <<bfd_error_no_memory>> -

-       If obstack alloc fails.
+       If memory allocation fails.

 
 */
 
 
 */
 

-

 asection *
 bfd_make_section_old_way (abfd, name)
      bfd *abfd;
 asection *
 bfd_make_section_old_way (abfd, name)
      bfd *abfd;

-     CONST char *name;
+     const char *name;

 {
 {

-  asection *sec = bfd_get_section_by_name (abfd, name);
-  if (sec == (asection *) NULL)
+  struct section_hash_entry *sh;
+  asection *newsect;
+
+  if (abfd->output_has_begun)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return NULL;
+    }
+
+  if (strcmp (name, BFD_ABS_SECTION_NAME) == 0)
+    return bfd_abs_section_ptr;
+
+  if (strcmp (name, BFD_COM_SECTION_NAME) == 0)
+    return bfd_com_section_ptr;
+
+  if (strcmp (name, BFD_UND_SECTION_NAME) == 0)
+    return bfd_und_section_ptr;
+
+  if (strcmp (name, BFD_IND_SECTION_NAME) == 0)
+    return bfd_ind_section_ptr;
+
+  sh = section_hash_lookup (&abfd->section_htab, name, true, false);
+  if (sh == NULL)
+    return NULL;
+
+  newsect = &sh->section;
+  if (newsect->name != NULL)

     {
     {

-      sec = bfd_make_section (abfd, name);
+      /* Section already exists.  */
+      return newsect;

     }
     }

-  return sec;
+
+  newsect->name = name;
+  return bfd_section_init (abfd, newsect);

 }
 
 /*
 }
 
 /*


@@ -547,7 +888,7 @@ FUNCTION
        bfd_make_section_anyway
 
 SYNOPSIS
        bfd_make_section_anyway
 
 SYNOPSIS

-       asection *bfd_make_section_anyway(bfd *abfd, CONST char *name);
+       asection *bfd_make_section_anyway(bfd *abfd, const char *name);

 
 DESCRIPTION
    Create a new empty section called @var{name} and attach it to the end of
 
 DESCRIPTION
    Create a new empty section called @var{name} and attach it to the end of


@@ -556,17 +897,16 @@ DESCRIPTION
 
    Return <<NULL>> and set <<bfd_error>> on error; possible errors are:
    o <<bfd_error_invalid_operation>> - If output has already started for @var{abfd}.
 
    Return <<NULL>> and set <<bfd_error>> on error; possible errors are:
    o <<bfd_error_invalid_operation>> - If output has already started for @var{abfd}.

-   o <<bfd_error_no_memory>> - If obstack alloc fails.
+   o <<bfd_error_no_memory>> - If memory allocation fails.

 */
 
 sec_ptr
 bfd_make_section_anyway (abfd, name)
      bfd *abfd;
 */
 
 sec_ptr
 bfd_make_section_anyway (abfd, name)
      bfd *abfd;

-     CONST char *name;
+     const char *name;

 {
 {

+  struct section_hash_entry *sh;

   asection *newsect;
   asection *newsect;

-  asection **prev = &abfd->sections;
-  asection *sect = abfd->sections;

 
   if (abfd->output_has_begun)
     {
 
   if (abfd->output_has_begun)
     {


@@ -574,49 +914,24 @@ bfd_make_section_anyway (abfd, name)
       return NULL;
     }
 
       return NULL;
     }
 

-  while (sect)
-    {
-      prev = &sect->next;
-      sect = sect->next;
-    }
-
-  newsect = (asection *) bfd_zalloc (abfd, sizeof (asection));
-  if (newsect == NULL)
+  sh = section_hash_lookup (&abfd->section_htab, name, true, false);
+  if (sh == NULL)

     return NULL;
 
     return NULL;
 

-  newsect->name = name;
-  newsect->index = abfd->section_count++;
-  newsect->flags = SEC_NO_FLAGS;
-
-  newsect->userdata = NULL;
-  newsect->contents = NULL;
-  newsect->next = (asection *) NULL;
-  newsect->relocation = (arelent *) NULL;
-  newsect->reloc_count = 0;
-  newsect->line_filepos = 0;
-  newsect->owner = abfd;
-
-  /* Create a symbol whos only job is to point to this section. This is
-     useful for things like relocs which are relative to the base of a
-     section.  */
-  newsect->symbol = bfd_make_empty_symbol (abfd);
-  if (newsect->symbol == NULL)
-    return NULL;
-  newsect->symbol->name = name;
-  newsect->symbol->value = 0;
-  newsect->symbol->section = newsect;
-  newsect->symbol->flags = BSF_SECTION_SYM;
-
-  newsect->symbol_ptr_ptr = &newsect->symbol;
-
-  if (BFD_SEND (abfd, _new_section_hook, (abfd, newsect)) != true)
+  newsect = &sh->section;
+  if (newsect->name != NULL)

     {
     {

-      free (newsect);
-      return NULL;
+      /* We are making a section of the same name.  It can't go in
+        section_htab without generating a unique section name and
+        that would be pointless;  We don't need to traverse the
+        hash table.  */
+      newsect = (asection *) bfd_zalloc (abfd, sizeof (asection));
+      if (newsect == NULL)
+       return NULL;

     }
 
     }
 

-  *prev = newsect;
-  return newsect;
+  newsect->name = name;
+  return bfd_section_init (abfd, newsect);

 }
 
 /*
 }
 
 /*


@@ -624,7 +939,7 @@ FUNCTION
        bfd_make_section
 
 SYNOPSIS
        bfd_make_section
 
 SYNOPSIS

-       asection *bfd_make_section(bfd *, CONST char *name);
+       asection *bfd_make_section(bfd *, const char *name);

 
 DESCRIPTION
    Like <<bfd_make_section_anyway>>, but return <<NULL>> (without calling
 
 DESCRIPTION
    Like <<bfd_make_section_anyway>>, but return <<NULL>> (without calling


@@ -636,40 +951,38 @@ DESCRIPTION
 asection *
 bfd_make_section (abfd, name)
      bfd *abfd;
 asection *
 bfd_make_section (abfd, name)
      bfd *abfd;

-     CONST char *name;
+     const char *name;

 {
 {

-  asection *sect = abfd->sections;
+  struct section_hash_entry *sh;
+  asection *newsect;

 
 

-  if (strcmp (name, BFD_ABS_SECTION_NAME) == 0)
-    {
-      return bfd_abs_section_ptr;
-    }
-  if (strcmp (name, BFD_COM_SECTION_NAME) == 0)
-    {
-      return bfd_com_section_ptr;
-    }
-  if (strcmp (name, BFD_UND_SECTION_NAME) == 0)
+  if (abfd->output_has_begun)

     {
     {

-      return bfd_und_section_ptr;
+      bfd_set_error (bfd_error_invalid_operation);
+      return NULL;

     }
 
     }
 

-  if (strcmp (name, BFD_IND_SECTION_NAME) == 0)
-    {
-      return bfd_ind_section_ptr;
-    }
+  if (strcmp (name, BFD_ABS_SECTION_NAME) == 0
+      || strcmp (name, BFD_COM_SECTION_NAME) == 0
+      || strcmp (name, BFD_UND_SECTION_NAME) == 0
+      || strcmp (name, BFD_IND_SECTION_NAME) == 0)
+    return NULL;
+
+  sh = section_hash_lookup (&abfd->section_htab, name, true, false);
+  if (sh == NULL)
+    return NULL;

 
 

-  while (sect)
+  newsect = &sh->section;
+  if (newsect->name != NULL)

     {
     {

-      if (!strcmp (sect->name, name))
-       return NULL;
-      sect = sect->next;
+      /* Section already exists.  */
+      return newsect;

     }
 
     }
 

-  /* The name is not already used; go ahead and make a new section.  */
-  return bfd_make_section_anyway (abfd, name);
+  newsect->name = name;
+  return bfd_section_init (abfd, newsect);

 }
 
 }
 

-

 /*
 FUNCTION
        bfd_set_section_flags
 /*
 FUNCTION
        bfd_set_section_flags


@@ -692,7 +1005,7 @@ DESCRIPTION
 /*ARGSUSED*/
 boolean
 bfd_set_section_flags (abfd, section, flags)
 /*ARGSUSED*/
 boolean
 bfd_set_section_flags (abfd, section, flags)

-     bfd *abfd;
+     bfd *abfd ATTRIBUTE_UNUSED;

      sec_ptr section;
      flagword flags;
 {
      sec_ptr section;
      flagword flags;
 {


@@ -713,14 +1026,13 @@ bfd_set_section_flags (abfd, section, flags)
   return true;
 }
 
   return true;
 }
 

-

 /*
 FUNCTION
        bfd_map_over_sections
 
 SYNOPSIS
        void bfd_map_over_sections(bfd *abfd,
 /*
 FUNCTION
        bfd_map_over_sections
 
 SYNOPSIS
        void bfd_map_over_sections(bfd *abfd,

-                                  void (*func)(bfd *abfd,
+                                  void (*func) (bfd *abfd,

                                                asection *sect,
                                                PTR obj),
                                   PTR obj);
                                                asection *sect,
                                                PTR obj),
                                   PTR obj);


@@ -739,7 +1051,6 @@ DESCRIPTION
 |         for (p = abfd->sections; p != NULL; p = p->next)
 |            func(abfd, p, ...)
 
 |         for (p = abfd->sections; p != NULL; p = p->next)
 |            func(abfd, p, ...)
 

-

 */
 
 /*VARARGS2*/
 */
 
 /*VARARGS2*/


@@ -759,7 +1070,6 @@ bfd_map_over_sections (abfd, operation, user_storage)
     abort ();
 }
 
     abort ();
 }
 

-

 /*
 FUNCTION
        bfd_set_section_size
 /*
 FUNCTION
        bfd_set_section_size


@@ -784,7 +1094,7 @@ bfd_set_section_size (abfd, ptr, val)
      bfd_size_type val;
 {
   /* Once you've started writing to any section you cannot create or change
      bfd_size_type val;
 {
   /* Once you've started writing to any section you cannot create or change

-     the size of any others. */
+     the size of any others.  */

 
   if (abfd->output_has_begun)
     {
 
   if (abfd->output_has_begun)
     {


@@ -803,21 +1113,15 @@ FUNCTION
        bfd_set_section_contents
 
 SYNOPSIS
        bfd_set_section_contents
 
 SYNOPSIS

-       boolean bfd_set_section_contents
-         (bfd *abfd,
-         asection *section,
-         PTR data,
-         file_ptr offset,
-         bfd_size_type count);
-
+       boolean bfd_set_section_contents (bfd *abfd, asection *section,
+                                         PTR data, file_ptr offset,
+                                         bfd_size_type count);

 
 DESCRIPTION
        Sets the contents of the section @var{section} in BFD
        @var{abfd} to the data starting in memory at @var{data}. The
        data is written to the output section starting at offset
 
 DESCRIPTION
        Sets the contents of the section @var{section} in BFD
        @var{abfd} to the data starting in memory at @var{data}. The
        data is written to the output section starting at offset

-       @var{offset} for @var{count} bytes.
-
-
+       @var{offset} for @var{count} octets.

 
        Normally <<true>> is returned, else <<false>>. Possible error
        returns are:
 
        Normally <<true>> is returned, else <<false>>. Possible error
        returns are:


@@ -829,7 +1133,6 @@ DESCRIPTION
        This routine is front end to the back end function
        <<_bfd_set_section_contents>>.
 
        This routine is front end to the back end function
        <<_bfd_set_section_contents>>.
 

-

 */
 
 #define bfd_get_section_size_now(abfd,sec) \
 */
 
 #define bfd_get_section_size_now(abfd,sec) \


@@ -853,17 +1156,15 @@ bfd_set_section_contents (abfd, section, location, offset, count)
       return (false);
     }
 
       return (false);
     }
 

-  if (offset < 0)
+  sz = bfd_get_section_size_now (abfd, section);
+  if ((bfd_size_type) offset > sz
+      || count > sz
+      || offset + count > sz
+      || count != (size_t) count)

     {
     {

-    bad_val:

       bfd_set_error (bfd_error_bad_value);
       return false;
     }
       bfd_set_error (bfd_error_bad_value);
       return false;
     }

-  sz = bfd_get_section_size_now (abfd, section);
-  if ((bfd_size_type) offset > sz
-      || count > sz
-      || offset + count > sz)
-    goto bad_val;

 
   switch (abfd->direction)
     {
 
   switch (abfd->direction)
     {


@@ -883,6 +1184,11 @@ bfd_set_section_contents (abfd, section, location, offset, count)
       break;
     }
 
       break;
     }
 

+  /* Record a copy of the data in memory if desired.  */
+  if (section->contents
+      && location != section->contents + offset)
+    memcpy (section->contents + offset, location, (size_t) count);
+

   if (BFD_SEND (abfd, _bfd_set_section_contents,
                (abfd, section, location, offset, count)))
     {
   if (BFD_SEND (abfd, _bfd_set_section_contents,
                (abfd, section, location, offset, count)))
     {


@@ -898,9 +1204,9 @@ FUNCTION
        bfd_get_section_contents
 
 SYNOPSIS
        bfd_get_section_contents
 
 SYNOPSIS

-       boolean bfd_get_section_contents
-        (bfd *abfd, asection *section, PTR location,
-         file_ptr offset, bfd_size_type count);
+       boolean bfd_get_section_contents (bfd *abfd, asection *section,
+                                         PTR location, file_ptr offset,
+                                         bfd_size_type count);

 
 DESCRIPTION
        Read data from @var{section} in BFD @var{abfd}
 
 DESCRIPTION
        Read data from @var{section} in BFD @var{abfd}


@@ -914,8 +1220,6 @@ DESCRIPTION
        with zeroes. If no errors occur, <<true>> is returned, else
        <<false>>.
 
        with zeroes. If no errors occur, <<true>> is returned, else
        <<false>>.
 

-
-

 */
 boolean
 bfd_get_section_contents (abfd, section, location, offset, count)
 */
 boolean
 bfd_get_section_contents (abfd, section, location, offset, count)


@@ -929,21 +1233,21 @@ bfd_get_section_contents (abfd, section, location, offset, count)
 
   if (section->flags & SEC_CONSTRUCTOR)
     {
 
   if (section->flags & SEC_CONSTRUCTOR)
     {

-      memset (location, 0, (unsigned) count);
+      memset (location, 0, (size_t) count);

       return true;
     }
 
       return true;
     }
 

-  if (offset < 0)
+  /* Even if reloc_done is true, this function reads unrelocated
+     contents, so we want the raw size.  */
+  sz = section->_raw_size;
+  if ((bfd_size_type) offset > sz
+      || count > sz
+      || offset + count > sz
+      || count != (size_t) count)

     {
     {

-    bad_val:

       bfd_set_error (bfd_error_bad_value);
       return false;
     }
       bfd_set_error (bfd_error_bad_value);
       return false;
     }

-  /* Even if reloc_done is true, this function reads unrelocated
-     contents, so we want the raw size.  */
-  sz = section->_raw_size;
-  if ((bfd_size_type) offset > sz || count > sz || offset + count > sz)
-    goto bad_val;

 
   if (count == 0)
     /* Don't bother.  */
 
   if (count == 0)
     /* Don't bother.  */


@@ -951,7 +1255,7 @@ bfd_get_section_contents (abfd, section, location, offset, count)
 
   if ((section->flags & SEC_HAS_CONTENTS) == 0)
     {
 
   if ((section->flags & SEC_HAS_CONTENTS) == 0)
     {

-      memset (location, 0, (unsigned) count);
+      memset (location, 0, (size_t) count);

       return true;
     }
 
       return true;
     }
 


@@ -970,7 +1274,8 @@ FUNCTION
        bfd_copy_private_section_data
 
 SYNOPSIS
        bfd_copy_private_section_data
 
 SYNOPSIS

-       boolean bfd_copy_private_section_data(bfd *ibfd, asection *isec, bfd *obfd, asection *osec);
+       boolean bfd_copy_private_section_data (bfd *ibfd, asection *isec,
+                                              bfd *obfd, asection *osec);

 
 DESCRIPTION
        Copy private section information from @var{isec} in the BFD
 
 DESCRIPTION
        Copy private section information from @var{isec} in the BFD


@@ -982,6 +1287,112 @@ DESCRIPTION
        Not enough memory exists to create private data for @var{osec}.
 
 .#define bfd_copy_private_section_data(ibfd, isection, obfd, osection) \
        Not enough memory exists to create private data for @var{osec}.
 
 .#define bfd_copy_private_section_data(ibfd, isection, obfd, osection) \

-.     BFD_SEND (ibfd, _bfd_copy_private_section_data, \
+.     BFD_SEND (obfd, _bfd_copy_private_section_data, \

 .              (ibfd, isection, obfd, osection))
 */
 .              (ibfd, isection, obfd, osection))
 */

+
+/*
+FUNCTION
+       _bfd_strip_section_from_output
+
+SYNOPSIS
+       void _bfd_strip_section_from_output
+       (struct bfd_link_info *info, asection *section);
+
+DESCRIPTION
+       Remove @var{section} from the output.  If the output section
+       becomes empty, remove it from the output bfd.  @var{info} may
+       be NULL; if it is not, it is used to decide whether the output
+       section is empty.
+*/
+void
+_bfd_strip_section_from_output (info, s)
+     struct bfd_link_info *info;
+     asection *s;
+{
+  asection **spp, *os;
+  struct bfd_link_order *p, *pp;
+  boolean keep_os;
+
+  /* Excise the input section from the link order.
+
+     FIXME: For all calls that I can see to this function, the link
+     orders have not yet been set up.  So why are we checking them? --
+     Ian */
+  os = s->output_section;
+
+  /* Handle a section that wasn't output.  */
+  if (os == NULL)
+    return;
+
+  for (p = os->link_order_head, pp = NULL; p != NULL; pp = p, p = p->next)
+    if (p->type == bfd_indirect_link_order
+       && p->u.indirect.section == s)
+      {
+       if (pp)
+         pp->next = p->next;
+       else
+         os->link_order_head = p->next;
+       if (!p->next)
+         os->link_order_tail = pp;
+       break;
+      }
+
+  keep_os = os->link_order_head != NULL;
+
+  if (! keep_os && info != NULL)
+    {
+      bfd *abfd;
+      for (abfd = info->input_bfds; abfd != NULL; abfd = abfd->link_next)
+       {
+         asection *is;
+         for (is = abfd->sections; is != NULL; is = is->next)
+           {
+             if (is != s && is->output_section == os
+                 && (is->flags & SEC_EXCLUDE) == 0)
+               break;
+           }
+         if (is != NULL)
+           break;
+       }
+      if (abfd != NULL)
+       keep_os = true;
+    }
+
+  /* If the output section is empty, remove it too.  Careful about sections
+     that have been discarded in the link script -- they are mapped to
+     bfd_abs_section, which has no owner.  */
+  if (!keep_os && os->owner != NULL)
+    {
+      for (spp = &os->owner->sections; *spp; spp = &(*spp)->next)
+       if (*spp == os)
+         {
+           bfd_section_list_remove (os->owner, spp);
+           os->owner->section_count--;
+           break;
+         }
+    }
+
+  s->flags |= SEC_EXCLUDE;
+}
+
+/*
+FUNCTION
+       bfd_discard_group
+
+SYNOPSIS
+       void bfd_discard_group (bfd *abfd, asection *group);
+
+DESCRIPTION
+       Remove all members of @var{group} from the output.
+*/
+
+void
+bfd_discard_group (abfd, group)
+     bfd *abfd;
+     asection *group;
+{
+  if ((group->flags & SEC_GROUP) != 0
+      && abfd->xvec->flavour == bfd_target_elf_flavour)
+    bfd_elf_discard_group (abfd, group);
+}