diff options
Diffstat (limited to 'contrib/binutils/bfd/coffcode.h')
| -rw-r--r-- | contrib/binutils/bfd/coffcode.h | 431 |
1 files changed, 332 insertions, 99 deletions
diff --git a/contrib/binutils/bfd/coffcode.h b/contrib/binutils/bfd/coffcode.h index 73081a7..fce0491 100644 --- a/contrib/binutils/bfd/coffcode.h +++ b/contrib/binutils/bfd/coffcode.h @@ -175,7 +175,6 @@ SUBSUBSECTION the file in the string table. This pass moves all strings into memory and replaces them with pointers to the strings. - The symbol table is massaged once again, this time to create the canonical table used by the BFD application. Each symbol is inspected in turn, and a decision made (using the @@ -301,7 +300,6 @@ CODE_FRAGMENT .boolean done_lineno; .} coff_symbol_type; - */ #ifdef COFF_WITH_PE @@ -351,6 +349,19 @@ static PTR coff_mkobject_hook PARAMS ((bfd *, PTR, PTR)); #ifndef COFF_WITH_PE +/* Macros for setting debugging flags. */ +#ifdef STYP_DEBUG +#define STYP_XCOFF_DEBUG STYP_DEBUG +#else +#define STYP_XCOFF_DEBUG STYP_INFO +#endif + +#ifdef COFF_ALIGN_IN_S_FLAGS +#define STYP_DEBUG_INFO STYP_DSECT +#else +#define STYP_DEBUG_INFO STYP_INFO +#endif + static long sec_to_styp_flags (sec_name, sec_flags) CONST char *sec_name; @@ -388,18 +399,24 @@ sec_to_styp_flags (sec_name, sec_flags) styp_flags = STYP_LIT; #endif /* _LIT */ } - else if (!strcmp (sec_name, ".debug")) + else if (!strncmp (sec_name, ".debug", 6)) { -#ifdef STYP_DEBUG - styp_flags = STYP_DEBUG; -#else - styp_flags = STYP_INFO; -#endif + /* Handle the XCOFF debug section and DWARF2 debug sections. */ + if (!sec_name[6]) + styp_flags = STYP_XCOFF_DEBUG; + else + styp_flags = STYP_DEBUG_INFO; } else if (!strncmp (sec_name, ".stab", 5)) { - styp_flags = STYP_INFO; + styp_flags = STYP_DEBUG_INFO; + } +#ifdef COFF_LONG_SECTION_NAMES + else if (!strncmp (sec_name, ".gnu.linkonce.wi.", 17)) + { + styp_flags = STYP_DEBUG_INFO; } +#endif #ifdef RS6000COFF_C else if (!strcmp (sec_name, _PAD)) { @@ -436,6 +453,16 @@ sec_to_styp_flags (sec_name, sec_flags) styp_flags = STYP_BSS; } +#ifdef STYP_CLINK + if (sec_flags & SEC_CLINK) + styp_flags |= STYP_CLINK; +#endif + +#ifdef STYP_BLOCK + if (sec_flags & SEC_BLOCK) + styp_flags |= STYP_BLOCK; +#endif + #ifdef STYP_NOLOAD if ((sec_flags & (SEC_NEVER_LOAD | SEC_COFF_SHARED_LIBRARY)) != 0) styp_flags |= STYP_NOLOAD; @@ -493,8 +520,8 @@ sec_to_styp_flags (sec_name, sec_flags) styp_flags |= IMAGE_SCN_LNK_REMOVE; /* skip IN_MEMORY */ /* skip SORT */ - if (sec_flags & SEC_LINK_ONCE) - styp_flags |= IMAGE_SCN_LNK_COMDAT; + if (sec_flags & SEC_LINK_ONCE) + styp_flags |= IMAGE_SCN_LNK_COMDAT; /* skip LINK_DUPLICATES */ /* skip LINKER_CREATED */ @@ -502,7 +529,7 @@ sec_to_styp_flags (sec_name, sec_flags) though the semantics don't quite match. The bits from the input are retained in pei_section_data(abfd, section)->pe_flags */ - styp_flags |= IMAGE_SCN_MEM_READ; /* always readable. */ + styp_flags |= IMAGE_SCN_MEM_READ; /* always readable. */ if ((sec_flags & SEC_READONLY) == 0) styp_flags |= IMAGE_SCN_MEM_WRITE; /* Invert READONLY for write */ if (sec_flags & SEC_CODE) @@ -510,7 +537,7 @@ sec_to_styp_flags (sec_name, sec_flags) if (sec_flags & SEC_SHARED) styp_flags |= IMAGE_SCN_MEM_SHARED; /* Shared remains meaningful */ - return styp_flags; + return styp_flags; } #endif /* COFF_WITH_PE */ @@ -533,6 +560,16 @@ styp_to_sec_flags (abfd, hdr, name, section) long styp_flags = internal_s->s_flags; flagword sec_flags = 0; +#ifdef STYP_BLOCK + if (styp_flags & STYP_BLOCK) + sec_flags |= SEC_BLOCK; +#endif + +#ifdef STYP_CLINK + if (styp_flags & STYP_CLINK) + sec_flags |= SEC_CLINK; +#endif + #ifdef STYP_NOLOAD if (styp_flags & STYP_NOLOAD) { @@ -604,10 +641,13 @@ styp_to_sec_flags (abfd, hdr, name, section) #endif sec_flags |= SEC_ALLOC; } - else if (strcmp (name, ".debug") == 0 + else if (strncmp (name, ".debug", 6) == 0 #ifdef _COMMENT || strcmp (name, _COMMENT) == 0 #endif +#ifdef COFF_LONG_SECTION_NAMES + || strncmp (name, ".gnu.linkonce.wi.", 17) == 0 +#endif || strncmp (name, ".stab", 5) == 0) { #ifdef COFF_PAGE_SIZE @@ -730,7 +770,7 @@ styp_to_sec_flags (abfd, hdr, name, section) if (styp_flags & IMAGE_SCN_MEM_EXECUTE) sec_flags |= SEC_CODE; /* Probably redundant */ - /* IMAGE_SCN_MEM_READ is simply ignored, assuming it always to be true. */ + /* IMAGE_SCN_MEM_READ is simply ignored, assuming it always to be true. */ if ((styp_flags & IMAGE_SCN_MEM_WRITE) == 0) sec_flags |= SEC_READONLY; @@ -849,7 +889,7 @@ styp_to_sec_flags (abfd, hdr, name, section) if (strcmp (name, symname) != 0) abort (); - + /* This is the section symbol. */ bfd_coff_swap_aux_in (abfd, (PTR) (esym + bfd_coff_symesz (abfd)), @@ -884,7 +924,7 @@ styp_to_sec_flags (abfd, hdr, name, section) switch (aux.x_scn.x_comdat) { case IMAGE_COMDAT_SELECT_NODUPLICATES: -#ifdef STRICT_PE_FORMAT +#ifdef STRICT_PE_FORMAT sec_flags |= SEC_LINK_DUPLICATES_ONE_ONLY; #else sec_flags &= ~SEC_LINK_ONCE; @@ -936,7 +976,7 @@ styp_to_sec_flags (abfd, hdr, name, section) #define TARGET_UNDERSCORE 0 #endif /* Is this the name we're looking for? */ - if (strcmp (target_name, + if (strcmp (target_name, symname + (TARGET_UNDERSCORE ? 1 : 0)) != 0) { /* Not the name we're looking for */ @@ -944,7 +984,7 @@ styp_to_sec_flags (abfd, hdr, name, section) continue; } /* Fall through. */ - case 1: + case 1: /* MSVC mode: the lexically second symbol (or drop through from the above). */ { @@ -955,7 +995,7 @@ styp_to_sec_flags (abfd, hdr, name, section) Intel puts the two adjacent, but Alpha (at least) spreads them out. */ - section->comdat = + section->comdat = bfd_alloc (abfd, sizeof (struct bfd_comdat_info)); if (section->comdat == NULL) abort (); @@ -977,7 +1017,9 @@ styp_to_sec_flags (abfd, hdr, name, section) esym += (isym.n_numaux + 1) * bfd_coff_symesz (abfd); } - breakloop: + breakloop: + /* SunOS requires a statement after any label. */ + ; } } @@ -1100,6 +1142,8 @@ dependent COFF routines: . boolean _bfd_coff_long_filenames; . boolean _bfd_coff_long_section_names; . unsigned int _bfd_coff_default_section_alignment_power; +. boolean _bfd_coff_force_symnames_in_strings; +. unsigned int _bfd_coff_debug_string_prefix_length; . void (*_bfd_coff_swap_filehdr_in) PARAMS (( . bfd *abfd, . PTR ext, @@ -1202,12 +1246,12 @@ dependent COFF routines: . struct bfd_link_info *info, . bfd *abfd, . const char *name, -. flagword flags, +. flagword flags, . asection *section, . bfd_vma value, . const char *string, . boolean copy, -. boolean collect, +. boolean collect, . struct bfd_link_hash_entry **hashp)); . . boolean (*_bfd_coff_link_output_has_begun) PARAMS (( @@ -1297,6 +1341,12 @@ dependent COFF routines: .#define bfd_coff_symname_in_debug(abfd, sym)\ . ((coff_backend_info (abfd)->_bfd_coff_symname_in_debug) (abfd, sym)) . +.#define bfd_coff_force_symnames_in_strings(abfd)\ +. (coff_backend_info (abfd)->_bfd_coff_force_symnames_in_strings) +. +.#define bfd_coff_debug_string_prefix_length(abfd)\ +. (coff_backend_info (abfd)->_bfd_coff_debug_string_prefix_length) +. .#define bfd_coff_print_aux(abfd, file, base, symbol, aux, indaux)\ . ((coff_backend_info (abfd)->_bfd_coff_print_aux)\ . (abfd, file, base, symbol, aux, indaux)) @@ -1434,8 +1484,8 @@ static const unsigned int coff_section_alignment_table_size = static boolean coff_new_section_hook (abfd, section) - bfd *abfd; - asection *section; + bfd * abfd; + asection * section; { combined_entry_type *native; @@ -1500,10 +1550,17 @@ coff_set_alignment_hook (abfd, section, scnhdr) break; #endif #ifdef TIC80COFF - /* TI tools hijack bits 8-11 for the alignment */ + /* TI tools puts the alignment power in bits 8-11 */ i = (hdr->s_flags >> 8) & 0xF ; #endif +#ifdef COFF_DECODE_ALIGNMENT + i = COFF_DECODE_ALIGNMENT(hdr->s_flags); +#endif section->alignment_power = i; + +#ifdef coff_set_section_load_page + coff_set_section_load_page (section, hdr->s_page); +#endif } #else /* ! COFF_ALIGN_IN_SECTION_HEADER */ @@ -1568,6 +1625,23 @@ coff_set_alignment_hook (abfd, section, scnhdr) pei_section_data (abfd, section)->pe_flags = hdr->s_flags; section->lma = hdr->s_vaddr; + + /* check for extended relocs */ + if (hdr->s_flags & IMAGE_SCN_LNK_NRELOC_OVFL) + { + struct external_reloc dst; + struct internal_reloc n; + int oldpos = bfd_tell (abfd); + bfd_seek (abfd, hdr->s_relptr, 0); + if (bfd_read ((PTR) & dst, 1, bfd_coff_relsz (abfd), abfd) + != bfd_coff_relsz (abfd)) + return; + + coff_swap_reloc_in (abfd, &dst, &n); + bfd_seek (abfd, oldpos, 0); + section->reloc_count = + hdr->s_nreloc = n.r_vaddr; + } } #undef ALIGN_SET #undef ELIFALIGN_SET @@ -1692,6 +1766,11 @@ coff_mkobject_hook (abfd, filehdr, aouthdr) struct xcoff_tdata *xcoff; xcoff = xcoff_data (abfd); +# ifdef U803XTOCMAGIC + xcoff->xcoff64 = internal_f->f_magic == U803XTOCMAGIC; +# else + xcoff->xcoff64 = 0; +# endif xcoff->full_aouthdr = true; xcoff->toc = internal_a->o_toc; xcoff->sntoc = internal_a->o_sntoc; @@ -1705,12 +1784,12 @@ coff_mkobject_hook (abfd, filehdr, aouthdr) } #endif -#ifdef ARM +#ifdef ARM /* Set the flags field from the COFF header read in */ if (! _bfd_coff_arm_set_private_flags (abfd, internal_f->f_flags)) coff->flags = 0; #endif - + #ifdef COFF_WITH_PE /* FIXME: I'm not sure this is ever executed, since peicode.h defines coff_mkobject_hook. */ @@ -1745,7 +1824,7 @@ coff_set_arch_mach_hook (abfd, filehdr) case PPCMAGIC: arch = bfd_arch_powerpc; machine = 0; /* what does this mean? (krk) */ - break; + break; #endif #ifdef I386MAGIC case I386MAGIC: @@ -1756,6 +1835,12 @@ coff_set_arch_mach_hook (abfd, filehdr) machine = 0; break; #endif +#ifdef IA64MAGIC + case IA64MAGIC: + arch = bfd_arch_ia64; + machine = 0; + break; +#endif #ifdef A29K_MAGIC_BIG case A29K_MAGIC_BIG: case A29K_MAGIC_LITTLE: @@ -1864,9 +1949,13 @@ coff_set_arch_mach_hook (abfd, filehdr) #endif #ifdef RS6000COFF_C +#ifdef XCOFF64 + case U803XTOCMAGIC: +#else case U802ROMAGIC: case U802WRMAGIC: case U802TOCMAGIC: +#endif { int cputype; @@ -1887,13 +1976,13 @@ coff_set_arch_mach_hook (abfd, filehdr) buf = (bfd_byte *) bfd_malloc (bfd_coff_symesz (abfd)); if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0 - || (bfd_read (buf, 1, bfd_coff_symesz (abfd), abfd) + || (bfd_read (buf, 1, bfd_coff_symesz (abfd), abfd) != bfd_coff_symesz (abfd))) { free (buf); return false; } - coff_swap_sym_in (abfd, (PTR) buf, (PTR) &sym); + bfd_coff_swap_sym_in (abfd, (PTR) buf, (PTR) &sym); if (sym.n_sclass == C_FILE) cputype = sym.n_type & 0xff; else @@ -1912,28 +2001,33 @@ coff_set_arch_mach_hook (abfd, filehdr) (because that's how they were bootstrapped originally), but they are always PowerPC architecture. */ arch = bfd_arch_powerpc; - machine = 0; + machine = bfd_mach_ppc; +#else +#ifdef XCOFF64 + arch = bfd_arch_powerpc; + machine = bfd_mach_ppc_620; #else arch = bfd_arch_rs6000; - machine = 6000; + machine = bfd_mach_rs6k; +#endif #endif /* POWERMAC */ break; case 1: arch = bfd_arch_powerpc; - machine = 601; + machine = bfd_mach_ppc_601; break; case 2: /* 64 bit PowerPC */ arch = bfd_arch_powerpc; - machine = 620; + machine = bfd_mach_ppc_620; break; case 3: arch = bfd_arch_powerpc; - machine = 0; + machine = bfd_mach_ppc; break; case 4: arch = bfd_arch_rs6000; - machine = 6000; + machine = bfd_mach_rs6k; break; } } @@ -2015,6 +2109,37 @@ coff_set_arch_mach_hook (abfd, filehdr) break; #endif +#ifdef TICOFF0MAGIC +#ifdef TICOFF_TARGET_ARCH + /* this TI COFF section should be used by all new TI COFF v0 targets */ + case TICOFF0MAGIC: + arch = TICOFF_TARGET_ARCH; + break; +#endif +#endif + +#ifdef TICOFF1MAGIC + /* this TI COFF section should be used by all new TI COFF v1/2 targets */ + /* TI COFF1 and COFF2 use the target_id field to specify which arch */ + case TICOFF1MAGIC: + case TICOFF2MAGIC: + switch (internal_f->f_target_id) + { +#ifdef TI_TARGET_ID + case TI_TARGET_ID: + arch = TICOFF_TARGET_ARCH; + break; +#endif + default: + arch = bfd_arch_obscure; + (*_bfd_error_handler) + (_("Unrecognized TI COFF target id '0x%x'"), + internal_f->f_target_id); + break; + } + break; +#endif + #ifdef TIC80_ARCH_MAGIC case TIC80_ARCH_MAGIC: arch = bfd_arch_tic80; @@ -2057,6 +2182,10 @@ symname_in_debug_hook (abfd, sym) #ifdef RS6000COFF_C +#ifdef XCOFF64 +#define FORCE_SYMNAMES_IN_STRINGS +#endif + /* Handle the csect auxent of a C_EXT or C_HIDEXT symbol. */ static boolean coff_pointerize_aux_hook @@ -2242,6 +2371,22 @@ coff_write_relocs (abfd, first_undef) if (bfd_seek (abfd, s->rel_filepos, SEEK_SET) != 0) return false; + +#ifdef COFF_WITH_PE + if (s->reloc_count > 0xffff) + { + /* encode real count here as first reloc */ + struct internal_reloc n; + memset ((PTR) & n, 0, sizeof (n)); + /* add one to count *this* reloc (grr) */ + n.r_vaddr = s->reloc_count + 1; + coff_swap_reloc_out (abfd, &n, &dst); + if (bfd_write ((PTR) & dst, 1, bfd_coff_relsz (abfd), abfd) + != bfd_coff_relsz (abfd)) + return false; + } +#endif + for (i = 0; i < s->reloc_count; i++) { struct internal_reloc n; @@ -2256,7 +2401,7 @@ coff_write_relocs (abfd, first_undef) place). This is a bad thing,'cause the symbols attached to the output bfd are indexed, so that the relocation entries know which symbol index they point to. So we - have to look up the output symbol here. */ + have to look up the output symbol here. */ if (q->sym_ptr_ptr[0]->the_bfd != abfd) { @@ -2407,6 +2552,33 @@ coff_set_flags (abfd, magicp, flagsp) *magicp = TIC30MAGIC; return true; #endif + +#ifdef TICOFF_DEFAULT_MAGIC + case TICOFF_TARGET_ARCH: + /* if there's no indication of which version we want, use the default */ + if (!abfd->xvec ) + *magicp = TICOFF_DEFAULT_MAGIC; + else + { + /* we may want to output in a different COFF version */ + switch (abfd->xvec->name[4]) + { + case '0': + *magicp = TICOFF0MAGIC; + break; + case '1': + *magicp = TICOFF1MAGIC; + break; + case '2': + *magicp = TICOFF2MAGIC; + break; + default: + return false; + } + } + return true; +#endif + #ifdef TIC80_ARCH_MAGIC case bfd_arch_tic80: *magicp = TIC80_ARCH_MAGIC; @@ -2424,10 +2596,10 @@ coff_set_flags (abfd, magicp, flagsp) { if (APCS_26_FLAG (abfd)) * flagsp |= F_APCS26; - + if (APCS_FLOAT_FLAG (abfd)) * flagsp |= F_APCS_FLOAT; - + if (PIC_FLAG (abfd)) * flagsp |= F_PIC; } @@ -2442,7 +2614,10 @@ coff_set_flags (abfd, magicp, flagsp) case bfd_mach_arm_4: * flagsp |= F_ARM_4; break; case bfd_mach_arm_4T: * flagsp |= F_ARM_4T; break; case bfd_mach_arm_5: * flagsp |= F_ARM_5; break; - case bfd_mach_arm_5T: * flagsp |= F_ARM_5; break; /* XXX - we do not have an F_ARM_5T */ + /* FIXME: we do not have F_ARM vaues greater than F_ARM_5. */ + case bfd_mach_arm_5T: * flagsp |= F_ARM_5; break; + case bfd_mach_arm_5TE: * flagsp |= F_ARM_5; break; + case bfd_mach_arm_XScale: * flagsp |= F_ARM_5; break; } return true; #endif @@ -2456,7 +2631,7 @@ coff_set_flags (abfd, magicp, flagsp) case bfd_arch_i386: *magicp = I386MAGIC; #ifdef LYNXOS - /* Just overwrite the usual value if we're doing Lynx. */ + /* Just overwrite the usual value if we're doing Lynx. */ *magicp = LYNXCOFFMAGIC; #endif return true; @@ -2468,6 +2643,12 @@ coff_set_flags (abfd, magicp, flagsp) return true; break; #endif +#ifdef IA64MAGIC + case bfd_arch_ia64: + *magicp = IA64MAGIC; + return true; + break; +#endif #ifdef MC68MAGIC case bfd_arch_m68k: #ifdef APOLLOM68KMAGIC @@ -2481,7 +2662,7 @@ coff_set_flags (abfd, magicp, flagsp) #endif #endif #ifdef LYNXOS - /* Just overwrite the usual value if we're doing Lynx. */ + /* Just overwrite the usual value if we're doing Lynx. */ *magicp = LYNXCOFFMAGIC; #endif return true; @@ -2536,7 +2717,7 @@ coff_set_flags (abfd, magicp, flagsp) case bfd_arch_sparc: *magicp = SPARCMAGIC; #ifdef LYNXOS - /* Just overwrite the usual value if we're doing Lynx. */ + /* Just overwrite the usual value if we're doing Lynx. */ *magicp = LYNXCOFFMAGIC; #endif return true; @@ -2566,12 +2747,19 @@ coff_set_flags (abfd, magicp, flagsp) break; #endif -#ifdef U802TOCMAGIC +#ifdef RS6000COFF_C case bfd_arch_rs6000: #ifndef PPCMAGIC case bfd_arch_powerpc: #endif - *magicp = U802TOCMAGIC; +#ifdef XCOFF64 + if (bfd_get_mach (abfd) == bfd_mach_ppc_620 + && !strncmp (abfd->xvec->name,"aix", 3)) + *magicp = U803XTOCMAGIC; + else +#else + *magicp = U802TOCMAGIC; +#endif return true; break; #endif @@ -2581,23 +2769,22 @@ coff_set_flags (abfd, magicp, flagsp) * magicp = MCOREMAGIC; return true; #endif - + #ifdef W65MAGIC case bfd_arch_w65: *magicp = W65MAGIC; return true; #endif - default: /* Unknown architecture */ - /* return false; -- fall through to "return false" below, to avoid - "statement never reached" errors on the one below. */ + default: /* Unknown architecture. */ + /* Fall through to "return false" below, to avoid + "statement never reached" errors on the one below. */ break; } return false; } - static boolean coff_set_arch_mach (abfd, arch, machine) bfd * abfd; @@ -2614,7 +2801,7 @@ coff_set_arch_mach (abfd, arch, machine) coff_set_flags (abfd, &dummy1, &dummy2) != true) return false; /* We can't represent this type */ - return true; /* We're easy ... */ + return true; /* We're easy ... */ } #ifdef COFF_IMAGE_WITH_PE @@ -2642,12 +2829,12 @@ sort_by_secaddr (arg1, arg2) #endif /* COFF_IMAGE_WITH_PE */ -/* Calculate the file position for each section. */ +/* Calculate the file position for each section. */ #ifndef I960 #define ALIGN_SECTIONS_IN_FILE #endif -#ifdef TIC80COFF +#if defined(TIC80COFF) || defined(TICOFF) #undef ALIGN_SECTIONS_IN_FILE #endif @@ -2685,8 +2872,8 @@ coff_compute_section_file_positions (abfd) size_t len; len = strlen (bfd_asymbol_name (*symp)); - if (len > SYMNMLEN) - sz += len + 3; + if (len > SYMNMLEN || bfd_coff_force_symnames_in_strings (abfd)) + sz += len + 1 + bfd_coff_debug_string_prefix_length (abfd); } } if (sz > 0) @@ -2704,7 +2891,7 @@ coff_compute_section_file_positions (abfd) #ifdef COFF_IMAGE_WITH_PE int page_size; - if (coff_data (abfd)->link_info) + if (coff_data (abfd)->link_info) { page_size = pe_data (abfd)->pe_opthdr.FileAlignment; } @@ -2853,7 +3040,7 @@ coff_compute_section_file_positions (abfd) /* Align the sections in the file to the same boundary on which they are aligned in virtual memory. I960 doesn't do this (FIXME) so we can stay in sync with Intel. 960 - doesn't yet page from files... */ + doesn't yet page from files... */ #ifdef ALIGN_SECTIONS_IN_FILE if ((abfd->flags & EXEC_P) != 0) { @@ -3042,7 +3229,7 @@ coff_write_object_contents (abfd) file_ptr reloc_base; file_ptr lineno_base; file_ptr sym_base; - unsigned long reloc_size = 0; + unsigned long reloc_size = 0, reloc_count = 0; unsigned long lnno_size = 0; boolean long_section_names; asection *text_sec = NULL; @@ -3073,7 +3260,16 @@ coff_write_object_contents (abfd) for (current = abfd->sections; current != NULL; current = current->next) - reloc_size += current->reloc_count * bfd_coff_relsz (abfd); + { +#ifdef COFF_WITH_PE + /* we store the actual reloc count in the first reloc's addr */ + if (current->reloc_count > 0xffff) + reloc_count ++; +#endif + reloc_count += current->reloc_count; + } + + reloc_size = reloc_count * bfd_coff_relsz (abfd); lineno_base = reloc_base + reloc_size; sym_base = lineno_base + lnno_size; @@ -3096,6 +3292,11 @@ coff_write_object_contents (abfd) { current->rel_filepos = reloc_base; reloc_base += current->reloc_count * bfd_coff_relsz (abfd); +#ifdef COFF_WITH_PE + /* extra reloc to hold real count */ + if (current->reloc_count > 0xffff) + reloc_base += bfd_coff_relsz (abfd); +#endif } else { @@ -3170,6 +3371,9 @@ coff_write_object_contents (abfd) section.s_vaddr = current->vma; section.s_paddr = current->lma; section.s_size = current->_raw_size; +#ifdef coff_get_section_load_page + section.s_page = coff_get_section_load_page (current); +#endif #ifdef COFF_WITH_PE section.s_paddr = 0; @@ -3212,6 +3416,7 @@ coff_write_object_contents (abfd) hasdebug = true; #ifdef RS6000COFF_C +#ifndef XCOFF64 /* Indicate the use of an XCOFF overflow section header. */ if (current->reloc_count >= 0xffff || current->lineno_count >= 0xffff) { @@ -3219,6 +3424,7 @@ coff_write_object_contents (abfd) section.s_nlnno = 0xffff; } #endif +#endif section.s_flags = sec_to_styp_flags (current->name, current->flags); @@ -3239,10 +3445,13 @@ coff_write_object_contents (abfd) section.s_align = (current->alignment_power ? 1 << current->alignment_power : 0); -#else +#endif #ifdef TIC80COFF + /* TI COFF puts the alignment power in bits 8-11 of the flags */ section.s_flags |= (current->alignment_power & 0xF) << 8; #endif +#ifdef COFF_ENCODE_ALIGNMENT + COFF_ENCODE_ALIGNMENT(section, current->alignment_power); #endif #ifdef COFF_IMAGE_WITH_PE @@ -3259,7 +3468,7 @@ coff_write_object_contents (abfd) SCNHDR buff; if (coff_swap_scnhdr_out (abfd, §ion, &buff) == 0 || bfd_write ((PTR) (&buff), 1, bfd_coff_scnhsz (abfd), abfd) - != bfd_coff_scnhsz (abfd)) + != bfd_coff_scnhsz (abfd)) return false; } @@ -3381,13 +3590,13 @@ coff_write_object_contents (abfd) scnhdr.s_flags = STYP_OVRFLO; if (coff_swap_scnhdr_out (abfd, &scnhdr, &buff) == 0 || bfd_write ((PTR) &buff, 1, bfd_coff_scnhsz (abfd), abfd) - != bfd_coff_scnhsz (abfd)) + != bfd_coff_scnhsz (abfd)) return false; } } #endif - /* OK, now set up the filehdr... */ + /* OK, now set up the filehdr... */ /* Don't include the internal abs section in the section count */ @@ -3432,6 +3641,11 @@ coff_write_object_contents (abfd) internal_f.f_flags |= F_AR32W; #endif +#ifdef TI_TARGET_ID + /* target id is used in TI COFF v1 and later; COFF0 won't use this field, + but it doesn't hurt to set it internally */ + internal_f.f_target_id = TI_TARGET_ID; +#endif #ifdef TIC80_TARGET_ID internal_f.f_target_id = TIC80_TARGET_ID; #endif @@ -3458,7 +3672,7 @@ coff_write_object_contents (abfd) coff_set_flags (abfd, &magic, &flags); internal_f.f_magic = magic; internal_f.f_flags |= flags; - /* ...and the "opt"hdr... */ + /* ...and the "opt"hdr... */ #ifdef A29K #ifdef ULTRA3 /* NYU's machine */ @@ -3473,6 +3687,10 @@ coff_write_object_contents (abfd) internal_a.magic = NMAGIC; /* Assume separate i/d */ #define __A_MAGIC_SET__ #endif /* A29K */ +#ifdef TICOFF_AOUT_MAGIC + internal_a.magic = TICOFF_AOUT_MAGIC; +#define __A_MAGIC_SET__ +#endif #ifdef TIC80COFF internal_a.magic = TIC80_ARCH_MAGIC; #define __A_MAGIC_SET__ @@ -3516,7 +3734,7 @@ coff_write_object_contents (abfd) #if defined(ARM) #define __A_MAGIC_SET__ internal_a.magic = ZMAGIC; -#endif +#endif #if defined(PPC_PE) #define __A_MAGIC_SET__ @@ -3526,7 +3744,7 @@ coff_write_object_contents (abfd) #if defined MCORE_PE #define __A_MAGIC_SET__ internal_a.magic = IMAGE_NT_OPTIONAL_HDR_MAGIC; -#endif +#endif #if defined(I386) #define __A_MAGIC_SET__ @@ -3537,6 +3755,11 @@ coff_write_object_contents (abfd) #endif /* LYNXOS */ #endif /* I386 */ +#if defined(IA64) +#define __A_MAGIC_SET__ + internal_a.magic = ZMAGIC; +#endif /* IA64 */ + #if defined(SPARC) #define __A_MAGIC_SET__ #if defined(LYNXOS) @@ -3592,7 +3815,7 @@ coff_write_object_contents (abfd) return false; } #ifdef COFF_LONG_SECTION_NAMES - else if (long_section_names) + else if (long_section_names && ! obj_coff_strings_written (abfd)) { /* If we have long section names we have to write out the string table even if there are no symbols. */ @@ -3733,40 +3956,40 @@ coff_write_object_contents (abfd) /* now write them */ if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0) return false; - + { char * buff; bfd_size_type amount; - + buff = bfd_malloc (bfd_coff_filhsz (abfd)); - if (buff == NULL) + if (buff == NULL) return false; - + coff_swap_filehdr_out (abfd, (PTR) & internal_f, (PTR) buff); amount = bfd_write ((PTR) buff, 1, bfd_coff_filhsz (abfd), abfd); - + free (buff); - + if (amount != bfd_coff_filhsz (abfd)) return false; } - + if (abfd->flags & EXEC_P) { - /* Note that peicode.h fills in a PEAOUTHDR, not an AOUTHDR. - include/coff/pe.h sets AOUTSZ == sizeof(PEAOUTHDR)) */ + /* Note that peicode.h fills in a PEAOUTHDR, not an AOUTHDR. + include/coff/pe.h sets AOUTSZ == sizeof (PEAOUTHDR)) */ char * buff; bfd_size_type amount; buff = bfd_malloc (bfd_coff_aoutsz (abfd)); - if (buff == NULL) + if (buff == NULL) return false; - + coff_swap_aouthdr_out (abfd, (PTR) & internal_a, (PTR) buff); amount = bfd_write ((PTR) buff, 1, bfd_coff_aoutsz (abfd), abfd); - + free (buff); - + if (amount != bfd_coff_aoutsz (abfd)) return false; } @@ -3824,7 +4047,7 @@ coff_set_section_contents (abfd, section, location, offset, count) to write a section which doesn't follow these assumptions. The code has been tested on ISC 4.1 by me, and on SCO by Robert Lipe <robertl@arnet.com> (Thanks!). - + Gvran Uddeborg <gvran@uddeborg.pp.se> */ if (strcmp (section->name, _LIB) == 0) @@ -3845,7 +4068,7 @@ coff_set_section_contents (abfd, section, location, offset, count) #endif /* Don't write out bss sections - one way to do this is to - see if the filepos has not been set. */ + see if the filepos has not been set. */ if (section->filepos == 0) return true; @@ -3953,7 +4176,7 @@ coff_slurp_line_table (abfd, asect) while (counter < asect->lineno_count) { struct internal_lineno dst; - coff_swap_lineno_in (abfd, src, &dst); + bfd_coff_swap_lineno_in (abfd, src, &dst); cache_ptr->line_number = dst.l_lnno; if (cache_ptr->line_number == 0) @@ -4002,7 +4225,7 @@ coff_slurp_line_table (abfd, asect) } asect->lineno = lineno_cache; - /* FIXME, free native_lineno here, or use alloca or something. */ + /* FIXME, free native_lineno here, or use alloca or something. */ return true; } @@ -4122,7 +4345,7 @@ coff_slurp_symbol_table (abfd) case COFF_SYMBOL_UNDEFINED: dst->symbol.section = bfd_und_section_ptr; dst->symbol.value = 0; - break; + break; case COFF_SYMBOL_PE_SECTION: dst->symbol.flags |= BSF_EXPORT | BSF_SECTION_SYM; @@ -4169,7 +4392,7 @@ coff_slurp_symbol_table (abfd) #ifdef I960 case C_LEAFSTAT: /* static leaf procedure */ #endif -#if defined ARM +#if defined ARM case C_THUMBSTAT: /* Thumb static */ case C_THUMBLABEL: /* Thumb label */ case C_THUMBSTATFUNC:/* Thumb static function */ @@ -4206,7 +4429,8 @@ coff_slurp_symbol_table (abfd) #endif case C_REGPARM: /* register parameter */ case C_REG: /* register variable */ -#ifndef TIC80COFF + /* C_AUTOARG conflictes with TI COFF C_UEXT */ +#if !defined (TIC80COFF) && !defined (TICOFF) #ifdef C_AUTOARG case C_AUTOARG: /* 960-specific storage class */ #endif @@ -4287,7 +4511,7 @@ coff_slurp_symbol_table (abfd) #endif case C_BLOCK: /* ".bb" or ".eb" */ - case C_FCN: /* ".bf" or ".ef" (or PE ".lf") */ + case C_FCN: /* ".bf" or ".ef" (or PE ".lf") */ case C_EFCN: /* physical end of function */ #if defined COFF_WITH_PE /* PE sets the symbol to a value relative to the start @@ -4310,6 +4534,11 @@ coff_slurp_symbol_table (abfd) #endif break; + case C_STATLAB: /* Static load time label */ + dst->symbol.value = src->u.syment.n_value; + dst->symbol.flags = BSF_GLOBAL; + break; + case C_NULL: /* PE DLLs sometimes have zeroed out symbols for some reason. Just ignore them without a warning. */ @@ -4328,11 +4557,10 @@ coff_slurp_symbol_table (abfd) /* NT uses 0x67 for a weak symbol, not C_ALIAS. */ case C_ALIAS: /* duplicate tag */ #endif - /* New storage classes for TIc80 */ -#ifdef TIC80COFF + /* New storage classes for TI COFF */ +#if defined(TIC80COFF) || defined(TICOFF) case C_UEXT: /* Tentative external definition */ #endif - case C_STATLAB: /* Static load time label */ case C_EXTLAB: /* External load time label */ case C_HIDDEN: /* ext symbol in dmert public lib */ default: @@ -4502,7 +4730,6 @@ SUBSUBSECTION into a howto table vector; the 88k subtracts a number from the @code{r_type} field and creates an addend field. - */ #ifndef CALC_ADDEND @@ -4557,7 +4784,6 @@ coff_slurp_reloc_table (abfd, asect, symbols) if (reloc_cache == NULL) return false; - for (idx = 0; idx < asect->reloc_count; idx++) { struct internal_reloc dst; @@ -4678,7 +4904,6 @@ coff_canonicalize_reloc (abfd, section, relptr, symbols) arelent *tblptr = section->relocation; unsigned int count = 0; - if (section->flags & SEC_CONSTRUCTOR) { /* this section has relocs made up by us, they are not in the @@ -4701,8 +4926,6 @@ coff_canonicalize_reloc (abfd, section, relptr, symbols) for (; count++ < section->reloc_count;) *relptr++ = tblptr++; - - } *relptr = 0; return section->reloc_count; @@ -4890,6 +5113,16 @@ static const bfd_coff_backend_data bfd_coff_std_swap_table = false, #endif COFF_DEFAULT_SECTION_ALIGNMENT_POWER, +#ifdef COFF_FORCE_SYMBOLS_IN_STRINGS + true, +#else + false, +#endif +#ifdef COFF_DEBUG_STRING_WIDE_PREFIX + 4, +#else + 2, +#endif coff_SWAP_filehdr_in, coff_SWAP_aouthdr_in, coff_SWAP_scnhdr_in, coff_SWAP_reloc_in, coff_bad_format_hook, coff_set_arch_mach_hook, coff_mkobject_hook, styp_to_sec_flags, coff_set_alignment_hook, @@ -4921,7 +5154,7 @@ static const bfd_coff_backend_data bfd_coff_std_swap_table = #define coff_bfd_copy_private_section_data _bfd_generic_bfd_copy_private_section_data #endif -#ifndef coff_bfd_copy_private_bfd_data +#ifndef coff_bfd_copy_private_bfd_data #define coff_bfd_copy_private_bfd_data _bfd_generic_bfd_copy_private_bfd_data #endif @@ -4933,7 +5166,7 @@ static const bfd_coff_backend_data bfd_coff_std_swap_table = #define coff_bfd_set_private_flags _bfd_generic_bfd_set_private_flags #endif -#ifndef coff_bfd_print_private_bfd_data +#ifndef coff_bfd_print_private_bfd_data #define coff_bfd_print_private_bfd_data _bfd_generic_bfd_print_private_bfd_data #endif |
