X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fsection.c;h=5347c2b3f8549c39eb14f9f6232547c2ae7c647f;hb=7fe958be01489f0309b1b822b7cb191ccafe23af;hp=fc64b2019fbe596fedc84acd8f51ea7a3ac6a8ed;hpb=4d7ce4dd486816139276a2c5cf90e0213fb47b21;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/section.c b/bfd/section.c index fc64b2019f..5347c2b3f8 100644 --- a/bfd/section.c +++ b/bfd/section.c @@ -1,5 +1,6 @@ /* Object file "section" support for the BFD library. - Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000 + Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Written by Cygnus Support. @@ -111,7 +112,6 @@ SUBSECTION | size 0x103 | | output_section --------| - SUBSECTION Link orders @@ -133,7 +133,6 @@ SUBSECTION */ - #include "bfd.h" #include "sysdep.h" #include "libbfd.h" @@ -165,35 +164,26 @@ CODE_FRAGMENT . specific code; it is not an index into the list returned by . bfd_canonicalize_symtab. *} . long symbol; -. -. {* If this section is being discarded, the linker uses this field -. to point to the input section which is being kept. *} -. struct sec *sec; .}; . .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; . . {* A unique sequence number. *} -. . int id; . -. {* Which section is it; 0..nth. *} -. +. {* Which section in the bfd; 0..n-1 as sections are created in a bfd. *} . int index; . . {* The next section in the list belonging to the BFD, or NULL. *} -. . struct sec *next; . . {* 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 @@ -210,9 +200,11 @@ CODE_FRAGMENT . some relocation information too. *} .#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. *} .#define SEC_READONLY 0x010 @@ -238,12 +230,6 @@ CODE_FRAGMENT . standard data. *} .#define SEC_CONSTRUCTOR 0x100 . -. {* The section is a constructor, 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 . <> | <>; a debug section could be . <> *} @@ -264,6 +250,9 @@ CODE_FRAGMENT . sections. *} .#define SEC_COFF_SHARED_LIBRARY 0x800 . +. {* 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 @@ -295,9 +284,10 @@ CODE_FRAGMENT . objects are to be further relocated. *} .#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 . . {* When linking, duplicate sections of the same name should be @@ -355,6 +345,18 @@ CODE_FRAGMENT . references found to any symbol in the section. *} .#define SEC_CLINK 0x10000000 . +. {* Attempt to merge identical entities in the section. +. Entity size is given in the entsize field. *} +.#define SEC_MERGE 0x20000000 +. +. {* 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 +. +. {* This section contains data about section groups. *} +.#define SEC_GROUP 0x80000000 +. . {* End of section flags. *} . . {* Some internal packed boolean fields. *} @@ -368,12 +370,46 @@ CODE_FRAGMENT . {* A mark flag used by some of the linker backends. *} . unsigned int linker_mark : 1; . +. {* 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; +. . {* A mark flag used by some linker backends for garbage collection. *} . unsigned int gc_mark : 1; . -. {* Used by the ELF code to mark sections which have been allocated to segments. *} +. {* The following flags are used by the ELF linker. *} +. +. {* Mark sections which have been allocated to segments. *} . unsigned int segment_mark : 1; . +. {* Type of sec_info information. *} +. unsigned int sec_info_type:3; +.#define ELF_INFO_TYPE_NONE 0 +.#define ELF_INFO_TYPE_STABS 1 +.#define ELF_INFO_TYPE_MERGE 2 +.#define ELF_INFO_TYPE_EH_FRAME 3 +.#define ELF_INFO_TYPE_JUST_SYMS 4 +. +. {* Nonzero if this section uses RELA relocations, rather than REL. *} +. unsigned int use_rela_p:1; +. +. {* Bits used by various backends. *} +. unsigned int has_tls_reloc:1; +. +. {* Nonzero if this section needs the relax finalize pass. *} +. unsigned int need_finalize_relax:1; +. +. {* Nonzero if this section has a gp reloc. *} +. unsigned int has_gp_reloc:1; +. +. {* Usused bits. *} +. unsigned int flag13:1; +. unsigned int flag14:1; +. unsigned int flag15:1; +. unsigned int flag16:4; +. unsigned int flag20:4; +. unsigned int flag24:8; +. . {* End of internal packed boolean fields. *} . . {* The virtual memory address of the section - where it will be @@ -382,25 +418,21 @@ CODE_FRAGMENT . backend can assign addresses (for example, in <>, where . the default address for <<.data>> is dependent on the specific . target and various flags). *} -. . bfd_vma vma; . . {* The load address of the section - where it would be in a . rom image; really only used for writing section header -. information. *} -. +. information. *} . bfd_vma lma; . . {* 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; . . {* 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; . . {* If this section is going to be output, then this value is the @@ -410,94 +442,84 @@ CODE_FRAGMENT . 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; . . {* The output section through which to map on output. *} -. . struct sec *output_section; . . {* The alignment requirement of the section, as an exponent of 2 - . e.g., 3 aligns to 2^3 (or 8). *} -. . unsigned int alignment_power; . . {* If an input section, a pointer to a vector of relocation . records for the data in this section. *} -. . struct reloc_cache_entry *relocation; . . {* 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; . -. {* The number of relocation records in one of the above *} -. +. {* The number of relocation records in one of the above. *} . unsigned reloc_count; . . {* Information below is back end specific - and not always used . or updated. *} . . {* File position of section data. *} -. . file_ptr filepos; . . {* File position of relocation info. *} -. . file_ptr rel_filepos; . . {* File position of line data. *} -. . file_ptr line_filepos; . . {* Pointer to data for applications. *} -. -. PTR userdata; +. void *userdata; . . {* If the SEC_IN_MEMORY flag is set, this points to the actual . contents. *} . unsigned char *contents; . . {* Attached line number information. *} -. . alent *lineno; . . {* Number of line number records. *} -. . unsigned int lineno_count; . -. {* Optional information about a COMDAT entry; NULL if not COMDAT. *} +. {* Entity size for merging purposes. *} +. unsigned int entsize; . +. {* Optional information about a COMDAT entry; NULL if not COMDAT. *} . struct bfd_comdat_info *comdat; . +. {* Points to the kept section if this section is a link-once section, +. and is discarded. *} +. struct sec *kept_section; +. . {* When a section is being output, this value changes as more . linenumbers are written out. *} -. . file_ptr moving_line_filepos; . . {* What the section number is in the target world. *} -. . int target_index; . -. PTR used_by_bfd; +. void *used_by_bfd; . . {* 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; . . {* The BFD which owns the section. *} -. . bfd *owner; . -. {* A symbol which points at this section only *} +. {* 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 ; +.} asection; . .{* These sections are global, and are managed by BFD. The application . and target back end are not permitted to change the values in @@ -509,22 +531,28 @@ CODE_FRAGMENT .#define BFD_COM_SECTION_NAME "*COM*" .#define BFD_IND_SECTION_NAME "*IND*" . -.{* the absolute section *} -.extern const asection bfd_abs_section; +.{* The absolute section. *} +.extern 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 *} -.extern const asection bfd_und_section; +.{* Pointer to the undefined section. *} +.extern 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 *} -.extern const asection bfd_com_section; +.{* Pointer to the common section. *} +.extern asection bfd_com_section; .#define bfd_com_section_ptr ((asection *) &bfd_com_section) -.{* Pointer to the indirect section *} -.extern const asection bfd_ind_section; +.{* Pointer to the indirect section. *} +.extern 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; @@ -535,6 +563,32 @@ CODE_FRAGMENT .#define bfd_get_section_size_after_reloc(section) \ . ((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 @@ -562,15 +616,27 @@ static const asymbol global_syms[] = #define STD_SECTION(SEC, FLAGS, SYM, NAME, IDX) \ const asymbol * const SYM = (asymbol *) &global_syms[IDX]; \ - const asection SEC = \ + asection SEC = \ /* name, id, index, next, flags, user_set_vma, reloc_done, */ \ { NAME, IDX, 0, NULL, FLAGS, 0, 0, \ \ - /* linker_mark, gc_mark, segment_mark, vma, lma, _cooked_size, */ \ - 0, 0, 0, 0, 0, 0, \ + /* linker_mark, linker_has_input, gc_mark, segment_mark, */ \ + 0, 0, 1, 0, \ + \ + /* sec_info_type, use_rela_p, has_tls_reloc, */ \ + 0, 0, 0, \ + \ + /* need_finalize_relax, has_gp_reloc, */ \ + 0, 0, \ + \ + /* flag13, flag14, flag15, flag16, flag20, flag24, */ \ + 0, 0, 0, 0, 0, 0, \ + \ + /* vma, lma, _cooked_size, _raw_size, */ \ + 0, 0, 0, 0, \ \ - /* _raw_size, output_offset, output_section, alignment_power, */ \ - 0, 0, (struct sec *) &SEC, 0, \ + /* output_offset, output_section, alignment_power, */ \ + 0, (struct sec *) &SEC, 0, \ \ /* relocation, orelocation, reloc_count, filepos, rel_filepos, */ \ NULL, NULL, 0, 0, 0, \ @@ -578,11 +644,11 @@ static const asymbol global_syms[] = /* line_filepos, userdata, contents, lineno, lineno_count, */ \ 0, NULL, NULL, NULL, 0, \ \ - /* comdat, moving_line_filepos, target_index, used_by_bfd, */ \ - NULL, 0, 0, NULL, \ + /* entsize, comdat, kept_section, moving_line_filepos, */ \ + 0, NULL, NULL, 0, \ \ - /* constructor_chain, owner, */ \ - NULL, NULL, \ + /* target_index, used_by_bfd, constructor_chain, owner, */ \ + 0, NULL, NULL, NULL, \ \ /* symbol, */ \ (struct symbol_cache_entry *) &global_syms[IDX], \ @@ -601,6 +667,77 @@ 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 +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 (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 = (struct bfd_hash_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 (&((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 (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 @@ -611,12 +748,34 @@ SUBSECTION 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 (bfd *abfd) +{ + abfd->sections = NULL; + abfd->section_tail = &abfd->sections; + abfd->section_count = 0; + memset (abfd->section_htab.table, 0, + abfd->section_htab.size * sizeof (struct bfd_hash_entry *)); +} + /* 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 @@ -630,27 +789,24 @@ DESCRIPTION */ asection * -bfd_get_section_by_name (abfd, name) - bfd *abfd; - const char *name; +bfd_get_section_by_name (bfd *abfd, 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; } - /* FUNCTION bfd_get_unique_section_name SYNOPSIS - char *bfd_get_unique_section_name(bfd *abfd, - const char *templat, - int *count); + 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 @@ -661,10 +817,7 @@ DESCRIPTION */ char * -bfd_get_unique_section_name (abfd, templat, count) - bfd *abfd; - const char *templat; - int *count; +bfd_get_unique_section_name (bfd *abfd, const char *templat, int *count) { int num; unsigned int len; @@ -674,7 +827,7 @@ bfd_get_unique_section_name (abfd, templat, count) sname = bfd_malloc (len + 8); if (sname == NULL) return NULL; - strcpy (sname, templat); + memcpy (sname, templat, len); num = 1; if (count != NULL) num = *count; @@ -686,20 +839,19 @@ bfd_get_unique_section_name (abfd, templat, count) abort (); sprintf (sname + len, ".%d", num++); } - while (bfd_get_section_by_name (abfd, sname) != NULL); + while (section_hash_lookup (&abfd->section_htab, sname, FALSE, FALSE)); if (count != NULL) *count = num; return sname; } - /* 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} @@ -719,18 +871,43 @@ DESCRIPTION */ - asection * -bfd_make_section_old_way (abfd, name) - bfd *abfd; - const char *name; +bfd_make_section_old_way (bfd *abfd, 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) { - sec = bfd_make_section (abfd, name); + bfd_set_error (bfd_error_invalid_operation); + return NULL; } - return sec; + + 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) + { + /* Section already exists. */ + return newsect; + } + + newsect->name = name; + return bfd_section_init (abfd, newsect); } /* @@ -738,7 +915,7 @@ FUNCTION 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 @@ -751,14 +928,10 @@ DESCRIPTION */ sec_ptr -bfd_make_section_anyway (abfd, name) - bfd *abfd; - const char *name; +bfd_make_section_anyway (bfd *abfd, const char *name) { - static int section_id = 0x10; /* id 0 to 3 used by STD_SECTION. */ + struct section_hash_entry *sh; asection *newsect; - asection **prev = &abfd->sections; - asection *sect = abfd->sections; if (abfd->output_has_begun) { @@ -766,54 +939,24 @@ bfd_make_section_anyway (abfd, name) return NULL; } - while (sect) - { - prev = §->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; - newsect->name = name; - newsect->id = section_id++; - 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; - newsect->comdat = NULL; - - /* 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) - { - bfd_release (abfd, newsect); - 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) { - bfd_release (abfd, 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 = bfd_zalloc (abfd, sizeof (asection)); + if (newsect == NULL) + return NULL; } - *prev = newsect; - return newsect; + newsect->name = name; + return bfd_section_init (abfd, newsect); } /* @@ -821,7 +964,7 @@ FUNCTION bfd_make_section SYNOPSIS - asection *bfd_make_section(bfd *, const char *name); + asection *bfd_make_section (bfd *, const char *name); DESCRIPTION Like <>, but return <> (without calling @@ -831,53 +974,50 @@ DESCRIPTION */ asection * -bfd_make_section (abfd, name) - bfd *abfd; - const char *name; +bfd_make_section (bfd *abfd, 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; - while (sect) + sh = section_hash_lookup (&abfd->section_htab, name, TRUE, FALSE); + if (sh == NULL) + return NULL; + + newsect = &sh->section; + if (newsect->name != NULL) { - if (!strcmp (sect->name, name)) - return NULL; - sect = sect->next; + /* Section already exists. */ + return NULL; } - /* 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 SYNOPSIS - boolean bfd_set_section_flags(bfd *abfd, asection *sec, flagword flags); + bfd_boolean bfd_set_section_flags + (bfd *abfd, asection *sec, flagword flags); DESCRIPTION Set the attributes of the section @var{sec} in the BFD - @var{abfd} to the value @var{flags}. Return <> on success, - <> on error. Possible error returns are: + @var{abfd} to the value @var{flags}. Return <> on success, + <> on error. Possible error returns are: o <> - The section cannot have one or more of the attributes @@ -887,11 +1027,10 @@ DESCRIPTION */ /*ARGSUSED*/ -boolean -bfd_set_section_flags (abfd, section, flags) - bfd *abfd ATTRIBUTE_UNUSED; - sec_ptr section; - flagword flags; +bfd_boolean +bfd_set_section_flags (bfd *abfd ATTRIBUTE_UNUSED, + sec_ptr section, + flagword flags) { #if 0 /* If you try to copy a text section from an input file (where it @@ -902,49 +1041,45 @@ bfd_set_section_flags (abfd, section, flags) if ((flags & bfd_applicable_section_flags (abfd)) != flags) { bfd_set_error (bfd_error_invalid_operation); - return false; + return FALSE; } #endif section->flags = flags; - return true; + return TRUE; } - /* FUNCTION bfd_map_over_sections SYNOPSIS - void bfd_map_over_sections(bfd *abfd, - void (*func)(bfd *abfd, - asection *sect, - PTR obj), - PTR obj); + void bfd_map_over_sections + (bfd *abfd, + void (*func) (bfd *abfd, asection *sect, void *obj), + void *obj); DESCRIPTION Call the provided function @var{func} for each section attached to the BFD @var{abfd}, passing @var{obj} as an argument. The function will be called as if by -| func(abfd, the_section, obj); +| func (abfd, the_section, obj); This is the prefered method for iterating over sections; an alternative would be to use a loop: | section *p; | for (p = abfd->sections; p != NULL; p = p->next) -| func(abfd, p, ...) - +| func (abfd, p, ...) */ /*VARARGS2*/ void -bfd_map_over_sections (abfd, operation, user_storage) - bfd *abfd; - void (*operation) PARAMS ((bfd * abfd, asection * sect, PTR obj)); - PTR user_storage; +bfd_map_over_sections (bfd *abfd, + void (*operation) (bfd *, asection *, void *), + void *user_storage) { asection *sect; unsigned int i = 0; @@ -956,17 +1091,17 @@ bfd_map_over_sections (abfd, operation, user_storage) abort (); } - /* FUNCTION bfd_set_section_size SYNOPSIS - boolean bfd_set_section_size(bfd *abfd, asection *sec, bfd_size_type val); + bfd_boolean bfd_set_section_size + (bfd *abfd, asection *sec, bfd_size_type val); DESCRIPTION Set @var{sec} to the size @var{val}. If the operation is - ok, then <> is returned, else <>. + ok, then <> is returned, else <>. Possible error returns: o <> - @@ -974,25 +1109,22 @@ DESCRIPTION */ -boolean -bfd_set_section_size (abfd, ptr, val) - bfd *abfd; - sec_ptr ptr; - bfd_size_type val; +bfd_boolean +bfd_set_section_size (bfd *abfd, sec_ptr ptr, 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) { bfd_set_error (bfd_error_invalid_operation); - return false; + return FALSE; } ptr->_cooked_size = val; ptr->_raw_size = val; - return true; + return TRUE; } /* @@ -1000,13 +1132,9 @@ FUNCTION bfd_set_section_contents SYNOPSIS - boolean bfd_set_section_contents - (bfd *abfd, - asection *section, - PTR data, - file_ptr offset, - bfd_size_type count); - + bfd_boolean bfd_set_section_contents + (bfd *abfd, asection *section, void *data, file_ptr offset, + bfd_size_type count); DESCRIPTION Sets the contents of the section @var{section} in BFD @@ -1014,9 +1142,7 @@ DESCRIPTION data is written to the output section starting at offset @var{offset} for @var{count} octets. - - - Normally <> is returned, else <>. Possible error + Normally <> is returned, else <>. Possible error returns are: o <> - The output section does not have the <> @@ -1026,48 +1152,44 @@ DESCRIPTION This routine is front end to the back end function <<_bfd_set_section_contents>>. - */ -#define bfd_get_section_size_now(abfd,sec) \ -(sec->reloc_done \ - ? bfd_get_section_size_after_reloc (sec) \ - : bfd_get_section_size_before_reloc (sec)) - -boolean -bfd_set_section_contents (abfd, section, location, offset, count) - bfd *abfd; - sec_ptr section; - PTR location; - file_ptr offset; - bfd_size_type count; +#define bfd_get_section_size_now(abfd, sec) \ + (sec->reloc_done \ + ? bfd_get_section_size_after_reloc (sec) \ + : bfd_get_section_size_before_reloc (sec)) + +bfd_boolean +bfd_set_section_contents (bfd *abfd, + sec_ptr section, + void *location, + file_ptr offset, + bfd_size_type count) { bfd_size_type sz; if (!(bfd_get_section_flags (abfd, section) & SEC_HAS_CONTENTS)) { bfd_set_error (bfd_error_no_contents); - return (false); + return FALSE; } - if (offset < 0) - { - bad_val: - 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; + || offset + count > sz + || count != (size_t) count) + { + bfd_set_error (bfd_error_bad_value); + return FALSE; + } switch (abfd->direction) { case read_direction: case no_direction: bfd_set_error (bfd_error_invalid_operation); - return false; + return FALSE; case write_direction: break; @@ -1076,18 +1198,23 @@ bfd_set_section_contents (abfd, section, location, offset, count) /* File is opened for update. `output_has_begun' some time ago when the file was created. Do not recompute sections sizes or alignments in _bfd_set_section_content. */ - abfd->output_has_begun = true; + abfd->output_has_begun = TRUE; 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))) { - abfd->output_has_begun = true; - return true; + abfd->output_has_begun = TRUE; + return TRUE; } - return false; + return FALSE; } /* @@ -1095,9 +1222,9 @@ FUNCTION bfd_get_section_contents SYNOPSIS - boolean bfd_get_section_contents - (bfd *abfd, asection *section, PTR location, - file_ptr offset, bfd_size_type count); + bfd_boolean bfd_get_section_contents + (bfd *abfd, asection *section, void *location, file_ptr offset, + bfd_size_type count); DESCRIPTION Read data from @var{section} in BFD @var{abfd} @@ -1108,54 +1235,51 @@ DESCRIPTION If the contents of a constructor with the <> flag set are requested or if the section does not have the <> flag set, then the @var{location} is filled - with zeroes. If no errors occur, <> is returned, else - <>. - - + with zeroes. If no errors occur, <> is returned, else + <>. */ -boolean -bfd_get_section_contents (abfd, section, location, offset, count) - bfd *abfd; - sec_ptr section; - PTR location; - file_ptr offset; - bfd_size_type count; +bfd_boolean +bfd_get_section_contents (bfd *abfd, + sec_ptr section, + void *location, + file_ptr offset, + bfd_size_type count) { bfd_size_type sz; if (section->flags & SEC_CONSTRUCTOR) { - memset (location, 0, (unsigned) count); - return true; + memset (location, 0, (size_t) count); + 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; + 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. */ - return true; + return TRUE; if ((section->flags & SEC_HAS_CONTENTS) == 0) { - memset (location, 0, (unsigned) count); - return true; + memset (location, 0, (size_t) count); + return TRUE; } if ((section->flags & SEC_IN_MEMORY) != 0) { memcpy (location, section->contents + offset, (size_t) count); - return true; + return TRUE; } return BFD_SEND (abfd, _bfd_get_section_contents, @@ -1167,12 +1291,13 @@ FUNCTION bfd_copy_private_section_data SYNOPSIS - boolean bfd_copy_private_section_data(bfd *ibfd, asection *isec, bfd *obfd, asection *osec); + bfd_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 @var{ibfd} to the section @var{osec} in the BFD @var{obfd}. - Return <> on success, <> on error. Possible error + Return <> on success, <> on error. Possible error returns are: o <> - @@ -1189,73 +1314,58 @@ FUNCTION SYNOPSIS void _bfd_strip_section_from_output - (struct bfd_link_info *info, asection *section); + (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. + becomes empty, remove it from the output bfd. + + This function won't actually do anything except twiddle flags + if called too late in the linking process, when it's not safe + to remove sections. */ void -_bfd_strip_section_from_output (info, s) - struct bfd_link_info *info; - asection *s; +_bfd_strip_section_from_output (struct bfd_link_info *info, asection *s) { - asection **spp, *os; - struct bfd_link_order *p, *pp; - boolean keep_os; + asection *os; + asection *is; + bfd *abfd; - /* Excise the input section from the link order. + s->flags |= SEC_EXCLUDE; - 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 */ + /* If the section wasn't assigned to an output section, or the + section has been discarded by the linker script, there's nothing + more to do. */ os = s->output_section; - 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) - break; - } - if (is != NULL) - break; - } - if (abfd != NULL) - keep_os = true; - } + if (os == NULL || os->owner == NULL) + return; + + /* If the output section has other (non-excluded) input sections, we + can't remove it. */ + for (abfd = info->input_bfds; abfd != NULL; abfd = abfd->link_next) + for (is = abfd->sections; is != NULL; is = is->next) + if (is->output_section == os && (is->flags & SEC_EXCLUDE) == 0) + return; + + /* If the output section is empty, flag it for removal too. + See ldlang.c:strip_excluded_output_sections for the action. */ + os->flags |= SEC_EXCLUDE; +} - /* 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) - { - *spp = os->next; - os->owner->section_count--; - break; - } - } +/* +FUNCTION + bfd_generic_discard_group + +SYNOPSIS + bfd_boolean bfd_generic_discard_group (bfd *abfd, asection *group); + +DESCRIPTION + Remove all members of @var{group} from the output. +*/ + +bfd_boolean +bfd_generic_discard_group (bfd *abfd ATTRIBUTE_UNUSED, + asection *group ATTRIBUTE_UNUSED) +{ + return TRUE; }