X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Fconfig%2Fobj-elf.c;h=43e0c97a0d2174ae927d7c5ce23a303051fee9fd;hb=77592908ee412274452a954c5f0347bbc95497d3;hp=3c4531e77cae092d452f17e8d640c4dc047e5ef8;hpb=e4afe7429548beac154bb41d8f553d614a222d17;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/config/obj-elf.c b/gas/config/obj-elf.c index 3c4531e77c..43e0c97a0d 100644 --- a/gas/config/obj-elf.c +++ b/gas/config/obj-elf.c @@ -1,6 +1,6 @@ /* ELF object file format - Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 - Free Software Foundation, Inc. + Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, + 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -16,14 +16,16 @@ You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free - Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA + 02110-1301, USA. */ #define OBJ_HEADER "obj-elf.h" #include "as.h" #include "safe-ctype.h" #include "subsegs.h" #include "obstack.h" +#include "struc-symbol.h" +#include "dwarf2dbg.h" #ifndef ECOFF_DEBUGGING #define ECOFF_DEBUGGING 0 @@ -51,45 +53,30 @@ #include "elf/i370.h" #endif -static bfd_vma elf_s_get_size PARAMS ((symbolS *)); -static void elf_s_set_size PARAMS ((symbolS *, bfd_vma)); -static bfd_vma elf_s_get_align PARAMS ((symbolS *)); -static void elf_s_set_align PARAMS ((symbolS *, bfd_vma)); -static void elf_s_set_other PARAMS ((symbolS *, int)); -static int elf_sec_sym_ok_for_reloc PARAMS ((asection *)); -static void adjust_stab_sections PARAMS ((bfd *, asection *, PTR)); -static void build_group_lists PARAMS ((bfd *, asection *, PTR)); -static int elf_separate_stab_sections PARAMS ((void)); -static void elf_init_stab_section PARAMS ((segT)); - -#ifdef NEED_ECOFF_DEBUG -static boolean elf_get_extr PARAMS ((asymbol *, EXTR *)); -static void elf_set_index PARAMS ((asymbol *, bfd_size_type)); +#ifdef TC_I386 +#include "elf/x86-64.h" #endif -static void obj_elf_line PARAMS ((int)); -void obj_elf_version PARAMS ((int)); -static void obj_elf_size PARAMS ((int)); -static void obj_elf_type PARAMS ((int)); -static void obj_elf_ident PARAMS ((int)); -static void obj_elf_weak PARAMS ((int)); -static void obj_elf_local PARAMS ((int)); -static void obj_elf_visibility PARAMS ((int)); -static void obj_elf_change_section - PARAMS ((const char *, int, int, int, const char *, int)); -static int obj_elf_parse_section_letters PARAMS ((char *, size_t)); -static int obj_elf_section_word PARAMS ((char *, size_t)); -static char *obj_elf_section_name PARAMS ((void)); -static int obj_elf_section_type PARAMS ((char *, size_t)); -static void obj_elf_symver PARAMS ((int)); -static void obj_elf_subsection PARAMS ((int)); -static void obj_elf_popsection PARAMS ((int)); +static void obj_elf_line (int); +static void obj_elf_size (int); +static void obj_elf_type (int); +static void obj_elf_ident (int); +static void obj_elf_weak (int); +static void obj_elf_local (int); +static void obj_elf_visibility (int); +static void obj_elf_symver (int); +static void obj_elf_subsection (int); +static void obj_elf_popsection (int); +static void obj_elf_tls_common (int); +static void obj_elf_lcomm (int); +static void obj_elf_struct (int); static const pseudo_typeS elf_pseudo_table[] = { {"comm", obj_elf_common, 0}, {"common", obj_elf_common, 1}, {"ident", obj_elf_ident, 0}, + {"lcomm", obj_elf_lcomm, 0}, {"local", obj_elf_local, 0}, {"previous", obj_elf_previous, 0}, {"section", obj_elf_section, 0}, @@ -118,18 +105,25 @@ static const pseudo_typeS elf_pseudo_table[] = {"subsection", obj_elf_subsection, 0}, /* These are GNU extensions to aid in garbage collecting C++ vtables. */ - {"vtable_inherit", (void (*) PARAMS ((int))) &obj_elf_vtable_inherit, 0}, - {"vtable_entry", (void (*) PARAMS ((int))) &obj_elf_vtable_entry, 0}, + {"vtable_inherit", (void (*) (int)) &obj_elf_vtable_inherit, 0}, + {"vtable_entry", (void (*) (int)) &obj_elf_vtable_entry, 0}, /* These are used for dwarf. */ {"2byte", cons, 2}, {"4byte", cons, 4}, {"8byte", cons, 8}, + /* These are used for dwarf2. */ + { "file", (void (*) (int)) dwarf2_directive_file, 0 }, + { "loc", dwarf2_directive_loc, 0 }, /* We need to trap the section changing calls to handle .previous. */ {"data", obj_elf_data, 0}, + {"offset", obj_elf_struct, 0}, + {"struct", obj_elf_struct, 0}, {"text", obj_elf_text, 0}, + {"tls_common", obj_elf_tls_common, 0}, + /* End sentinel. */ {NULL, NULL, 0}, }; @@ -184,20 +178,25 @@ static const pseudo_typeS ecoff_debug_pseudo_table[] = /* This is called when the assembler starts. */ +asection *elf_com_section_ptr; + void -elf_begin () +elf_begin (void) { + asection *s; + /* Add symbols for the known sections to the symbol table. */ - symbol_table_insert (section_symbol (bfd_get_section_by_name (stdoutput, - TEXT_SECTION_NAME))); - symbol_table_insert (section_symbol (bfd_get_section_by_name (stdoutput, - DATA_SECTION_NAME))); - symbol_table_insert (section_symbol (bfd_get_section_by_name (stdoutput, - BSS_SECTION_NAME))); + s = bfd_get_section_by_name (stdoutput, TEXT_SECTION_NAME); + symbol_table_insert (section_symbol (s)); + s = bfd_get_section_by_name (stdoutput, DATA_SECTION_NAME); + symbol_table_insert (section_symbol (s)); + s = bfd_get_section_by_name (stdoutput, BSS_SECTION_NAME); + symbol_table_insert (section_symbol (s)); + elf_com_section_ptr = bfd_com_section_ptr; } void -elf_pop_insert () +elf_pop_insert (void) { pop_insert (elf_pseudo_table); if (ECOFF_DEBUGGING) @@ -205,247 +204,180 @@ elf_pop_insert () } static bfd_vma -elf_s_get_size (sym) - symbolS *sym; +elf_s_get_size (symbolS *sym) { return S_GET_SIZE (sym); } static void -elf_s_set_size (sym, sz) - symbolS *sym; - bfd_vma sz; +elf_s_set_size (symbolS *sym, bfd_vma sz) { S_SET_SIZE (sym, sz); } static bfd_vma -elf_s_get_align (sym) - symbolS *sym; +elf_s_get_align (symbolS *sym) { return S_GET_ALIGN (sym); } static void -elf_s_set_align (sym, align) - symbolS *sym; - bfd_vma align; +elf_s_set_align (symbolS *sym, bfd_vma align) { S_SET_ALIGN (sym, align); } int -elf_s_get_other (sym) - symbolS *sym; +elf_s_get_other (symbolS *sym) { return elf_symbol (symbol_get_bfdsym (sym))->internal_elf_sym.st_other; } static void -elf_s_set_other (sym, other) - symbolS *sym; - int other; +elf_s_set_other (symbolS *sym, int other) { S_SET_OTHER (sym, other); } static int -elf_sec_sym_ok_for_reloc (sec) - asection *sec; +elf_sec_sym_ok_for_reloc (asection *sec) { return obj_sec_sym_ok_for_reloc (sec); } void -elf_file_symbol (s) - const char *s; +elf_file_symbol (const char *s, int appfile) { - symbolS *sym; + if (!appfile + || symbol_rootP == NULL + || symbol_rootP->bsym == NULL + || (symbol_rootP->bsym->flags & BSF_FILE) == 0) + { + symbolS *sym; - sym = symbol_new (s, absolute_section, (valueT) 0, (struct frag *) 0); - symbol_set_frag (sym, &zero_address_frag); - symbol_get_bfdsym (sym)->flags |= BSF_FILE; + sym = symbol_new (s, absolute_section, 0, NULL); + symbol_set_frag (sym, &zero_address_frag); + symbol_get_bfdsym (sym)->flags |= BSF_FILE; - if (symbol_rootP != sym) - { - symbol_remove (sym, &symbol_rootP, &symbol_lastP); - symbol_insert (sym, symbol_rootP, &symbol_rootP, &symbol_lastP); + if (symbol_rootP != sym) + { + symbol_remove (sym, &symbol_rootP, &symbol_lastP); + symbol_insert (sym, symbol_rootP, &symbol_rootP, &symbol_lastP); #ifdef DEBUG - verify_symbol_chain (symbol_rootP, symbol_lastP); + verify_symbol_chain (symbol_rootP, symbol_lastP); #endif + } } #ifdef NEED_ECOFF_DEBUG - ecoff_new_file (s); + ecoff_new_file (s, appfile); #endif } -void -obj_elf_common (is_common) - int is_common; +/* Called from read.c:s_comm after we've parsed .comm symbol, size. + Parse a possible alignment value. */ + +symbolS * +elf_common_parse (int ignore ATTRIBUTE_UNUSED, symbolS *symbolP, addressT size) { - char *name; - char c; - char *p; - int temp, size; - symbolS *symbolP; - int have_align; + addressT align = 0; + int is_local = symbol_get_obj (symbolP)->local; - if (flag_mri && is_common) + if (*input_line_pointer == ',') { - s_mri_common (0); - return; - } + char *save = input_line_pointer; - name = input_line_pointer; - c = get_symbol_end (); - /* just after name is now '\0' */ - p = input_line_pointer; - *p = c; - SKIP_WHITESPACE (); - if (*input_line_pointer != ',') - { - as_bad (_("expected comma after symbol-name")); - ignore_rest_of_line (); - return; - } - input_line_pointer++; /* skip ',' */ - if ((temp = get_absolute_expression ()) < 0) - { - as_bad (_(".COMMon length (%d.) <0! Ignored."), temp); - ignore_rest_of_line (); - return; - } - size = temp; - *p = 0; - symbolP = symbol_find_or_make (name); - *p = c; - if (S_IS_DEFINED (symbolP) && ! S_IS_COMMON (symbolP)) - { - as_bad (_("symbol `%s' is already defined"), S_GET_NAME (symbolP)); - ignore_rest_of_line (); - return; - } - if (S_GET_VALUE (symbolP) != 0) - { - if (S_GET_VALUE (symbolP) != (valueT) size) - { - as_warn (_("length of .comm \"%s\" is already %ld; not changed to %d"), - S_GET_NAME (symbolP), (long) S_GET_VALUE (symbolP), size); - } - } - know (symbolP->sy_frag == &zero_address_frag); - if (*input_line_pointer != ',') - have_align = 0; - else - { - have_align = 1; input_line_pointer++; SKIP_WHITESPACE (); - } - if (! have_align || *input_line_pointer != '"') - { - if (! have_align) - temp = 0; - else - { - temp = get_absolute_expression (); - if (temp < 0) - { - temp = 0; - as_warn (_("common alignment negative; 0 assumed")); - } - } - if (symbol_get_obj (symbolP)->local) + + if (*input_line_pointer == '"') { - segT old_sec; - int old_subsec; - char *pfrag; - int align; - - /* allocate_bss: */ - old_sec = now_seg; - old_subsec = now_subseg; - if (temp) + /* For sparc. Accept .common symbol, length, "bss" */ + input_line_pointer++; + /* Some use the dot, some don't. */ + if (*input_line_pointer == '.') + input_line_pointer++; + /* Some say data, some say bss. */ + if (strncmp (input_line_pointer, "bss\"", 4) == 0) + input_line_pointer += 4; + else if (strncmp (input_line_pointer, "data\"", 5) == 0) + input_line_pointer += 5; + else { - /* convert to a power of 2 alignment */ - for (align = 0; (temp & 1) == 0; temp >>= 1, ++align); - if (temp != 1) - { - as_bad (_("common alignment not a power of 2")); - ignore_rest_of_line (); - return; - } + char *p = input_line_pointer; + char c; + + while (*--p != '"') + ; + while (!is_end_of_line[(unsigned char) *input_line_pointer]) + if (*input_line_pointer++ == '"') + break; + c = *input_line_pointer; + *input_line_pointer = '\0'; + as_bad (_("bad .common segment %s"), p); + *input_line_pointer = c; + ignore_rest_of_line (); + return NULL; } - else - align = 0; - record_alignment (bss_section, align); - subseg_set (bss_section, 0); - if (align) - frag_align (align, 0, 0); - if (S_GET_SEGMENT (symbolP) == bss_section) - symbol_get_frag (symbolP)->fr_symbol = 0; - symbol_set_frag (symbolP, frag_now); - pfrag = frag_var (rs_org, 1, 1, (relax_substateT) 0, symbolP, - (offsetT) size, (char *) 0); - *pfrag = 0; - S_SET_SIZE (symbolP, size); - S_SET_SEGMENT (symbolP, bss_section); - S_CLEAR_EXTERNAL (symbolP); - subseg_set (old_sec, old_subsec); + /* ??? Don't ask me why these are always global. */ + is_local = 0; } else { - allocate_common: - S_SET_VALUE (symbolP, (valueT) size); - S_SET_ALIGN (symbolP, temp); - S_SET_EXTERNAL (symbolP); - S_SET_SEGMENT (symbolP, bfd_com_section_ptr); + input_line_pointer = save; + align = parse_align (is_local); + if (align == (addressT) -1) + return NULL; } } + + if (is_local) + { + bss_alloc (symbolP, size, align); + S_CLEAR_EXTERNAL (symbolP); + } else { - input_line_pointer++; - /* @@ Some use the dot, some don't. Can we get some consistency?? */ - if (*input_line_pointer == '.') - input_line_pointer++; - /* @@ Some say data, some say bss. */ - if (strncmp (input_line_pointer, "bss\"", 4) - && strncmp (input_line_pointer, "data\"", 5)) - { - while (*--input_line_pointer != '"') - ; - input_line_pointer--; - goto bad_common_segment; - } - while (*input_line_pointer++ != '"') - ; - goto allocate_common; + S_SET_VALUE (symbolP, size); + S_SET_ALIGN (symbolP, align); + S_SET_EXTERNAL (symbolP); + S_SET_SEGMENT (symbolP, elf_com_section_ptr); } symbol_get_bfdsym (symbolP)->flags |= BSF_OBJECT; - demand_empty_rest_of_line (); - return; + return symbolP; +} - { - bad_common_segment: - p = input_line_pointer; - while (*p && *p != '\n') - p++; - c = *p; - *p = '\0'; - as_bad (_("bad .common segment %s"), input_line_pointer + 1); - *p = c; - input_line_pointer = p; - ignore_rest_of_line (); - return; - } +void +obj_elf_common (int is_common) +{ + if (flag_mri && is_common) + s_mri_common (0); + else + s_comm_internal (0, elf_common_parse); +} + +static void +obj_elf_tls_common (int ignore ATTRIBUTE_UNUSED) +{ + symbolS *symbolP = s_comm_internal (0, elf_common_parse); + + if (symbolP) + symbol_get_bfdsym (symbolP)->flags |= BSF_THREAD_LOCAL; +} + +static void +obj_elf_lcomm (int ignore ATTRIBUTE_UNUSED) +{ + symbolS *symbolP = s_comm_internal (0, s_lcomm_internal); + + if (symbolP) + symbol_get_bfdsym (symbolP)->flags |= BSF_OBJECT; } static void -obj_elf_local (ignore) - int ignore ATTRIBUTE_UNUSED; +obj_elf_local (int ignore ATTRIBUTE_UNUSED) { char *name; int c; @@ -473,8 +405,7 @@ obj_elf_local (ignore) } static void -obj_elf_weak (ignore) - int ignore ATTRIBUTE_UNUSED; +obj_elf_weak (int ignore ATTRIBUTE_UNUSED) { char *name; int c; @@ -502,8 +433,7 @@ obj_elf_weak (ignore) } static void -obj_elf_visibility (visibility) - int visibility; +obj_elf_visibility (int visibility) { char *name; int c; @@ -525,7 +455,8 @@ obj_elf_visibility (visibility) assert (elfsym); - elfsym->internal_elf_sym.st_other = visibility; + elfsym->internal_elf_sym.st_other &= ~3; + elfsym->internal_elf_sym.st_other |= visibility; if (c == ',') { @@ -554,6 +485,18 @@ struct section_stack static struct section_stack *section_stack; +static bfd_boolean +get_section (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, void *inf) +{ + const char *gname = inf; + const char *group_name = elf_group_name (sec); + + return (group_name == gname + || (group_name != NULL + && gname != NULL + && strcmp (group_name, gname) == 0)); +} + /* Handle the .section pseudo-op. This code supports two different syntaxes. @@ -572,66 +515,20 @@ static struct section_stack *section_stack; other possibilities, but I don't know what they are. In any case, BFD doesn't really let us set the section type. */ -/* Certain named sections have particular defined types, listed on p. - 4-19 of the ABI. */ -struct special_section -{ - const char *name; - int type; - int attributes; -}; - -static struct special_section const special_sections[] = -{ - { ".bss", SHT_NOBITS, SHF_ALLOC + SHF_WRITE }, - { ".comment", SHT_PROGBITS, 0 }, - { ".data", SHT_PROGBITS, SHF_ALLOC + SHF_WRITE }, - { ".data1", SHT_PROGBITS, SHF_ALLOC + SHF_WRITE }, - { ".debug", SHT_PROGBITS, 0 }, - { ".fini", SHT_PROGBITS, SHF_ALLOC + SHF_EXECINSTR }, - { ".init", SHT_PROGBITS, SHF_ALLOC + SHF_EXECINSTR }, - { ".line", SHT_PROGBITS, 0 }, - { ".note", SHT_NOTE, 0 }, - { ".rodata", SHT_PROGBITS, SHF_ALLOC }, - { ".rodata1", SHT_PROGBITS, SHF_ALLOC }, - { ".text", SHT_PROGBITS, SHF_ALLOC + SHF_EXECINSTR }, - -#ifdef ELF_TC_SPECIAL_SECTIONS - ELF_TC_SPECIAL_SECTIONS -#endif - -#if 0 - /* The following section names are special, but they can not - reasonably appear in assembler code. Some of the attributes are - processor dependent. */ - { ".dynamic", SHT_DYNAMIC, SHF_ALLOC /* + SHF_WRITE */ }, - { ".dynstr", SHT_STRTAB, SHF_ALLOC }, - { ".dynsym", SHT_DYNSYM, SHF_ALLOC }, - { ".got", SHT_PROGBITS, 0 }, - { ".hash", SHT_HASH, SHF_ALLOC }, - { ".interp", SHT_PROGBITS, /* SHF_ALLOC */ }, - { ".plt", SHT_PROGBITS, 0 }, - { ".shstrtab",SHT_STRTAB, 0 }, - { ".strtab", SHT_STRTAB, /* SHF_ALLOC */ }, - { ".symtab", SHT_SYMTAB, /* SHF_ALLOC */ }, -#endif - - { NULL, 0, 0 } -}; - -static void -obj_elf_change_section (name, type, attr, entsize, group_name, push) - const char *name; - int type; - int attr; - int entsize; - const char *group_name; - int push; +void +obj_elf_change_section (const char *name, + int type, + int attr, + int entsize, + const char *group_name, + int linkonce, + int push) { asection *old_sec; segT sec; flagword flags; - int i; + const struct elf_backend_data *bed; + const struct bfd_elf_special_section *ssect; #ifdef md_flush_pending_output md_flush_pending_output (); @@ -652,42 +549,99 @@ obj_elf_change_section (name, type, attr, entsize, group_name, push) previous_section = now_seg; previous_subsection = now_subseg; - old_sec = bfd_get_section_by_name (stdoutput, name); - sec = subseg_new (name, 0); + old_sec = bfd_get_section_by_name_if (stdoutput, name, get_section, + (void *) group_name); + if (old_sec) + { + sec = old_sec; + subseg_set (sec, 0); + } + else + sec = subseg_force_new (name, 0); - /* See if this is one of the special sections. */ - for (i = 0; special_sections[i].name != NULL; i++) - if (strcmp (name, special_sections[i].name) == 0) - { - if (type == SHT_NULL) - type = special_sections[i].type; - else if (type != special_sections[i].type) - { - if (old_sec == NULL) - { - as_warn (_("setting incorrect section type for %s"), name); - } - else - { - as_warn (_("ignoring incorrect section type for %s"), name); - type = special_sections[i].type; - } - } - if ((attr &~ special_sections[i].attributes) != 0 - && old_sec == NULL) - { - /* As a GNU extension, we permit a .note section to be - allocatable. If the linker sees an allocateable .note - section, it will create a PT_NOTE segment in the output - file. */ - if (strcmp (name, ".note") != 0 - || attr != SHF_ALLOC) - as_warn (_("setting incorrect section attributes for %s"), + bed = get_elf_backend_data (stdoutput); + ssect = (*bed->get_sec_type_attr) (stdoutput, sec); + + if (ssect != NULL) + { + bfd_boolean override = FALSE; + + if (type == SHT_NULL) + type = ssect->type; + else if (type != ssect->type) + { + if (old_sec == NULL + /* FIXME: gcc, as of 2002-10-22, will emit + + .section .init_array,"aw",@progbits + + for __attribute__ ((section (".init_array"))). + "@progbits" is incorrect. Also for x86-64 large bss + sections, gcc, as of 2005-07-06, will emit + + .section .lbss,"aw",@progbits + + "@progbits" is incorrect. */ +#ifdef TC_I386 + && (bed->s->arch_size != 64 + || !(ssect->attr & SHF_X86_64_LARGE)) +#endif + && ssect->type != SHT_INIT_ARRAY + && ssect->type != SHT_FINI_ARRAY + && ssect->type != SHT_PREINIT_ARRAY) + { + /* We allow to specify any type for a .note section. */ + if (ssect->type != SHT_NOTE) + as_warn (_("setting incorrect section type for %s"), + name); + } + else + { + as_warn (_("ignoring incorrect section type for %s"), name); - } - attr |= special_sections[i].attributes; - break; - } + type = ssect->type; + } + } + + if (old_sec == NULL && (attr & ~ssect->attr) != 0) + { + /* As a GNU extension, we permit a .note section to be + allocatable. If the linker sees an allocatable .note + section, it will create a PT_NOTE segment in the output + file. We also allow "x" for .note.GNU-stack. */ + if (ssect->type == SHT_NOTE + && (attr == SHF_ALLOC || attr == SHF_EXECINSTR)) + ; + /* Allow different SHF_MERGE and SHF_STRINGS if we have + something like .rodata.str. */ + else if (ssect->suffix_length == -2 + && name[ssect->prefix_length] == '.' + && (attr + & ~ssect->attr + & ~SHF_MERGE + & ~SHF_STRINGS) == 0) + ; + /* .interp, .strtab and .symtab can have SHF_ALLOC. */ + else if (attr == SHF_ALLOC + && (strcmp (name, ".interp") == 0 + || strcmp (name, ".strtab") == 0 + || strcmp (name, ".symtab") == 0)) + override = TRUE; + /* .note.GNU-stack can have SHF_EXECINSTR. */ + else if (attr == SHF_EXECINSTR + && strcmp (name, ".note.GNU-stack") == 0) + override = TRUE; + else + { + if (group_name == NULL) + as_warn (_("setting incorrect section attributes for %s"), + name); + override = TRUE; + } + } + if (!override && old_sec == NULL) + attr |= ssect->attr; + } /* Convert ELF type and flags to BFD flags. */ flags = (SEC_RELOC @@ -696,18 +650,25 @@ obj_elf_change_section (name, type, attr, entsize, group_name, push) | (((attr & SHF_ALLOC) && type != SHT_NOBITS) ? SEC_LOAD : 0) | ((attr & SHF_EXECINSTR) ? SEC_CODE : 0) | ((attr & SHF_MERGE) ? SEC_MERGE : 0) - | ((attr & SHF_STRINGS) ? SEC_STRINGS : 0)); + | ((attr & SHF_STRINGS) ? SEC_STRINGS : 0) + | ((attr & SHF_TLS) ? SEC_THREAD_LOCAL : 0)); #ifdef md_elf_section_flags flags = md_elf_section_flags (flags, attr, type); #endif + if (linkonce) + flags |= SEC_LINK_ONCE | SEC_LINK_DUPLICATES_DISCARD; + if (old_sec == NULL) { symbolS *secsym; + elf_section_type (sec) = type; + elf_section_flags (sec) = attr; + /* Prevent SEC_HAS_CONTENTS from being inadvertently set. */ if (type == SHT_NOBITS) - seg_info (sec)->bss = 1; + seg_info (sec)->bss = 1; bfd_set_section_flags (stdoutput, sec, flags); if (flags & SEC_MERGE) @@ -719,22 +680,28 @@ obj_elf_change_section (name, type, attr, entsize, group_name, push) if (secsym != NULL) symbol_set_bfdsym (secsym, sec->symbol); else - symbol_table_insert (section_symbol (sec)); + symbol_table_insert (section_symbol (sec)); } - else if (attr != 0) + else { - /* If section attributes are specified the second time we see a - particular section, then check that they are the same as we - saw the first time. */ - if ((old_sec->flags ^ flags) - & (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE - | SEC_EXCLUDE | SEC_SORT_ENTRIES | SEC_MERGE | SEC_STRINGS)) - as_warn (_("ignoring changed section attributes for %s"), name); - else if ((flags & SEC_MERGE) && old_sec->entsize != (unsigned) entsize) - as_warn (_("ignoring changed section entity size for %s"), name); - else if ((attr & SHF_GROUP) != 0 - && strcmp (elf_group_name (old_sec), group_name) != 0) - as_warn (_("ignoring new section group for %s"), name); + if (type != SHT_NULL + && (unsigned) type != elf_section_type (old_sec)) + as_warn (_("ignoring changed section type for %s"), name); + + if (attr != 0) + { + /* If section attributes are specified the second time we see a + particular section, then check that they are the same as we + saw the first time. */ + if (((old_sec->flags ^ flags) + & (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE + | SEC_EXCLUDE | SEC_SORT_ENTRIES | SEC_MERGE | SEC_STRINGS + | SEC_LINK_ONCE | SEC_LINK_DUPLICATES_DISCARD + | SEC_THREAD_LOCAL))) + as_warn (_("ignoring changed section attributes for %s"), name); + if ((flags & SEC_MERGE) && old_sec->entsize != (unsigned) entsize) + as_warn (_("ignoring changed section entity size for %s"), name); + } } #ifdef md_elf_section_change_hook @@ -743,9 +710,7 @@ obj_elf_change_section (name, type, attr, entsize, group_name, push) } static int -obj_elf_parse_section_letters (str, len) - char *str; - size_t len; +obj_elf_parse_section_letters (char *str, size_t len) { int attr = 0; @@ -771,6 +736,9 @@ obj_elf_parse_section_letters (str, len) case 'G': attr |= SHF_GROUP; break; + case 'T': + attr |= SHF_TLS; + break; /* Compatibility. */ case 'm': if (*(str - 1) == 'a') @@ -785,17 +753,14 @@ obj_elf_parse_section_letters (str, len) } default: { - char *bad_msg = _("unrecognized .section attribute: want a,w,x,M,S,G"); + char *bad_msg = _("unrecognized .section attribute: want a,w,x,M,S,G,T"); #ifdef md_elf_section_letter int md_attr = md_elf_section_letter (*str, &bad_msg); if (md_attr >= 0) attr |= md_attr; else #endif - { - as_warn ("%s", bad_msg); - attr = -1; - } + as_fatal ("%s", bad_msg); } break; } @@ -806,9 +771,7 @@ obj_elf_parse_section_letters (str, len) } static int -obj_elf_section_word (str, len) - char *str; - size_t len; +obj_elf_section_word (char *str, size_t len) { if (len == 5 && strncmp (str, "write", 5) == 0) return SHF_WRITE; @@ -816,6 +779,8 @@ obj_elf_section_word (str, len) return SHF_ALLOC; if (len == 9 && strncmp (str, "execinstr", 9) == 0) return SHF_EXECINSTR; + if (len == 3 && strncmp (str, "tls", 3) == 0) + return SHF_TLS; #ifdef md_elf_section_word { @@ -830,14 +795,20 @@ obj_elf_section_word (str, len) } static int -obj_elf_section_type (str, len) - char *str; - size_t len; +obj_elf_section_type (char *str, size_t len) { if (len == 8 && strncmp (str, "progbits", 8) == 0) return SHT_PROGBITS; if (len == 6 && strncmp (str, "nobits", 6) == 0) return SHT_NOBITS; + if (len == 4 && strncmp (str, "note", 4) == 0) + return SHT_NOTE; + if (len == 10 && strncmp (str, "init_array", 10) == 0) + return SHT_INIT_ARRAY; + if (len == 10 && strncmp (str, "fini_array", 10) == 0) + return SHT_FINI_ARRAY; + if (len == 13 && strncmp (str, "preinit_array", 13) == 0) + return SHT_PREINIT_ARRAY; #ifdef md_elf_section_type { @@ -853,7 +824,7 @@ obj_elf_section_type (str, len) /* Get name of section. */ static char * -obj_elf_section_name () +obj_elf_section_name (void) { char *name; @@ -877,7 +848,7 @@ obj_elf_section_name () end++; if (end == input_line_pointer) { - as_warn (_("missing name")); + as_bad (_("missing name")); ignore_rest_of_line (); return NULL; } @@ -885,6 +856,9 @@ obj_elf_section_name () name = xmalloc (end - input_line_pointer + 1); memcpy (name, input_line_pointer, end - input_line_pointer); name[end - input_line_pointer] = '\0'; +#ifdef tc_canonicalize_section_name + name = tc_canonicalize_section_name (name); +#endif input_line_pointer = end; } SKIP_WHITESPACE (); @@ -892,12 +866,12 @@ obj_elf_section_name () } void -obj_elf_section (push) - int push; +obj_elf_section (int push) { char *name, *group_name, *beg; int type, attr, dummy; int entsize; + int linkonce; #ifndef TC_I370 if (flag_mri) @@ -928,6 +902,7 @@ obj_elf_section (push) attr = 0; group_name = NULL; entsize = 0; + linkonce = 0; if (*input_line_pointer == ',') { @@ -1001,6 +976,13 @@ obj_elf_section (push) group_name = obj_elf_section_name (); if (group_name == NULL) attr &= ~SHF_GROUP; + else if (strncmp (input_line_pointer, ",comdat", 7) == 0) + { + input_line_pointer += 7; + linkonce = 1; + } + else if (strncmp (name, ".gnu.linkonce", 13) == 0) + linkonce = 1; } else if ((attr & SHF_GROUP) != 0) { @@ -1017,7 +999,7 @@ obj_elf_section (push) SKIP_WHITESPACE (); if (*input_line_pointer != '#') { - as_warn (_("character following name is not '#'")); + as_bad (_("character following name is not '#'")); ignore_rest_of_line (); return; } @@ -1036,14 +1018,13 @@ obj_elf_section (push) demand_empty_rest_of_line (); - obj_elf_change_section (name, type, attr, entsize, group_name, push); + obj_elf_change_section (name, type, attr, entsize, group_name, linkonce, push); } /* Change to the .data section. */ void -obj_elf_data (i) - int i; +obj_elf_data (int i) { #ifdef md_flush_pending_output md_flush_pending_output (); @@ -1061,8 +1042,7 @@ obj_elf_data (i) /* Change to the .text section. */ void -obj_elf_text (i) - int i; +obj_elf_text (int i) { #ifdef md_flush_pending_output md_flush_pending_output (); @@ -1077,9 +1057,26 @@ obj_elf_text (i) #endif } +/* Change to the *ABS* section. */ + +void +obj_elf_struct (int i) +{ +#ifdef md_flush_pending_output + md_flush_pending_output (); +#endif + + previous_section = now_seg; + previous_subsection = now_subseg; + s_struct (i); + +#ifdef md_elf_section_change_hook + md_elf_section_change_hook (); +#endif +} + static void -obj_elf_subsection (ignore) - int ignore ATTRIBUTE_UNUSED; +obj_elf_subsection (int ignore ATTRIBUTE_UNUSED) { register int temp; @@ -1103,15 +1100,14 @@ obj_elf_subsection (ignore) sections. */ void -obj_elf_section_change_hook () +obj_elf_section_change_hook (void) { previous_section = now_seg; previous_subsection = now_subseg; } void -obj_elf_previous (ignore) - int ignore ATTRIBUTE_UNUSED; +obj_elf_previous (int ignore ATTRIBUTE_UNUSED) { segT new_section; int new_subsection; @@ -1138,8 +1134,7 @@ obj_elf_previous (ignore) } static void -obj_elf_popsection (xxx) - int xxx ATTRIBUTE_UNUSED; +obj_elf_popsection (int xxx ATTRIBUTE_UNUSED) { struct section_stack *top = section_stack; @@ -1165,12 +1160,11 @@ obj_elf_popsection (xxx) } static void -obj_elf_line (ignore) - int ignore ATTRIBUTE_UNUSED; +obj_elf_line (int ignore ATTRIBUTE_UNUSED) { /* Assume delimiter is part of expression. BSD4.2 as fails with delightful bug, so we are not being incompatible here. */ - new_logical_line ((char *) NULL, (int) (get_absolute_expression ())); + new_logical_line (NULL, get_absolute_expression ()); demand_empty_rest_of_line (); } @@ -1181,8 +1175,7 @@ obj_elf_line (ignore) with the same value as the symbol NAME. */ static void -obj_elf_symver (ignore) - int ignore ATTRIBUTE_UNUSED; +obj_elf_symver (int ignore ATTRIBUTE_UNUSED) { char *name; char c; @@ -1205,6 +1198,7 @@ obj_elf_symver (ignore) } ++input_line_pointer; + SKIP_WHITESPACE (); name = input_line_pointer; /* Temporarily include '@' in symbol names. */ @@ -1251,8 +1245,7 @@ obj_elf_symver (ignore) syntax is ".vtable_inherit CHILDNAME, PARENTNAME". */ struct fix * -obj_elf_vtable_inherit (ignore) - int ignore ATTRIBUTE_UNUSED; +obj_elf_vtable_inherit (int ignore ATTRIBUTE_UNUSED) { char *cname, *pname; symbolS *csym, *psym; @@ -1323,8 +1316,7 @@ obj_elf_vtable_inherit (ignore) ".vtable_entry tablename, offset". */ struct fix * -obj_elf_vtable_entry (ignore) - int ignore ATTRIBUTE_UNUSED; +obj_elf_vtable_entry (int ignore ATTRIBUTE_UNUSED) { char *name; symbolS *sym; @@ -1360,7 +1352,7 @@ obj_elf_vtable_entry (ignore) } void -elf_obj_read_begin_hook () +elf_obj_read_begin_hook (void) { #ifdef NEED_ECOFF_DEBUG if (ECOFF_DEBUGGING) @@ -1369,8 +1361,7 @@ elf_obj_read_begin_hook () } void -elf_obj_symbol_new_hook (symbolP) - symbolS *symbolP; +elf_obj_symbol_new_hook (symbolS *symbolP) { struct elf_obj_sy *sy_obj; @@ -1389,16 +1380,14 @@ elf_obj_symbol_new_hook (symbolP) context. */ void -elf_copy_symbol_attributes (dest, src) - symbolS *dest, *src; +elf_copy_symbol_attributes (symbolS *dest, symbolS *src) { struct elf_obj_sy *srcelf = symbol_get_obj (src); struct elf_obj_sy *destelf = symbol_get_obj (dest); if (srcelf->size) { if (destelf->size == NULL) - destelf->size = - (expressionS *) xmalloc (sizeof (expressionS)); + destelf->size = xmalloc (sizeof (expressionS)); *destelf->size = *srcelf->size; } else @@ -1408,12 +1397,13 @@ elf_copy_symbol_attributes (dest, src) destelf->size = NULL; } S_SET_SIZE (dest, S_GET_SIZE (src)); - S_SET_OTHER (dest, S_GET_OTHER (src)); + /* Don't copy visibility. */ + S_SET_OTHER (dest, (ELF_ST_VISIBILITY (S_GET_OTHER (dest)) + | (S_GET_OTHER (src) & ~ELF_ST_VISIBILITY (-1)))); } void -obj_elf_version (ignore) - int ignore ATTRIBUTE_UNUSED; +obj_elf_version (int ignore ATTRIBUTE_UNUSED) { char *name; unsigned int c; @@ -1422,7 +1412,7 @@ obj_elf_version (ignore) subsegT subseg = now_subseg; Elf_Internal_Note i_note; Elf_External_Note e_note; - asection *note_secp = (asection *) NULL; + asection *note_secp = NULL; int len; SKIP_WHITESPACE (); @@ -1453,11 +1443,11 @@ obj_elf_version (ignore) i_note.descsz = 0; /* no description */ i_note.type = NT_VERSION; p = frag_more (sizeof (e_note.namesz)); - md_number_to_chars (p, (valueT) i_note.namesz, sizeof (e_note.namesz)); + md_number_to_chars (p, i_note.namesz, sizeof (e_note.namesz)); p = frag_more (sizeof (e_note.descsz)); - md_number_to_chars (p, (valueT) i_note.descsz, sizeof (e_note.descsz)); + md_number_to_chars (p, i_note.descsz, sizeof (e_note.descsz)); p = frag_more (sizeof (e_note.type)); - md_number_to_chars (p, (valueT) i_note.type, sizeof (e_note.type)); + md_number_to_chars (p, i_note.type, sizeof (e_note.type)); p = frag_more (len + 1); strcpy (p, name); @@ -1473,8 +1463,7 @@ obj_elf_version (ignore) } static void -obj_elf_size (ignore) - int ignore ATTRIBUTE_UNUSED; +obj_elf_size (int ignore ATTRIBUTE_UNUSED) { char *name = input_line_pointer; char c = get_symbol_end (); @@ -1515,8 +1504,7 @@ obj_elf_size (ignore) } else { - symbol_get_obj (sym)->size = - (expressionS *) xmalloc (sizeof (expressionS)); + symbol_get_obj (sym)->size = xmalloc (sizeof (expressionS)); *symbol_get_obj (sym)->size = exp; } demand_empty_rest_of_line (); @@ -1538,8 +1526,7 @@ obj_elf_size (ignore) */ static void -obj_elf_type (ignore) - int ignore ATTRIBUTE_UNUSED; +obj_elf_type (int ignore ATTRIBUTE_UNUSED) { char *name; char c; @@ -1575,6 +1562,12 @@ obj_elf_type (ignore) else if (strcmp (typename, "object") == 0 || strcmp (typename, "STT_OBJECT") == 0) type = BSF_OBJECT; + else if (strcmp (typename, "tls_object") == 0 + || strcmp (typename, "STT_TLS") == 0) + type = BSF_OBJECT | BSF_THREAD_LOCAL; + else if (strcmp (typename, "notype") == 0 + || strcmp (typename, "STT_NOTYPE") == 0) + ; #ifdef md_elf_symbol_type else if ((type = md_elf_symbol_type (typename, sym, elfsym)) != -1) ; @@ -1593,8 +1586,7 @@ obj_elf_type (ignore) } static void -obj_elf_ident (ignore) - int ignore ATTRIBUTE_UNUSED; +obj_elf_ident (int ignore ATTRIBUTE_UNUSED) { static segT comment_section; segT old_section = now_seg; @@ -1624,8 +1616,7 @@ obj_elf_ident (ignore) /* The first entry in a .stabs section is special. */ void -obj_elf_init_stab_section (seg) - segT seg; +obj_elf_init_stab_section (segT seg) { char *file; char *p; @@ -1640,8 +1631,8 @@ obj_elf_init_stab_section (seg) p = frag_more (12); /* Zero it out. */ memset (p, 0, 12); - as_where (&file, (unsigned int *) NULL); - stabstr_name = (char *) alloca (strlen (segment_name (seg)) + 4); + as_where (&file, NULL); + stabstr_name = xmalloc (strlen (segment_name (seg)) + 4); strcpy (stabstr_name, segment_name (seg)); strcat (stabstr_name, "str"); stroff = get_stab_string_offset (file, stabstr_name); @@ -1655,10 +1646,7 @@ obj_elf_init_stab_section (seg) /* Fill in the counts in the first entry in a .stabs section. */ static void -adjust_stab_sections (abfd, sec, xxx) - bfd *abfd; - asection *sec; - PTR xxx ATTRIBUTE_UNUSED; +adjust_stab_sections (bfd *abfd, asection *sec, void *xxx ATTRIBUTE_UNUSED) { char *name; asection *strsec; @@ -1670,7 +1658,7 @@ adjust_stab_sections (abfd, sec, xxx) if (!strcmp ("str", sec->name + strlen (sec->name) - 3)) return; - name = (char *) alloca (strlen (sec->name) + 4); + name = alloca (strlen (sec->name) + 4); strcpy (name, sec->name); strcat (name, "str"); strsec = bfd_get_section_by_name (abfd, name); @@ -1683,8 +1671,8 @@ adjust_stab_sections (abfd, sec, xxx) p = seg_info (sec)->stabu.p; assert (p != 0); - bfd_h_put_16 (abfd, (bfd_vma) nsyms, (bfd_byte *) p + 6); - bfd_h_put_32 (abfd, (bfd_vma) strsz, (bfd_byte *) p + 8); + bfd_h_put_16 (abfd, nsyms, p + 6); + bfd_h_put_32 (abfd, strsz, p + 8); } #ifdef NEED_ECOFF_DEBUG @@ -1696,45 +1684,37 @@ adjust_stab_sections (abfd, sec, xxx) in the symbol. */ void -elf_ecoff_set_ext (sym, ext) - symbolS *sym; - struct ecoff_extr *ext; +elf_ecoff_set_ext (symbolS *sym, struct ecoff_extr *ext) { - symbol_get_bfdsym (sym)->udata.p = (PTR) ext; + symbol_get_bfdsym (sym)->udata.p = ext; } /* This function is called by bfd_ecoff_debug_externals. It is supposed to *EXT to the external symbol information, and return whether the symbol should be used at all. */ -static boolean -elf_get_extr (sym, ext) - asymbol *sym; - EXTR *ext; +static bfd_boolean +elf_get_extr (asymbol *sym, EXTR *ext) { if (sym->udata.p == NULL) - return false; + return FALSE; *ext = *(EXTR *) sym->udata.p; - return true; + return TRUE; } /* This function is called by bfd_ecoff_debug_externals. It has nothing to do for ELF. */ -/*ARGSUSED*/ static void -elf_set_index (sym, indx) - asymbol *sym ATTRIBUTE_UNUSED; - bfd_size_type indx ATTRIBUTE_UNUSED; +elf_set_index (asymbol *sym ATTRIBUTE_UNUSED, + bfd_size_type indx ATTRIBUTE_UNUSED) { } #endif /* NEED_ECOFF_DEBUG */ void -elf_frob_symbol (symp, puntp) - symbolS *symp; - int *puntp; +elf_frob_symbol (symbolS *symp, int *puntp) { struct elf_obj_sy *sy_obj; @@ -1777,9 +1757,9 @@ elf_frob_symbol (symp, puntp) /* This symbol was given a new name with the .symver directive. - If this is an external reference, just rename the symbol to - include the version string. This will make the relocs be - against the correct versioned symbol. + If this is an external reference, just rename the symbol to + include the version string. This will make the relocs be + against the correct versioned symbol. If this is a definition, add an alias. FIXME: Using an alias will permit the debugging information to refer to the right @@ -1789,26 +1769,26 @@ elf_frob_symbol (symp, puntp) if (! S_IS_DEFINED (symp)) { /* Verify that the name isn't using the @@ syntax--this is - reserved for definitions of the default version to link - against. */ + reserved for definitions of the default version to link + against. */ if (p[1] == ELF_VER_CHR) { as_bad (_("invalid attempt to declare external version name as default in symbol `%s'"), sy_obj->versioned_name); - *puntp = true; + *puntp = TRUE; } S_SET_NAME (symp, sy_obj->versioned_name); } else { - if (p [1] == ELF_VER_CHR && p [2] == ELF_VER_CHR) + if (p[1] == ELF_VER_CHR && p[2] == ELF_VER_CHR) { size_t l; /* The @@@ syntax is a special case. It renames the symbol name to versioned_name with one `@' removed. */ l = strlen (&p[3]) + 1; - memmove (&p [2], &p[3], l); + memmove (&p[2], &p[3], l); S_SET_NAME (symp, sy_obj->versioned_name); } else @@ -1839,6 +1819,8 @@ elf_frob_symbol (symp, puntp) /* This will copy over the size information. */ copy_symbol_attributes (symp2, symp); + S_SET_OTHER (symp2, S_GET_OTHER (symp)); + if (S_IS_WEAK (symp)) S_SET_WEAK (symp2); @@ -1872,17 +1854,6 @@ elf_frob_symbol (symp, puntp) && (symbol_get_bfdsym (symp)->flags & BSF_FUNCTION) == 0) symbol_get_bfdsym (symp)->flags |= BSF_OBJECT; #endif - -#if 0 /* TC_PPC */ - /* If TC_PPC is defined, we used to force the type of a symbol to be - BSF_OBJECT if it was otherwise unset. This was required by some - version of VxWorks. Thomas de Lellis says - that this is no longer needed, so it is now commented out. */ - if ((symbol_get_bfdsym (symp)->flags - & (BSF_FUNCTION | BSF_FILE | BSF_SECTION_SYM)) == 0 - && S_IS_DEFINED (symp)) - symbol_get_bfdsym (symp)->flags |= BSF_OBJECT; -#endif } struct group_list @@ -1898,12 +1869,9 @@ struct group_list each list. */ static void -build_group_lists (abfd, sec, inf) - bfd *abfd ATTRIBUTE_UNUSED; - asection *sec; - PTR inf; +build_group_lists (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, void *inf) { - struct group_list *list = (struct group_list *) inf; + struct group_list *list = inf; const char *group_name = elf_group_name (sec); unsigned int i; @@ -1939,18 +1907,18 @@ build_group_lists (abfd, sec, inf) } void -elf_frob_file () +elf_frob_file (void) { struct group_list list; unsigned int i; - bfd_map_over_sections (stdoutput, adjust_stab_sections, (PTR) 0); + bfd_map_over_sections (stdoutput, adjust_stab_sections, NULL); /* Go find section groups. */ list.num_group = 0; list.head = NULL; list.elt_count = NULL; - bfd_map_over_sections (stdoutput, build_group_lists, (PTR) &list); + bfd_map_over_sections (stdoutput, build_group_lists, &list); /* Make the SHT_GROUP sections that describe each section group. We can't set up the section contents here yet, because elf section @@ -1959,11 +1927,38 @@ elf_frob_file () for (i = 0; i < list.num_group; i++) { const char *group_name = elf_group_name (list.head[i]); + const char *sec_name; asection *s; flagword flags; + struct symbol *sy; + int has_sym; + bfd_size_type size; - s = subseg_force_new (group_name, 0); flags = SEC_READONLY | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_GROUP; + for (s = list.head[i]; s != NULL; s = elf_next_in_group (s)) + if ((s->flags ^ flags) & SEC_LINK_ONCE) + { + flags |= SEC_LINK_ONCE | SEC_LINK_DUPLICATES_DISCARD; + if (s != list.head[i]) + { + as_warn (_("assuming all members of group `%s' are COMDAT"), + group_name); + break; + } + } + + sec_name = group_name; + sy = symbol_find_exact (group_name); + has_sym = 0; + if (sy != NULL + && (sy == symbol_lastP + || (sy->sy_next != NULL + && sy->sy_next->sy_previous == sy))) + { + has_sym = 1; + sec_name = ".group"; + } + s = subseg_force_new (sec_name, 0); if (s == NULL || !bfd_set_section_flags (stdoutput, s, flags) || !bfd_set_section_alignment (stdoutput, s, 2)) @@ -1971,12 +1966,16 @@ elf_frob_file () as_fatal (_("can't create group: %s"), bfd_errmsg (bfd_get_error ())); } + elf_section_type (s) = SHT_GROUP; /* Pass a pointer to the first section in this group. */ elf_next_in_group (s) = list.head[i]; + if (has_sym) + elf_group_id (s) = sy->bsym; - s->_raw_size = 4 * (list.elt_count[i] + 1); - s->contents = frag_more (s->_raw_size); + size = 4 * (list.elt_count[i] + 1); + bfd_set_section_size (stdoutput, s, size); + s->contents = (unsigned char *) frag_more (size); frag_now->fr_fix = frag_now_fix_octets (); } @@ -1988,16 +1987,16 @@ elf_frob_file () /* It removes any unneeded versioned symbols from the symbol table. */ void -elf_frob_file_before_adjust () +elf_frob_file_before_adjust (void) { if (symbol_rootP) { symbolS *symp; for (symp = symbol_rootP; symp; symp = symbol_next (symp)) - if (symbol_get_obj (symp)->versioned_name) + if (!S_IS_DEFINED (symp)) { - if (!S_IS_DEFINED (symp)) + if (symbol_get_obj (symp)->versioned_name) { char *p; @@ -2008,15 +2007,23 @@ elf_frob_file_before_adjust () p = strchr (symbol_get_obj (symp)->versioned_name, ELF_VER_CHR); know (p != NULL); - if (p [1] == ELF_VER_CHR && p [2] == ELF_VER_CHR) + if (p[1] == ELF_VER_CHR && p[2] == ELF_VER_CHR) { size_t l = strlen (&p[3]) + 1; - memmove (&p [1], &p[3], l); + memmove (&p[1], &p[3], l); } if (symbol_used_p (symp) == 0 && symbol_used_in_reloc_p (symp) == 0) symbol_remove (symp, &symbol_rootP, &symbol_lastP); } + + /* If there was .weak foo, but foo was neither defined nor + used anywhere, remove it. */ + + else if (S_IS_WEAK (symp) + && symbol_used_p (symp) == 0 + && symbol_used_in_reloc_p (symp) == 0) + symbol_remove (symp, &symbol_rootP, &symbol_lastP); } } } @@ -2027,7 +2034,7 @@ elf_frob_file_before_adjust () have generated the relocation section. */ void -elf_frob_file_after_relocs () +elf_frob_file_after_relocs (void) { #ifdef NEED_ECOFF_DEBUG if (ECOFF_DEBUGGING) @@ -2040,7 +2047,7 @@ elf_frob_file_after_relocs () debug_swap = get_elf_backend_data (stdoutput)->elf_backend_ecoff_debug_swap; - know (debug_swap != (const struct ecoff_debug_swap *) NULL); + know (debug_swap != NULL); ecoff_build_debug (&debug.symbolic_header, &buf, debug_swap); /* Set up the pointers in debug. */ @@ -2048,14 +2055,14 @@ elf_frob_file_after_relocs () debug.ptr = (type) (buf + debug.symbolic_header.offset) SET (line, cbLineOffset, unsigned char *); - SET (external_dnr, cbDnOffset, PTR); - SET (external_pdr, cbPdOffset, PTR); - SET (external_sym, cbSymOffset, PTR); - SET (external_opt, cbOptOffset, PTR); + SET (external_dnr, cbDnOffset, void *); + SET (external_pdr, cbPdOffset, void *); + SET (external_sym, cbSymOffset, void *); + SET (external_opt, cbOptOffset, void *); SET (external_aux, cbAuxOffset, union aux_ext *); SET (ss, cbSsOffset, char *); - SET (external_fdr, cbFdOffset, PTR); - SET (external_rfd, cbRfdOffset, PTR); + SET (external_fdr, cbFdOffset, void *); + SET (external_rfd, cbRfdOffset, void *); /* ssext and external_ext are set up just below. */ #undef SET @@ -2063,7 +2070,7 @@ elf_frob_file_after_relocs () /* Set up the external symbols. */ debug.ssext = debug.ssext_end = NULL; debug.external_ext = debug.external_ext_end = NULL; - if (! bfd_ecoff_debug_externals (stdoutput, &debug, debug_swap, true, + if (! bfd_ecoff_debug_externals (stdoutput, &debug, debug_swap, TRUE, elf_get_extr, elf_set_index)) as_fatal (_("failed to set up debugging information: %s"), bfd_errmsg (bfd_get_error ())); @@ -2071,24 +2078,24 @@ elf_frob_file_after_relocs () sec = bfd_get_section_by_name (stdoutput, ".mdebug"); assert (sec != NULL); - know (stdoutput->output_has_begun == false); + know (!stdoutput->output_has_begun); /* We set the size of the section, call bfd_set_section_contents to force the ELF backend to allocate a file position, and then write out the data. FIXME: Is this really the best way to do this? */ - sec->_raw_size = bfd_ecoff_debug_size (stdoutput, &debug, debug_swap); + bfd_set_section_size + (stdoutput, sec, bfd_ecoff_debug_size (stdoutput, &debug, debug_swap)); /* Pass BUF to bfd_set_section_contents because this will - eventually become a call to fwrite, and ISO C prohibits - passing a NULL pointer to a stdio function even if the - pointer will not be used. */ - if (! bfd_set_section_contents (stdoutput, sec, (PTR) buf, - (file_ptr) 0, (bfd_size_type) 0)) + eventually become a call to fwrite, and ISO C prohibits + passing a NULL pointer to a stdio function even if the + pointer will not be used. */ + if (! bfd_set_section_contents (stdoutput, sec, buf, 0, 0)) as_fatal (_("can't start writing .mdebug section: %s"), bfd_errmsg (bfd_get_error ())); - know (stdoutput->output_has_begun == true); + know (stdoutput->output_has_begun); know (sec->filepos != 0); if (! bfd_ecoff_write_debug (stdoutput, &debug, debug_swap, @@ -2101,7 +2108,7 @@ elf_frob_file_after_relocs () #ifdef SCO_ELF -/* Heavily plagarized from obj_elf_version. The idea is to emit the +/* Heavily plagiarized from obj_elf_version. The idea is to emit the SCO specific identifier in the .notes section to satisfy the SCO linker. @@ -2121,7 +2128,7 @@ elf_frob_file_after_relocs () int_32 version = (major ver # << 16) | version of tools ; int_32 source = (tool_id << 16 ) | 1 ; int_32 info = 0 ; These are set by the SCO tools, but we - don't know enough about the source + don't know enough about the source environment to set them. SCO ld currently ignores them, and recommends we set them to zero. */ @@ -2130,7 +2137,7 @@ elf_frob_file_after_relocs () #define SCO_MINOR_VERSION 0x1 void -sco_id () +sco_id (void) { char *name; @@ -2141,7 +2148,7 @@ sco_id () subsegT subseg = now_subseg; Elf_Internal_Note i_note; Elf_External_Note e_note; - asection *note_secp = (asection *) NULL; + asection *note_secp = NULL; int i, len; /* create the .note section */ @@ -2158,13 +2165,13 @@ sco_id () i_note.type = NT_VERSION; /* Contains a version string */ p = frag_more (sizeof (i_note.namesz)); - md_number_to_chars (p, (valueT) i_note.namesz, 4); + md_number_to_chars (p, i_note.namesz, 4); p = frag_more (sizeof (i_note.descsz)); - md_number_to_chars (p, (valueT) i_note.descsz, 4); + md_number_to_chars (p, i_note.descsz, 4); p = frag_more (sizeof (i_note.type)); - md_number_to_chars (p, (valueT) i_note.type, 4); + md_number_to_chars (p, i_note.type, 4); p = frag_more (4); strcpy (p, "SCO"); @@ -2197,7 +2204,7 @@ sco_id () #endif /* SCO_ELF */ static int -elf_separate_stab_sections () +elf_separate_stab_sections (void) { #ifdef NEED_ECOFF_DEBUG return (!ECOFF_DEBUGGING); @@ -2207,8 +2214,7 @@ elf_separate_stab_sections () } static void -elf_init_stab_section (seg) - segT seg; +elf_init_stab_section (segT seg) { #ifdef NEED_ECOFF_DEBUG if (!ECOFF_DEBUGGING) @@ -2226,6 +2232,7 @@ const struct format_ops elf_format_ops = elf_frob_symbol, elf_frob_file, elf_frob_file_before_adjust, + 0, /* obj_frob_file_before_fix */ elf_frob_file_after_relocs, elf_s_get_size, elf_s_set_size, elf_s_get_align, elf_s_set_align,