X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fmmo.c;h=ea7c4c66b549e519915442dbe853848af9c55dfc;hb=fc46e8bd351bf9b4eef5110f5ef6f30f8bd57739;hp=c22790dec2e158aee5a2e61d6647c9b18e3f4cfc;hpb=0aabe54e62224040844b7a5516fd832e078056b4;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/mmo.c b/bfd/mmo.c index c22790dec2..ea7c4c66b5 100644 --- a/bfd/mmo.c +++ b/bfd/mmo.c @@ -1,6 +1,5 @@ /* BFD back-end for mmo objects (MMIX-specific object-format). - Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011 - Free Software Foundation, Inc. + Copyright (C) 2001-2020 Free Software Foundation, Inc. Written by Hans-Peter Nilsson (hp@bitrange.com). Infrastructure and other bits originally copied from srec.c and binary.c. @@ -30,14 +29,14 @@ SECTION The mmo object format is used exclusively together with Professor Donald E.@: Knuth's educational 64-bit processor MMIX. The simulator @command{mmix} which is available at - @url{http://www-cs-faculty.stanford.edu/~knuth/programs/mmix.tar.gz} + @url{http://mmix.cs.hm.edu/src/index.html} understands this format. That package also includes a combined assembler and linker called @command{mmixal}. The mmo format has no advantages feature-wise compared to e.g. ELF. It is a simple non-relocatable object format with no support for archives or debugging information, except for symbol value information and line numbers (which is not yet implemented in BFD). See - @url{http://www-cs-faculty.stanford.edu/~knuth/mmix.html} for more + @url{http://mmix.cs.hm.edu/} for more information about MMIX. The ELF format is used for intermediate object files in the BFD implementation. @@ -76,7 +75,7 @@ SUBSECTION two remaining bytes, called the @samp{Y} and @samp{Z} fields, or the @samp{YZ} field (a 16-bit big-endian number), are used for various purposes different for each lopcode. As documented in - @url{http://www-cs-faculty.stanford.edu/~knuth/mmixal-intro.ps.gz}, + @url{http://mmix.cs.hm.edu/doc/mmixal.pdf}, the lopcodes are: @table @code @@ -89,7 +88,11 @@ SUBSECTION directive, setting the location for the next data to the next 32-bit word (for @math{Z = 1}) or 64-bit word (for @math{Z = 2}), plus @math{Y * 2^56}. Normally @samp{Y} is 0 for the text segment - and 2 for the data segment. + and 2 for the data segment. Beware that the low bits of non- + tetrabyte-aligned values are silently discarded when being + automatically incremented and when storing contents (in contrast + to e.g. its use as current location when followed by lop_fixo + et al before the next possibly-quoted tetrabyte contents). @item lop_skip 0x9802YYZZ. Increase the current location by @samp{YZ} bytes. @@ -110,7 +113,7 @@ SUBSECTION @samp{YZ} in lop_fixr: it is xor:ed into the current location minus @math{4 * L}. The first byte of the word is 0 or 1. If it is 1, then @math{L = (@var{lowest 24 bits of word}) - 2^Z}, if 0, - then @math{L = (@var{lowest 24 bits of word})}. + then @math{L = (@var{lowest 24 bits of word})}. @item lop_file 0x9806YYZZ. @samp{Y} is the file number, @samp{Z} is count of @@ -204,7 +207,7 @@ EXAMPLE #include "elf/mmix.h" #include "opcode/mmix.h" -#define LOP 0x98 +#define LOP 0x98u #define LOP_QUOTE 0 #define LOP_LOC 1 #define LOP_SKIP 2 @@ -327,6 +330,14 @@ struct mmo_data_struct /* We also need a buffer to hold the bytes we count reading or writing. */ bfd_byte buf[4]; + + /* Whether we've calculated symbol consistency requirement yet. We do this + when-needed, which must be at some time after all section + contents is known. */ + bfd_boolean symbol_consistency_override_calculated; + + /* Whether to consistency-check symbol values, in particular "Main". */ + bfd_boolean ignore_symbol_consistency; }; typedef struct mmo_data_struct tdata_type; @@ -363,7 +374,7 @@ static void mmo_find_sec_w_addr (bfd *, asection *, void *); static void mmo_find_sec_w_addr_grow (bfd *, asection *, void *); static asection *mmo_make_section (bfd *, const char *); static void mmo_get_symbol_info (bfd *, asymbol *, symbol_info *); -static void mmo_print_symbol (bfd *, void *, asymbol *, +static void mmo_print_symbol (bfd *, void *, asymbol *, bfd_print_symbol_type); static void mmo_init (void); static bfd_boolean mmo_mkobject (bfd *); @@ -375,7 +386,7 @@ static INLINE bfd_byte *mmo_get_loc (asection *, bfd_vma, int); static void mmo_xore_64 (asection *, bfd_vma vma, bfd_vma value); static void mmo_xore_32 (asection *, bfd_vma vma, unsigned int); static void mmo_xore_16 (asection *, bfd_vma vma, unsigned int); -static const bfd_target *mmo_object_p (bfd *); +static bfd_cleanup mmo_object_p (bfd *); static void mmo_map_set_sizes (bfd *, asection *, void *); static bfd_boolean mmo_get_symbols (bfd *); static bfd_boolean mmo_create_symbol (bfd *, const char *, bfd_vma, @@ -420,22 +431,30 @@ static bfd_boolean mmo_write_section_description (bfd *, asection *); static bfd_boolean mmo_has_leading_or_trailing_zero_tetra_p (bfd *, asection *); -/* Global "const" variables initialized once. Must not depend on - particular input or caller; put such things into the bfd or elsewhere. - Look ma, no static per-invocation data! */ - -static -char valid_mmo_symbol_character_set[/* A-Z a-z (we assume consecutive - codes; sorry EBCDIC:ers!). */ - + 'Z' - 'A' + 1 + 'z' - 'a' + 1 - /* Digits. */ - + 10 - /* ':' and '_'. */ - + 1 + 1 - /* Codes higher than 126. */ - + 256 - 126 - /* Ending zero. */ - + 1]; +static const char +valid_mmo_symbol_character_set[] = +{ + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', + 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', + 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', + 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', + ':', '_', 126, 127, 128, 129, + 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, + 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, + 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, + 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, + 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, + 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, + 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, + 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, + 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, + 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, + 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, + 250, 251, 252, 253, 254, 255, + 0 +}; /* Get section SECNAME or create one if it doesn't exist. When creating @@ -452,9 +471,10 @@ mmo_make_section (bfd *abfd, const char *secname) if (newsecname == NULL) { - (*_bfd_error_handler) - (_("%s: No core to allocate section name %s\n"), - bfd_get_filename (abfd), secname); + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: no core to allocate section name %s"), + abfd, secname); bfd_set_error (bfd_error_system_call); return NULL; } @@ -472,26 +492,15 @@ static void mmo_init (void) { static bfd_boolean inited = FALSE; - int i = 0; - int j = 0; - static const char letters[] - = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789:_"; if (inited) return; inited = TRUE; - - /* Fill in the set of valid symbol characters. */ - strcpy (valid_mmo_symbol_character_set, letters); - i = strlen (letters); - - for (j = 126; j < 256; j++) - valid_mmo_symbol_character_set[i++] = j; } /* Check whether an existing file is an mmo file. */ -static const bfd_target * +static bfd_cleanup mmo_object_p (bfd *abfd) { struct stat statbuf; @@ -527,9 +536,10 @@ mmo_object_p (bfd *abfd) if (abfd->tdata.mmo_data->lop_stab_symbol == NULL) { - (*_bfd_error_handler) - (_("%s: No core to allocate a symbol %d bytes long\n"), - bfd_get_filename (abfd), abfd->tdata.mmo_data->max_symbol_length); + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: no core to allocate a symbol %d bytes long"), + abfd, abfd->tdata.mmo_data->max_symbol_length); goto bad_final; } @@ -546,7 +556,7 @@ mmo_object_p (bfd *abfd) if (! bfd_default_set_arch_mach (abfd, bfd_arch_mmix, 0)) goto bad_format_free; - return abfd->xvec; + return _bfd_no_cleanup; bad_format_free: free (abfd->tdata.mmo_data->lop_stab_symbol); @@ -569,7 +579,7 @@ mmo_mkobject (bfd *abfd) /* All fields are zero-initialized, so we don't have to explicitly initialize most. */ - tdata_type *tdata = (tdata_type *) bfd_zmalloc (sizeof (tdata_type)); + tdata_type *tdata = (tdata_type *) bfd_zalloc (abfd, sizeof (tdata_type)); if (tdata == NULL) return FALSE; @@ -582,6 +592,34 @@ mmo_mkobject (bfd *abfd) return TRUE; } +static bfd_boolean +mmo_section_has_contents (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, void *p ATTRIBUTE_UNUSED) +{ + /* The point is to match what --extract-symbols does (well, negated). */ + return bfd_section_size (sec) != 0; +} + +/* Find out whether we should omit symbol consistency checks for this + bfd and cache the value. + + This function must only be called when all section contents is + known. However, calculating symbol consistency at the time the + private BFD data is initialized is too late for some uses. */ + +static bfd_boolean +mmo_ignore_symbol_consistency (bfd *abfd) +{ + if (!abfd->tdata.mmo_data->symbol_consistency_override_calculated) + { + abfd->tdata.mmo_data->ignore_symbol_consistency = + bfd_sections_find_if (abfd, mmo_section_has_contents, NULL) == NULL; + + abfd->tdata.mmo_data->symbol_consistency_override_calculated = TRUE; + } + + return abfd->tdata.mmo_data->ignore_symbol_consistency; +} + static bfd_boolean mmo_bfd_copy_private_bfd_data (bfd *ibfd, bfd *obfd) { @@ -604,10 +642,10 @@ static void mmo_find_sec_w_addr (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, void *p) { struct mmo_find_sec_info *infop = (struct mmo_find_sec_info *) p; - bfd_vma vma = bfd_get_section_vma (abfd, sec); + bfd_vma vma = bfd_section_vma (sec); /* Ignore sections that aren't loaded. */ - if ((bfd_get_section_flags (abfd, sec) & (SEC_LOAD | SEC_ALLOC)) + if ((bfd_section_flags (sec) & (SEC_LOAD | SEC_ALLOC)) != (SEC_LOAD | SEC_ALLOC)) return; @@ -619,10 +657,10 @@ static void mmo_find_sec_w_addr_grow (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, void *p) { struct mmo_find_sec_info *infop = (struct mmo_find_sec_info *) p; - bfd_vma vma = bfd_get_section_vma (abfd, sec); + bfd_vma vma = bfd_section_vma (sec); /* Ignore sections that aren't loaded. */ - if ((bfd_get_section_flags (abfd, sec) & (SEC_LOAD | SEC_ALLOC)) + if ((bfd_section_flags (sec) & (SEC_LOAD | SEC_ALLOC)) != (SEC_LOAD | SEC_ALLOC)) return; @@ -662,11 +700,11 @@ mmo_decide_section (bfd *abfd, bfd_vma vma) if (sec == NULL) return NULL; - if (! sec->user_set_vma) - bfd_set_section_vma (abfd, sec, vma); - if (! bfd_set_section_flags (abfd, sec, - bfd_get_section_flags (abfd, sec) - | SEC_CODE | SEC_LOAD | SEC_ALLOC)) + if (!sec->user_set_vma && !bfd_set_section_vma (sec, vma)) + return NULL; + + if (!bfd_set_section_flags (sec, (bfd_section_flags (sec) + | SEC_CODE | SEC_LOAD | SEC_ALLOC))) return NULL; } else if ((vma >> 56) == 0x20) @@ -676,11 +714,11 @@ mmo_decide_section (bfd *abfd, bfd_vma vma) if (sec == NULL) return NULL; - if (! sec->user_set_vma) - bfd_set_section_vma (abfd, sec, vma); - if (! bfd_set_section_flags (abfd, sec, - bfd_get_section_flags (abfd, sec) - | SEC_LOAD | SEC_ALLOC)) + if (!sec->user_set_vma && !bfd_set_section_vma (sec, vma)) + return NULL; + + if (!bfd_set_section_flags (sec, (bfd_section_flags (sec) + | SEC_LOAD | SEC_ALLOC))) return NULL; } @@ -692,12 +730,12 @@ mmo_decide_section (bfd *abfd, bfd_vma vma) /* If there's still no suitable section, make a new one. */ sprintf (sec_name, ".MMIX.sec.%d", abfd->tdata.mmo_data->sec_no++); sec = mmo_make_section (abfd, sec_name); - if (! sec->user_set_vma) - bfd_set_section_vma (abfd, sec, vma); - if (! bfd_set_section_flags (abfd, sec, - bfd_get_section_flags (abfd, sec) - | SEC_LOAD | SEC_ALLOC)) + if (!sec->user_set_vma && !bfd_set_section_vma (sec, vma)) + return NULL; + + if (!bfd_set_section_flags (sec, (bfd_section_flags (sec) + | SEC_LOAD | SEC_ALLOC))) return NULL; return sec; } @@ -787,21 +825,21 @@ static INLINE bfd_boolean mmo_write_chunk (bfd *abfd, const bfd_byte *loc, unsigned int len) { bfd_boolean retval = TRUE; + struct mmo_data_struct *mmop = abfd->tdata.mmo_data; /* Fill up a tetra from bytes remaining from a previous chunk. */ - if (abfd->tdata.mmo_data->byte_no != 0) + if (mmop->byte_no != 0) { - while (abfd->tdata.mmo_data->byte_no < 4 && len != 0) + while (mmop->byte_no < 4 && len != 0) { - abfd->tdata.mmo_data->buf[abfd->tdata.mmo_data->byte_no++] = *loc++; + mmop->buf[mmop->byte_no++] = *loc++; len--; } - if (abfd->tdata.mmo_data->byte_no == 4) + if (mmop->byte_no == 4) { - mmo_write_tetra (abfd, - bfd_get_32 (abfd, abfd->tdata.mmo_data->buf)); - abfd->tdata.mmo_data->byte_no = 0; + mmo_write_tetra (abfd, bfd_get_32 (abfd, mmop->buf)); + mmop->byte_no = 0; } } @@ -811,7 +849,7 @@ mmo_write_chunk (bfd *abfd, const bfd_byte *loc, unsigned int len) mmo_write_tetra_raw (abfd, LOP_QUOTE_NEXT); retval = (retval - && ! abfd->tdata.mmo_data->have_error + && ! mmop->have_error && 4 == bfd_bwrite (loc, 4, abfd)); loc += 4; @@ -820,12 +858,15 @@ mmo_write_chunk (bfd *abfd, const bfd_byte *loc, unsigned int len) if (len) { - memcpy (abfd->tdata.mmo_data->buf, loc, len); - abfd->tdata.mmo_data->byte_no = len; + /* We must have flushed a previous remainder if we get one from + this chunk too. */ + BFD_ASSERT (mmop->byte_no == 0); + memcpy (mmop->buf, loc, len); + mmop->byte_no = len; } if (! retval) - abfd->tdata.mmo_data->have_error = TRUE; + mmop->have_error = TRUE; return retval; } @@ -867,25 +908,27 @@ static bfd_boolean mmo_write_loc_chunk (bfd *abfd, bfd_vma vma, const bfd_byte *loc, unsigned int len, bfd_vma *last_vmap) { - /* Find an initial and trailing section of zero tetras; we don't need to - write out zeros. FIXME: When we do this, we should emit section size - and address specifiers, else objcopy can't always perform an identity - translation. Only do this if we *don't* have left-over data from a - previous write or the vma of this chunk is *not* the next address, - because then data isn't tetrabyte-aligned and we're concatenating to - that left-over data. */ - - if (abfd->tdata.mmo_data->byte_no == 0 || vma != *last_vmap) + /* Find an initial and trailing section of zero (aligned) tetras; we don't + need to write out zeros. FIXME: When we do this, we should emit + section size and address specifiers, else objcopy can't always perform + an identity translation. Only do this if we *don't* have left-over + data from a previous write (and will not add any) or else the vma of + this chunk is *not* the next address, because then data isn't + tetrabyte-aligned and we're concatenating to that left-over data. */ + + if ((vma & 3) == 0 + && (abfd->tdata.mmo_data->byte_no == 0 || vma != *last_vmap)) { - while (len >= 4 && bfd_get_32 (abfd, loc) == 0) + while (len > 4 && bfd_get_32 (abfd, loc) == 0) { vma += 4; len -= 4; loc += 4; } - while (len >= 4 && bfd_get_32 (abfd, loc + len - 4) == 0) - len -= 4; + if ((len & 3) == 0) + while (len > 4 && bfd_get_32 (abfd, loc + len - 4) == 0) + len -= 4; } /* Only write out the location if it's different than the one the caller @@ -895,8 +938,26 @@ mmo_write_loc_chunk (bfd *abfd, bfd_vma vma, const bfd_byte *loc, /* We might be in the middle of a sequence. */ mmo_flush_chunk (abfd); + /* This should not happen during normal usage, but can presumably + happen with an erroneous linker-script, so handle gracefully. + Avoid Knuth-specific terms in the message, such as "tetrabyte". + Note that this function will get non-4-multiple lengths and + unaligned vmas but those come in tuples (mostly pairs) and are + continuous (i.e. the if-condition above false) and they are + group-wise aligned. */ + if ((vma & 3) != 0) + { + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: attempt to emit contents at non-multiple-of-4" + " address %#" PRIx64 ""), + abfd, (uint64_t) vma); + bfd_set_error (bfd_error_bad_value); + return FALSE; + } + /* We always write the location as 64 bits; no use saving bytes - here. */ + here. */ mmo_write_tetra_raw (abfd, (LOP << 24) | (LOP_LOC << 16) | 2); mmo_write_octa_raw (abfd, vma); } @@ -1072,14 +1133,13 @@ mmo_get_spec_section (bfd *abfd, int spec_data_number) /* Add in the section flags we found to those bfd entered during this process and set the contents. */ - if (! bfd_set_section_flags (abfd, sec, - bfd_sec_flags_from_mmo_flags (flags) - | bfd_get_section_flags (abfd, sec) - | (section_length != 0 ? SEC_HAS_CONTENTS : 0)) - || ! bfd_set_section_size (abfd, sec, sec->size + section_length) + if (!bfd_set_section_flags (sec, + (bfd_sec_flags_from_mmo_flags (flags) + | bfd_section_flags (sec) + | (section_length != 0 ? SEC_HAS_CONTENTS : 0))) + || !bfd_set_section_size (sec, sec->size + section_length) /* Set VMA only for the first occurrence. */ - || (! sec->user_set_vma - && ! bfd_set_section_vma (abfd, sec, section_vma))) + || (!sec->user_set_vma && !bfd_set_section_vma (sec, section_vma))) { /* If we get an error for any of the calls above, signal more than just a format error for the spec section. */ @@ -1181,11 +1241,13 @@ mmo_create_symbol (bfd *abfd, const char *symname, bfd_vma addr, enum object. For written objects, we do it while setting the symbol table. */ if (strcmp (symname, MMIX_START_SYMBOL_NAME) == 0 - && bfd_get_start_address (abfd) != addr) + && bfd_get_start_address (abfd) != addr + && !mmo_ignore_symbol_consistency (abfd)) { - (*_bfd_error_handler) - (_("%s: invalid mmo file: initialization value for $255 is not `Main'\n"), - bfd_get_filename (abfd)); + _bfd_error_handler + (_("%pB: invalid mmo file: initialization value for $255" + " is not `Main'\n"), + abfd); bfd_set_error (bfd_error_bad_value); return FALSE; } @@ -1204,8 +1266,8 @@ Symbol-table, mmo section mapping, File layout, mmo SUBSECTION Symbol table format - From mmixal.w (or really, the generated mmixal.tex) in - @url{http://www-cs-faculty.stanford.edu/~knuth/programs/mmix.tar.gz}): + From mmixal.w (or really, the generated mmixal.tex) in the + MMIXware package which also contains the @command{mmix} simulator: ``Symbols are stored and retrieved by means of a @samp{ternary search trie}, following ideas of Bentley and Sedgewick. (See ACM--SIAM Symp.@: on Discrete Algorithms @samp{8} (1997), 360--369; @@ -1328,11 +1390,11 @@ SUBSECTION abfd->tdata.mmo_data->lop_stab_symbol [abfd->tdata.mmo_data->symbol_position] = 0; - (*_bfd_error_handler) - (_("%s: unsupported wide character sequence" + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: unsupported wide character sequence" " 0x%02X 0x%02X after symbol name starting with `%s'\n"), - bfd_get_filename (abfd), c, c2, - abfd->tdata.mmo_data->lop_stab_symbol); + abfd, c, c2, abfd->tdata.mmo_data->lop_stab_symbol); bfd_set_error (bfd_error_bad_value); abfd->tdata.mmo_data->have_error = TRUE; return FALSE; @@ -1495,9 +1557,8 @@ mmo_get_loc (asection *sec, bfd_vma vma, int size) /* We get here for the first time (at other times too) for this section. Say we have contents. */ - if (! bfd_set_section_flags (sec->owner, sec, - bfd_get_section_flags (sec->owner, sec) - | SEC_HAS_CONTENTS)) + if (!bfd_set_section_flags (sec, (bfd_section_flags (sec) + | SEC_HAS_CONTENTS))) return NULL; } } @@ -1527,15 +1588,16 @@ mmo_scan (bfd *abfd) unsigned int lineno = 1; bfd_boolean error = FALSE; bfd_vma vma = 0; - asection *sec = bfd_make_section_old_way (abfd, MMO_TEXT_SECTION_NAME); + asection *sec = NULL; asection *non_spec_sec = NULL; bfd_vma non_spec_vma = 0; bfd_size_type nbytes_read = 0; /* Buffer with room to read a 64-bit value. */ bfd_byte buf[8]; - long stab_loc = -1; + file_ptr stab_loc = -1; char *file_names[256]; + abfd->symcount = 0; memset (file_names, 0, sizeof (file_names)); if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0) @@ -1561,9 +1623,10 @@ mmo_scan (bfd *abfd) switch (buf[1]) { default: - (*_bfd_error_handler) - (_("%s: invalid mmo file: unsupported lopcode `%d'\n"), - bfd_get_filename (abfd), buf[1]); + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: invalid mmo file: unsupported lopcode `%d'\n"), + abfd, buf[1]); bfd_set_error (bfd_error_bad_value); goto error_return; @@ -1571,18 +1634,22 @@ mmo_scan (bfd *abfd) /* Quote the next 32-bit word. */ if (y != 0 || z != 1) { - (*_bfd_error_handler) - (_("%s: invalid mmo file: expected YZ = 1 got YZ = %d for lop_quote\n"), - bfd_get_filename (abfd), y*256+z); + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: invalid mmo file: expected YZ = 1" + " got YZ = %d for lop_quote\n"), + abfd, y*256+z); bfd_set_error (bfd_error_bad_value); goto error_return; } if (bfd_bread (buf, 4, abfd) != 4) goto error_return; + vma &= ~3; + if (sec == NULL) + sec = bfd_make_section_old_way (abfd, MMO_TEXT_SECTION_NAME); mmo_xore_32 (sec, vma, bfd_get_32 (abfd, buf)); vma += 4; - vma &= ~3; lineno++; break; @@ -1607,14 +1674,19 @@ mmo_scan (bfd *abfd) } else { - (*_bfd_error_handler) - (_("%s: invalid mmo file: expected z = 1 or z = 2, got z = %d for lop_loc\n"), - bfd_get_filename (abfd), z); + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: invalid mmo file: expected z = 1 or z = 2," + " got z = %d for lop_loc\n"), + abfd, z); bfd_set_error (bfd_error_bad_value); goto error_return; } - sec = mmo_decide_section (abfd, vma); + /* When we decide which section the data goes into, we might + create the section. If that happens, make sure the VMA at + creation time is tetra-aligned. */ + sec = mmo_decide_section (abfd, vma & ~3); if (sec == NULL) goto error_return; break; @@ -1653,9 +1725,11 @@ mmo_scan (bfd *abfd) } else { - (*_bfd_error_handler) - (_("%s: invalid mmo file: expected z = 1 or z = 2, got z = %d for lop_fixo\n"), - bfd_get_filename (abfd), z); + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: invalid mmo file: expected z = 1 or z = 2," + " got z = %d for lop_fixo\n"), + abfd, z); bfd_set_error (bfd_error_bad_value); goto error_return; } @@ -1692,18 +1766,22 @@ mmo_scan (bfd *abfd) if (y != 0) { - (*_bfd_error_handler) - (_("%s: invalid mmo file: expected y = 0, got y = %d for lop_fixrx\n"), - bfd_get_filename (abfd), y); + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: invalid mmo file: expected y = 0," + " got y = %d for lop_fixrx\n"), + abfd, y); bfd_set_error (bfd_error_bad_value); goto error_return; } if (z != 16 && z != 24) { - (*_bfd_error_handler) - (_("%s: invalid mmo file: expected z = 16 or z = 24, got z = %d for lop_fixrx\n"), - bfd_get_filename (abfd), z); + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: invalid mmo file: expected z = 16 or z = 24," + " got z = %d for lop_fixrx\n"), + abfd, z); bfd_set_error (bfd_error_bad_value); goto error_return; } @@ -1724,9 +1802,11 @@ mmo_scan (bfd *abfd) p = vma - 4 * ((delta & 0xffffff) - (1 << z)); else { - (*_bfd_error_handler) - (_("%s: invalid mmo file: leading byte of operand word must be 0 or 1, got %d for lop_fixrx\n"), - bfd_get_filename (abfd), buf[0]); + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: invalid mmo file: leading byte of operand word" + " must be 0 or 1, got %d for lop_fixrx\n"), + abfd, buf[0]); bfd_set_error (bfd_error_bad_value); goto error_return; } @@ -1747,9 +1827,11 @@ mmo_scan (bfd *abfd) if (fname == NULL) { - (*_bfd_error_handler) - (_("%s: cannot allocate file name for file number %d, %d bytes\n"), - bfd_get_filename (abfd), y, z * 4 + 1); + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: cannot allocate file name for file number %d," + " %d bytes\n"), + abfd, y, z * 4 + 1); bfd_set_error (bfd_error_system_call); goto error_return; } @@ -1767,10 +1849,11 @@ mmo_scan (bfd *abfd) if (file_names[y] != NULL) { - (*_bfd_error_handler) - (_("%s: invalid mmo file: file number %d `%s'," + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: invalid mmo file: file number %d `%s'," " was already entered as `%s'\n"), - bfd_get_filename (abfd), y, fname, file_names[y]); + abfd, y, fname, file_names[y]); bfd_set_error (bfd_error_bad_value); goto error_return; } @@ -1780,10 +1863,11 @@ mmo_scan (bfd *abfd) if (file_names[y] == NULL) { - (*_bfd_error_handler) - (_("%s: invalid mmo file: file name for number %d" + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: invalid mmo file: file name for number %d" " was not specified before use\n"), - bfd_get_filename (abfd), y); + abfd, y); bfd_set_error (bfd_error_bad_value); goto error_return; } @@ -1886,10 +1970,11 @@ mmo_scan (bfd *abfd) /* We read in the symbols now, not later. */ if (y != 0 || z != 0) { - (*_bfd_error_handler) - (_("%s: invalid mmo file: fields y and z of lop_stab" + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: invalid mmo file: fields y and z of lop_stab" " non-zero, y: %d, z: %d\n"), - bfd_get_filename (abfd), y, z); + abfd, y, z); bfd_set_error (bfd_error_bad_value); goto error_return; } @@ -1922,10 +2007,11 @@ mmo_scan (bfd *abfd) if (statbuf.st_size != curpos) { - (*_bfd_error_handler) - (_("%s: invalid mmo file: lop_end not last item in" + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: invalid mmo file: lop_end not last item in" " file\n"), - bfd_get_filename (abfd)); + abfd); bfd_set_error (bfd_error_bad_value); goto error_return; } @@ -1935,12 +2021,13 @@ mmo_scan (bfd *abfd) it. */ if ((long) (y * 256 + z) * 4 != (curpos - stab_loc) - 4) { - (*_bfd_error_handler) - (_("%s: invalid mmo file: YZ of lop_end (%ld)" + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: invalid mmo file: YZ of lop_end (%ld)" " not equal to the number of tetras to the preceding" " lop_stab (%ld)\n"), - bfd_get_filename (abfd), (long) (y * 256 + z), - (curpos - stab_loc - 4)/4); + abfd, (long) (y * 256 + z), + (long) (curpos - stab_loc - 4)/4); bfd_set_error (bfd_error_bad_value); goto error_return; } @@ -1953,6 +2040,8 @@ mmo_scan (bfd *abfd) else { /* This wasn't a lopcode, so store it in the current section. */ + if (sec == NULL) + sec = bfd_make_section_old_way (abfd, MMO_TEXT_SECTION_NAME); mmo_xore_32 (sec, vma & ~3, bfd_get_32 (abfd, buf)); vma += 4; vma &= ~3; @@ -1980,18 +2069,16 @@ mmo_scan (bfd *abfd) section flags must be set then. */ sec = bfd_get_section_by_name (abfd, MMO_TEXT_SECTION_NAME); if (sec != NULL - && (bfd_get_section_flags (abfd, sec) & SEC_HAS_CONTENTS) - && ! bfd_set_section_flags (abfd, sec, - bfd_get_section_flags (abfd, sec) - | SEC_ALLOC | SEC_LOAD | SEC_CODE)) + && (bfd_section_flags (sec) & SEC_HAS_CONTENTS) + && !bfd_set_section_flags (sec, (bfd_section_flags (sec) + | SEC_ALLOC | SEC_LOAD | SEC_CODE))) error = TRUE; sec = bfd_get_section_by_name (abfd, MMO_DATA_SECTION_NAME); if (sec != NULL - && (bfd_get_section_flags (abfd, sec) & SEC_HAS_CONTENTS) - && ! bfd_set_section_flags (abfd, sec, - bfd_get_section_flags (abfd, sec) - | SEC_ALLOC | SEC_LOAD)) + && (bfd_section_flags (sec) & SEC_HAS_CONTENTS) + && !bfd_set_section_flags (sec, (bfd_section_flags (sec) + | SEC_ALLOC | SEC_LOAD | SEC_DATA))) error = TRUE; /* Free whatever resources we took. */ @@ -2052,7 +2139,7 @@ mmo_get_section_contents (bfd *abfd ATTRIBUTE_UNUSED, memcpy (location, loc, chunk_size); - location += chunk_size; + location = (bfd_byte *) location + chunk_size; bytes_to_do -= chunk_size; offset += chunk_size; } @@ -2342,7 +2429,7 @@ bfd_sec_flags_from_mmo_flags (flagword flags) static bfd_boolean mmo_has_leading_or_trailing_zero_tetra_p (bfd *abfd, asection *sec) { - bfd_vma secaddr = bfd_get_section_vma (abfd, sec); + bfd_vma secaddr = bfd_section_vma (sec); if (sec->size < 4) return FALSE; @@ -2374,7 +2461,7 @@ mmo_internal_write_section (bfd *abfd, asection *sec) if (strcmp (sec->name, MMO_TEXT_SECTION_NAME) == 0) { - bfd_vma secaddr = bfd_get_section_vma (abfd, sec); + bfd_vma secaddr = bfd_section_vma (sec); /* Because leading and trailing zeros are omitted in output, we need to specify the section boundaries so they're correct when the file @@ -2395,7 +2482,7 @@ mmo_internal_write_section (bfd *abfd, asection *sec) } else if (strcmp (sec->name, MMO_DATA_SECTION_NAME) == 0) { - bfd_vma secaddr = bfd_get_section_vma (abfd, sec); + bfd_vma secaddr = bfd_section_vma (sec); /* Same goes as for MMO_TEXT_SECTION_NAME above. */ if (sec->size != 0 @@ -2415,7 +2502,7 @@ mmo_internal_write_section (bfd *abfd, asection *sec) /* Not handled here. */ { /* This would normally be an abort call since this can't happen, but - we don't do that. */ + we don't do that. */ bfd_set_error (bfd_error_bad_value); return FALSE; } @@ -2429,7 +2516,7 @@ mmo_internal_write_section (bfd *abfd, asection *sec) } /* Ignore sections that are just allocated or empty; we write out _contents_ here. */ - else if ((bfd_get_section_flags (abfd, sec) & SEC_HAS_CONTENTS) != 0 + else if ((bfd_section_flags (sec) & SEC_HAS_CONTENTS) != 0 && sec->size != 0) { if (!mmo_write_section_description (abfd, sec)) @@ -2437,7 +2524,7 @@ mmo_internal_write_section (bfd *abfd, asection *sec) /* Writing a LOP_LOC ends the LOP_SPEC data, and makes data actually loaded. */ - if (bfd_get_section_flags (abfd, sec) & SEC_LOAD) + if (bfd_section_flags (sec) & SEC_LOAD) return (! abfd->tdata.mmo_data->have_error && mmo_write_loc_chunk_list (abfd, mmo_section_data (sec)->head)); @@ -2556,10 +2643,9 @@ EXAMPLE for all alien sections; perhaps mmo.em should clear that flag. Might be related to weak references. */ mmo_write_tetra (abfd, - mmo_sec_flags_from_bfd_flags - (bfd_get_section_flags (abfd, sec))); + mmo_sec_flags_from_bfd_flags (bfd_section_flags (sec))); mmo_write_octa (abfd, sec->size); - mmo_write_octa (abfd, bfd_get_section_vma (abfd, sec)); + mmo_write_octa (abfd, bfd_section_vma (sec)); return TRUE; } @@ -2589,7 +2675,7 @@ mmo_set_section_contents (bfd *abfd ATTRIBUTE_UNUSED, sec_ptr sec, memcpy (loc, location, chunk_size); - location += chunk_size; + location = (bfd_byte *) location + chunk_size; bytes_to_do -= chunk_size; offset += chunk_size; } @@ -2645,9 +2731,10 @@ mmo_internal_add_3_sym (bfd *abfd, struct mmo_symbol_trie *rootp, we discover it and bail out. */ if (trie->sym.name != NULL) { - (*_bfd_error_handler) - (_("%s: invalid symbol table: duplicate symbol `%s'\n"), - bfd_get_filename (abfd), trie->sym.name); + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: invalid symbol table: duplicate symbol `%s'\n"), + abfd, trie->sym.name); bfd_set_error (bfd_error_bad_value); return FALSE; } @@ -2865,16 +2952,18 @@ mmo_write_symbols_and_terminator (bfd *abfd) && (table[i]->flags & (BSF_DEBUGGING|BSF_GLOBAL)) == BSF_GLOBAL) { asymbol *mainsym = table[i]; + bfd_vma mainvalue + = (mainsym->value + + mainsym->section->output_section->vma + + mainsym->section->output_offset); memcpy (table + 1, orig_table, i * sizeof (asymbol *)); table[0] = mainsym; /* Check that the value assigned to :Main is the same as the entry address. The default linker script asserts this. This is as good a place as any to check this consistency. */ - if ((mainsym->value - + mainsym->section->output_section->vma - + mainsym->section->output_offset) - != bfd_get_start_address (abfd)) + if (mainvalue != bfd_get_start_address (abfd) + && !mmo_ignore_symbol_consistency (abfd)) { /* Arbitrary buffer to hold the printable representation of a vma. */ @@ -2882,13 +2971,14 @@ mmo_write_symbols_and_terminator (bfd *abfd) char vmas_start[40]; bfd_vma vma_start = bfd_get_start_address (abfd); - sprintf_vma (vmas_main, mainsym->value); + sprintf_vma (vmas_main, mainvalue); sprintf_vma (vmas_start, vma_start); - (*_bfd_error_handler) - (_("%s: Bad symbol definition: `Main' set to %s rather" + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: bad symbol definition: `Main' set to %s rather" " than the start address %s\n"), - bfd_get_filename (abfd), vmas_main, vmas_start); + abfd, vmas_main, vmas_start); bfd_set_error (bfd_error_bad_value); return FALSE; } @@ -2903,59 +2993,65 @@ mmo_write_symbols_and_terminator (bfd *abfd) count++; } - for (i = 0, serno = 1; i < count && table[i] != NULL; i++) + /* Don't bother inspecting symbols in plugin dummy objects; their + symbols aren't fully inspectable. */ + if ((abfd->flags & BFD_PLUGIN) == 0) { - asymbol *s = table[i]; + for (i = 0, serno = 1; i < count && table[i] != NULL; i++) + { + asymbol *s = table[i]; - /* It's not enough to consult bfd_is_local_label, since it does not - mean "local" in the sense of linkable-and-observable-after-link. - Let's just check the BSF_GLOBAL flag. + /* It's not enough to consult bfd_is_local_label, since it does not + mean "local" in the sense of linkable-and-observable-after-link. + Let's just check the BSF_GLOBAL flag. - Also, don't export symbols with characters not in the allowed set. */ - if ((s->flags & (BSF_DEBUGGING|BSF_GLOBAL)) == BSF_GLOBAL - && strspn (s->name, - valid_mmo_symbol_character_set) == strlen (s->name)) - { - struct mmo_symbol sym; - memset (&sym, 0, sizeof (sym)); - - /* Need to strip const here; strdup:ing would leak and the - existing string must be safe to reuse. */ - sym.name = (char *) s->name; - sym.value = - s->value - + s->section->output_section->vma - + s->section->output_offset; - - if (bfd_is_und_section (s->section)) - sym.sym_type = mmo_undef_sym; - else if (strcmp (s->section->name, MMO_DATA_SECTION_NAME) == 0 - /* The encoding of data symbols require that the "rest" - of the value fits in 6 bytes, so the upper two bytes - must be 0x2000. All other symbols get to be the - absolute type. */ - && (sym.value >> 48) == 0x2000) - sym.sym_type = mmo_data_sym; - else if (strcmp (s->section->name, MMIX_REG_SECTION_NAME) == 0) - sym.sym_type = mmo_reg_sym; - else if (strcmp (s->section->name, - MMIX_REG_CONTENTS_SECTION_NAME) == 0) + Also, don't export symbols with characters not in the + allowed set. */ + if ((s->flags & (BSF_DEBUGGING|BSF_GLOBAL)) == BSF_GLOBAL + && strspn (s->name, + valid_mmo_symbol_character_set) == strlen (s->name)) { - sym.sym_type = mmo_reg_sym; - sym.value /= 8; - } - else - sym.sym_type = mmo_abs_sym; + struct mmo_symbol sym; + memset (&sym, 0, sizeof (sym)); + + /* Need to strip const here; strdup:ing would leak and the + existing string must be safe to reuse. */ + sym.name = (char *) s->name; + sym.value = + s->value + + s->section->output_section->vma + + s->section->output_offset; + + if (bfd_is_und_section (s->section)) + sym.sym_type = mmo_undef_sym; + else if (strcmp (s->section->name, MMO_DATA_SECTION_NAME) == 0 + /* The encoding of data symbols require that the "rest" + of the value fits in 6 bytes, so the upper two bytes + must be 0x2000. All other symbols get to be the + absolute type. */ + && (sym.value >> 48) == 0x2000) + sym.sym_type = mmo_data_sym; + else if (strcmp (s->section->name, MMIX_REG_SECTION_NAME) == 0) + sym.sym_type = mmo_reg_sym; + else if (strcmp (s->section->name, + MMIX_REG_CONTENTS_SECTION_NAME) == 0) + { + sym.sym_type = mmo_reg_sym; + sym.value /= 8; + } + else + sym.sym_type = mmo_abs_sym; - /* FIXME: We assume the order of the received symbols is an - ordered mapping of the serial numbers. This is not - necessarily true if we e.g. objcopy a mmo file to another and - there are gaps in the numbering. Not sure if this can - happen. Not sure what to do. */ - sym.serno = serno++; + /* FIXME: We assume the order of the received symbols is an + ordered mapping of the serial numbers. This is not + necessarily true if we e.g. objcopy a mmo file to another and + there are gaps in the numbering. Not sure if this can + happen. Not sure what to do. */ + sym.serno = serno++; - if (! mmo_internal_add_3_sym (abfd, &root, &sym)) - return FALSE; + if (! mmo_internal_add_3_sym (abfd, &root, &sym)) + return FALSE; + } } } @@ -2977,10 +3073,11 @@ mmo_write_symbols_and_terminator (bfd *abfd) There's no specific test-case. */ struct mmo_symbol sym; - (*_bfd_error_handler) - (_("%s: warning: symbol table too large for mmo, larger than 65535" + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: warning: symbol table too large for mmo, larger than 65535" " 32-bit words: %d. Only `Main' will be emitted.\n"), - bfd_get_filename (abfd), trie_len); + abfd, trie_len); memset (&sym, 0, sizeof (sym)); sym.sym_type = mmo_abs_sym; @@ -3022,10 +3119,11 @@ mmo_write_symbols_and_terminator (bfd *abfd) /* I haven't seen this trig. It seems no use claiming this case isn't debugged and abort if we get here. Instead emit a diagnostic and fail "normally". */ - (*_bfd_error_handler) - (_("%s: internal error, symbol table changed size from %d to %d" + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: internal error, symbol table changed size from %d to %d" " words\n"), - bfd_get_filename (abfd), trie_len, + abfd, trie_len, (abfd->tdata.mmo_data->byte_no + 3)/4); bfd_set_error (bfd_error_bad_value); return FALSE; @@ -3069,15 +3167,16 @@ mmo_write_section_unless_reg_contents (bfd *abfd, asection *sec, void *p) /* Exclude the convenience register section. */ if (strcmp (sec->name, MMIX_REG_SECTION_NAME) == 0) { - if (bfd_get_section_flags (abfd, sec) & SEC_HAS_CONTENTS) + if (bfd_section_flags (sec) & SEC_HAS_CONTENTS) { /* Make sure it hasn't got contents. It seems impossible to make it carry contents, so we don't have a test-case for this. */ - (*_bfd_error_handler) - (_("%s: internal error, internal register section %s had" + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: internal error, internal register section %pA had" " contents\n"), - bfd_get_filename (abfd), sec->name); + abfd, sec); bfd_set_error (bfd_error_bad_value); infop->retval = FALSE; return; @@ -3125,23 +3224,22 @@ mmo_write_object_contents (bfd *abfd) if (sec->size == 0) /* There must always be at least one such register. */ - (*_bfd_error_handler) - (_("%s: no initialized registers; section length 0\n"), - bfd_get_filename (abfd)); + _bfd_error_handler + (_("%pB: no initialized registers; section length 0\n"), + abfd); else if (sec->vma > (256 - 32) * 8) /* Provide better error message for the case of too many global registers. */ - (*_bfd_error_handler) - (_("%s: too many initialized registers; section length %ld\n"), - bfd_get_filename (abfd), - (long) sec->size); + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: too many initialized registers; section length %" PRId64), + abfd, (int64_t) sec->size); else - (*_bfd_error_handler) - (_("%s: invalid start address for initialized registers of" - " length %ld: 0x%lx%08lx\n"), - bfd_get_filename (abfd), - (long) sec->size, - (unsigned long) (sec->vma >> 32), (unsigned long) (sec->vma)); + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: invalid start address for initialized registers of" + " length %" PRId64 ": %#" PRIx64), + abfd, (int64_t) sec->size, (uint64_t) sec->vma); return FALSE; } @@ -3170,8 +3268,10 @@ mmo_write_object_contents (bfd *abfd) /* Perhaps we need to adjust this one; mmo labels (originally) without a leading ':' might more appropriately be called local. */ #define mmo_bfd_is_local_label_name bfd_generic_is_local_label_name -#define mmo_bfd_is_target_special_symbol \ - ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false) +#define mmo_bfd_is_target_special_symbol _bfd_bool_bfd_asymbol_false + +#define mmo_get_symbol_version_string \ + _bfd_nosymbols_get_symbol_version_string /* Is this one really used or defined by anyone? */ #define mmo_get_lineno _bfd_nosymbols_get_lineno @@ -3179,6 +3279,7 @@ mmo_write_object_contents (bfd *abfd) /* FIXME: We can do better on this one, if we have a dwarf2 .debug_line section or if MMO line numbers are implemented. */ #define mmo_find_nearest_line _bfd_nosymbols_find_nearest_line +#define mmo_find_line _bfd_nosymbols_find_line #define mmo_find_inliner_info _bfd_nosymbols_find_inliner_info #define mmo_make_empty_symbol _bfd_generic_make_empty_symbol #define mmo_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol @@ -3190,14 +3291,15 @@ mmo_write_object_contents (bfd *abfd) #define mmo_bfd_get_relocated_section_contents \ bfd_generic_get_relocated_section_contents #define mmo_bfd_gc_sections bfd_generic_gc_sections +#define mmo_bfd_lookup_section_flags bfd_generic_lookup_section_flags #define mmo_bfd_link_hash_table_create _bfd_generic_link_hash_table_create -#define mmo_bfd_link_hash_table_free _bfd_generic_link_hash_table_free #define mmo_bfd_link_add_symbols _bfd_generic_link_add_symbols #define mmo_bfd_link_just_syms _bfd_generic_link_just_syms #define mmo_bfd_copy_link_hash_symbol_type \ _bfd_generic_copy_link_hash_symbol_type #define mmo_bfd_final_link _bfd_generic_final_link #define mmo_bfd_link_split_section _bfd_generic_link_split_section +#define mmo_bfd_link_check_relocs _bfd_generic_link_check_relocs /* Strictly speaking, only MMIX uses this restricted format, but let's not stop anybody from shooting themselves in the foot. */ @@ -3205,10 +3307,13 @@ mmo_write_object_contents (bfd *abfd) #define mmo_bfd_relax_section bfd_generic_relax_section #define mmo_bfd_merge_sections bfd_generic_merge_sections #define mmo_bfd_is_group_section bfd_generic_is_group_section +#define mmo_bfd_group_name bfd_generic_group_name #define mmo_bfd_discard_group bfd_generic_discard_group #define mmo_section_already_linked \ _bfd_generic_section_already_linked #define mmo_bfd_define_common_symbol bfd_generic_define_common_symbol +#define mmo_bfd_link_hide_symbol _bfd_generic_link_hide_symbol +#define mmo_bfd_define_start_stop bfd_generic_define_start_stop /* We want to copy time of creation, otherwise we'd use BFD_JUMP_TABLE_COPY (_bfd_generic). */ @@ -3219,7 +3324,7 @@ mmo_write_object_contents (bfd *abfd) #define mmo_bfd_set_private_flags _bfd_generic_bfd_set_private_flags #define mmo_bfd_print_private_bfd_data _bfd_generic_bfd_print_private_bfd_data -const bfd_target bfd_mmo_vec = +const bfd_target mmix_mmo_vec = { "mmo", /* name */ bfd_target_mmo_flavour, @@ -3253,16 +3358,16 @@ const bfd_target bfd_mmo_vec = _bfd_dummy_target, }, { - bfd_false, + _bfd_bool_bfd_false_error, mmo_mkobject, - bfd_false, - bfd_false, + _bfd_bool_bfd_false_error, + _bfd_bool_bfd_false_error, }, { /* bfd_write_contents */ - bfd_false, + _bfd_bool_bfd_false_error, mmo_write_object_contents, - bfd_false, - bfd_false, + _bfd_bool_bfd_false_error, + _bfd_bool_bfd_false_error, }, BFD_JUMP_TABLE_GENERIC (mmo),