X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fbfd.c;h=851710401e036fa79d9d08844adcf2b392cbfec5;hb=5c4ce239a3ab9263163a0fe8e7487b39a41c43d1;hp=806b9fb33f517618d9f51f6984e7b6cfa4e03896;hpb=49f30d83f659591d7d2b14a18dc8308b3fdb8dd5;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/bfd.c b/bfd/bfd.c index 806b9fb33f..851710401e 100644 --- a/bfd/bfd.c +++ b/bfd/bfd.c @@ -1,5 +1,5 @@ /* Generic BFD library interface and support routines. - Copyright (C) 1990-2016 Free Software Foundation, Inc. + Copyright (C) 1990-2018 Free Software Foundation, Inc. Written by Cygnus Support. This file is part of BFD, the Binary File Descriptor library. @@ -74,8 +74,9 @@ CODE_FRAGMENT . least-recently-used list of BFDs. *} . struct bfd *lru_prev, *lru_next; . -. {* When a file is closed by the caching routines, BFD retains -. state information on the file here... *} +. {* Track current file position (or current buffer offset for +. in-memory BFDs). When a file is closed by the caching routines, +. BFD retains state information on the file here. *} . ufile_ptr where; . . {* File modified time, if mtime_set is TRUE. *} @@ -100,59 +101,59 @@ CODE_FRAGMENT . the object_flags values have mostly just been copied from backend . to another, and are not necessarily correct). *} . -.#define BFD_NO_FLAGS 0x00 +.#define BFD_NO_FLAGS 0x0 . . {* BFD contains relocation entries. *} -.#define HAS_RELOC 0x01 +.#define HAS_RELOC 0x1 . . {* BFD is directly executable. *} -.#define EXEC_P 0x02 +.#define EXEC_P 0x2 . . {* BFD has line number information (basically used for F_LNNO in a . COFF header). *} -.#define HAS_LINENO 0x04 +.#define HAS_LINENO 0x4 . . {* BFD has debugging information. *} -.#define HAS_DEBUG 0x08 +.#define HAS_DEBUG 0x08 . . {* BFD has symbols. *} -.#define HAS_SYMS 0x10 +.#define HAS_SYMS 0x10 . . {* BFD has local symbols (basically used for F_LSYMS in a COFF . header). *} -.#define HAS_LOCALS 0x20 +.#define HAS_LOCALS 0x20 . . {* BFD is a dynamic object. *} -.#define DYNAMIC 0x40 +.#define DYNAMIC 0x40 . . {* Text section is write protected (if D_PAGED is not set, this is . like an a.out NMAGIC file) (the linker sets this by default, but . clears it for -r or -N). *} -.#define WP_TEXT 0x80 +.#define WP_TEXT 0x80 . . {* BFD is dynamically paged (this is like an a.out ZMAGIC file) (the . linker sets this by default, but clears it for -r or -n or -N). *} -.#define D_PAGED 0x100 +.#define D_PAGED 0x100 . . {* BFD is relaxable (this means that bfd_relax_section may be able to . do something) (sometimes bfd_relax_section can do something even if . this is not set). *} -.#define BFD_IS_RELAXABLE 0x200 +.#define BFD_IS_RELAXABLE 0x200 . . {* This may be set before writing out a BFD to request using a . traditional format. For example, this is used to request that when . writing out an a.out object the symbols not be hashed to eliminate . duplicates. *} -.#define BFD_TRADITIONAL_FORMAT 0x400 +.#define BFD_TRADITIONAL_FORMAT 0x400 . . {* This flag indicates that the BFD contents are actually cached . in memory. If this is set, iostream points to a bfd_in_memory . struct. *} -.#define BFD_IN_MEMORY 0x800 +.#define BFD_IN_MEMORY 0x800 . . {* This BFD has been created by the linker and doesn't correspond . to any input file. *} -.#define BFD_LINKER_CREATED 0x1000 +.#define BFD_LINKER_CREATED 0x1000 . . {* This may be set before writing out a BFD to request that it . be written using values for UIDs, GIDs, timestamps, etc. that @@ -160,28 +161,29 @@ CODE_FRAGMENT .#define BFD_DETERMINISTIC_OUTPUT 0x2000 . . {* Compress sections in this BFD. *} -.#define BFD_COMPRESS 0x4000 +.#define BFD_COMPRESS 0x4000 . . {* Decompress sections in this BFD. *} -.#define BFD_DECOMPRESS 0x8000 +.#define BFD_DECOMPRESS 0x8000 . . {* BFD is a dummy, for plugins. *} -.#define BFD_PLUGIN 0x10000 +.#define BFD_PLUGIN 0x10000 . . {* Compress sections in this BFD with SHF_COMPRESSED from gABI. *} -.#define BFD_COMPRESS_GABI 0x20000 +.#define BFD_COMPRESS_GABI 0x20000 . . {* Convert ELF common symbol type to STT_COMMON or STT_OBJECT in this . BFD. *} -.#define BFD_CONVERT_ELF_COMMON 0x40000 +.#define BFD_CONVERT_ELF_COMMON 0x40000 . . {* Use the ELF STT_COMMON type in this BFD. *} -.#define BFD_USE_ELF_STT_COMMON 0x80000 +.#define BFD_USE_ELF_STT_COMMON 0x80000 . . {* Flags bits to be saved in bfd_preserve_save. *} .#define BFD_FLAGS_SAVED \ -. (BFD_IN_MEMORY | BFD_COMPRESS | BFD_DECOMPRESS | BFD_PLUGIN \ -. | BFD_COMPRESS_GABI | BFD_CONVERT_ELF_COMMON | BFD_USE_ELF_STT_COMMON) +. (BFD_IN_MEMORY | BFD_COMPRESS | BFD_DECOMPRESS | BFD_LINKER_CREATED \ +. | BFD_PLUGIN | BFD_COMPRESS_GABI | BFD_CONVERT_ELF_COMMON \ +. | BFD_USE_ELF_STT_COMMON) . . {* Flags bits which are for BFD use only. *} .#define BFD_FLAGS_FOR_BFD_USE_MASK \ @@ -289,7 +291,7 @@ CODE_FRAGMENT . struct bfd *archive_next; {* The next BFD in the archive. *} . struct bfd *archive_head; {* The first BFD in the archive. *} . struct bfd *nested_archives; {* List of nested archive in a flattened -. thin archive. *} +. thin archive. *} . . union { . {* For input BFDs, a chain of BFDs involved in a link. *} @@ -303,21 +305,15 @@ CODE_FRAGMENT . { . struct aout_data_struct *aout_data; . struct artdata *aout_ar_data; -. struct _oasys_data *oasys_obj_data; -. struct _oasys_ar_data *oasys_ar_data; . struct coff_tdata *coff_obj_data; . struct pe_tdata *pe_obj_data; . struct xcoff_tdata *xcoff_obj_data; . struct ecoff_tdata *ecoff_obj_data; -. struct ieee_data_struct *ieee_data; -. struct ieee_ar_data_struct *ieee_ar_data; . struct srec_data_struct *srec_data; . struct verilog_data_struct *verilog_data; . struct ihex_data_struct *ihex_data; . struct tekhex_data_struct *tekhex_data; . struct elf_obj_tdata *elf_obj_data; -. struct nlm_obj_tdata *nlm_obj_data; -. struct bout_data_struct *bout_data; . struct mmo_data_struct *mmo_data; . struct sun_core_struct *sun_core_data; . struct sco5_core_struct *sco5_core_data; @@ -401,7 +397,7 @@ SECTION individual documentation for precise semantics). On an error, they call <> to set an error condition that callers can check by calling <>. - If that returns <>, then check + If that returns <>, then check <>. The easiest way to report a BFD error to the user is to @@ -450,28 +446,28 @@ static bfd_error_type input_error = bfd_error_no_error; const char *const bfd_errmsgs[] = { - N_("No error"), - N_("System call error"), - N_("Invalid bfd target"), - N_("File in wrong format"), - N_("Archive object file in wrong format"), - N_("Invalid operation"), - N_("Memory exhausted"), - N_("No symbols"), - N_("Archive has no index; run ranlib to add one"), - N_("No more archived files"), - N_("Malformed archive"), + N_("no error"), + N_("system call error"), + N_("invalid bfd target"), + N_("file in wrong format"), + N_("archive object file in wrong format"), + N_("invalid operation"), + N_("memory exhausted"), + N_("no symbols"), + N_("archive has no index; run ranlib to add one"), + N_("no more archived files"), + N_("malformed archive"), N_("DSO missing from command line"), - N_("File format not recognized"), - N_("File format is ambiguous"), - N_("Section has no contents"), - N_("Nonrepresentable section on output"), - N_("Symbol needs debug section which does not exist"), - N_("Bad value"), - N_("File truncated"), - N_("File too big"), - N_("Error reading %s: %s"), - N_("#") + N_("file format not recognized"), + N_("file format is ambiguous"), + N_("section has no contents"), + N_("nonrepresentable section on output"), + N_("symbol needs debug section which does not exist"), + N_("bad value"), + N_("file truncated"), + N_("file too big"), + N_("error reading %s: %s"), + N_("#") }; /* @@ -496,32 +492,47 @@ FUNCTION bfd_set_error SYNOPSIS - void bfd_set_error (bfd_error_type error_tag, ...); + void bfd_set_error (bfd_error_type error_tag); DESCRIPTION Set the BFD error condition to be @var{error_tag}. - If @var{error_tag} is bfd_error_on_input, then this function - takes two more parameters, the input bfd where the error - occurred, and the bfd_error_type error. + + @var{error_tag} must not be bfd_error_on_input. Use + bfd_set_input_error for input errors instead. */ void -bfd_set_error (bfd_error_type error_tag, ...) +bfd_set_error (bfd_error_type error_tag) { bfd_error = error_tag; - if (error_tag == bfd_error_on_input) - { - /* This is an error that occurred during bfd_close when - writing an archive, but on one of the input files. */ - va_list ap; - - va_start (ap, error_tag); - input_bfd = va_arg (ap, bfd *); - input_error = (bfd_error_type) va_arg (ap, int); - if (input_error >= bfd_error_on_input) - abort (); - va_end (ap); - } + if (bfd_error >= bfd_error_on_input) + abort (); +} + +/* +FUNCTION + bfd_set_input_error + +SYNOPSIS + void bfd_set_input_error (bfd *input, bfd_error_type error_tag); + +DESCRIPTION + + Set the BFD error condition to be bfd_error_on_input. + @var{input} is the input bfd where the error occurred, and + @var{error_tag} the bfd_error_type error. +*/ + +void +bfd_set_input_error (bfd *input, bfd_error_type error_tag) +{ + /* This is an error that occurred during bfd_close when writing an + archive, but on one of the input files. */ + bfd_error = bfd_error_on_input; + input_bfd = input; + input_error = error_tag; + if (input_error >= bfd_error_on_input) + abort (); } /* @@ -598,11 +609,11 @@ SUBSECTION problem. They call a BFD error handler function. This function may be overridden by the program. - The BFD error handler acts like printf. + The BFD error handler acts like vprintf. CODE_FRAGMENT . -.typedef void (*bfd_error_handler_type) (const char *, ...); +.typedef void (*bfd_error_handler_type) (const char *, va_list); . */ @@ -610,115 +621,240 @@ CODE_FRAGMENT static const char *_bfd_error_program_name; -/* This is the default routine to handle BFD error messages. - Like fprintf (stderr, ...), but also handles some extra format specifiers. +/* Support for positional parameters. */ - %A section name from section. For group components, print group name too. - %B file name from bfd. For archive components, prints archive too. - - Note - because these two extra format specifiers require special handling - they are scanned for and processed in this function, before calling - vfprintf. This means that the *arguments* for these format specifiers - must be the first ones in the variable argument list, regardless of where - the specifiers appear in the format string. Thus for example calling - this function with a format string of: - - "blah %s blah %A blah %d blah %B" - - would involve passing the arguments as: - - "blah %s blah %A blah %d blah %B", - asection_for_the_%A, - bfd_for_the_%B, - string_for_the_%s, - integer_for_the_%d); - */ - -void -_bfd_default_error_handler (const char *fmt, ...) +union _bfd_doprnt_args { - va_list ap; - char *bufp; - const char *new_fmt, *p; - size_t avail = 1000; - char buf[1000]; + int i; + long l; + long long ll; + double d; + long double ld; + void *p; + enum + { + Bad, + Int, + Long, + LongLong, + Double, + LongDouble, + Ptr + } type; +}; - /* PR 4992: Don't interrupt output being sent to stdout. */ - fflush (stdout); +/* This macro and _bfd_doprnt taken from libiberty _doprnt.c, tidied a + little and extended to handle '%pA', '%pB' and positional parameters. */ - if (_bfd_error_program_name != NULL) - fprintf (stderr, "%s: ", _bfd_error_program_name); - else - fprintf (stderr, "BFD: "); - - va_start (ap, fmt); - new_fmt = fmt; - bufp = buf; +#define PRINT_TYPE(TYPE, FIELD) \ + do \ + { \ + TYPE value = (TYPE) args[arg_no].FIELD; \ + result = fprintf (stream, specifier, value); \ + } while (0) - /* Reserve enough space for the existing format string. */ - avail -= strlen (fmt) + 1; - if (avail > 1000) - _exit (EXIT_FAILURE); +static int +_bfd_doprnt (FILE *stream, const char *format, union _bfd_doprnt_args *args) +{ + const char *ptr = format; + char specifier[128]; + int total_printed = 0; + unsigned int arg_count = 0; - p = fmt; - while (1) + while (*ptr != '\0') { - char *q; - size_t len, extra, trim; + int result; - p = strchr (p, '%'); - if (p == NULL || p[1] == '\0') + if (*ptr != '%') + { + /* While we have regular characters, print them. */ + char *end = strchr (ptr, '%'); + if (end != NULL) + result = fprintf (stream, "%.*s", (int) (end - ptr), ptr); + else + result = fprintf (stream, "%s", ptr); + ptr += result; + } + else if (ptr[1] == '%') { - if (new_fmt == buf) + fputc ('%', stream); + result = 1; + ptr += 2; + } + else + { + /* We have a format specifier! */ + char *sptr = specifier; + int wide_width = 0, short_width = 0; + unsigned int arg_no; + + /* Copy the % and move forward. */ + *sptr++ = *ptr++; + + /* Check for a positional parameter. */ + arg_no = -1u; + if (*ptr != '0' && ISDIGIT (*ptr) && ptr[1] == '$') { - len = strlen (fmt); - memcpy (bufp, fmt, len + 1); + arg_no = *ptr - '1'; + ptr += 2; } - break; - } - if (p[1] == 'A' || p[1] == 'B') - { - len = p - fmt; - memcpy (bufp, fmt, len); - bufp += len; - fmt = p + 2; - new_fmt = buf; - - /* If we run out of space, tough, you lose your ridiculously - long file or section name. It's not safe to try to alloc - memory here; We might be printing an out of memory message. */ - if (avail == 0) + /* Move past flags. */ + while (strchr ("-+ #0'I", *ptr)) + *sptr++ = *ptr++; + + if (*ptr == '*') { - *bufp++ = '*'; - *bufp++ = '*'; - *bufp = '\0'; + int value; + unsigned int arg_index; + + ptr++; + arg_index = arg_count; + if (*ptr != '0' && ISDIGIT (*ptr) && ptr[1] == '$') + { + arg_index = *ptr - '1'; + ptr += 2; + } + value = abs (args[arg_index].i); + arg_count++; + sptr += sprintf (sptr, "%d", value); } else + /* Handle explicit numeric value. */ + while (ISDIGIT (*ptr)) + *sptr++ = *ptr++; + + /* Precision. */ + if (*ptr == '.') { - if (p[1] == 'B') + /* Copy and go past the period. */ + *sptr++ = *ptr++; + if (*ptr == '*') { - bfd *abfd = va_arg (ap, bfd *); + int value; + unsigned int arg_index; - if (abfd == NULL) - /* Invoking %B with a null bfd pointer is an internal error. */ - abort (); - else if (abfd->my_archive - && !bfd_is_thin_archive (abfd->my_archive)) - snprintf (bufp, avail, "%s(%s)", - abfd->my_archive->filename, abfd->filename); - else - snprintf (bufp, avail, "%s", abfd->filename); + ptr++; + arg_index = arg_count; + if (*ptr != '0' && ISDIGIT (*ptr) && ptr[1] == '$') + { + arg_index = *ptr - '1'; + ptr += 2; + } + value = abs (args[arg_index].i); + arg_count++; + sptr += sprintf (sptr, "%d", value); } else + /* Handle explicit numeric value. */ + while (ISDIGIT (*ptr)) + *sptr++ = *ptr++; + } + while (strchr ("hlL", *ptr)) + { + switch (*ptr) { - asection *sec = va_arg (ap, asection *); + case 'h': + short_width = 1; + break; + case 'l': + wide_width++; + break; + case 'L': + wide_width = 2; + break; + default: + abort(); + } + *sptr++ = *ptr++; + } + + /* Copy the type specifier, and NULL terminate. */ + *sptr++ = *ptr++; + *sptr = '\0'; + if ((int) arg_no < 0) + arg_no = arg_count; + + switch (ptr[-1]) + { + case 'd': + case 'i': + case 'o': + case 'u': + case 'x': + case 'X': + case 'c': + { + /* Short values are promoted to int, so just copy it + as an int and trust the C library printf to cast it + to the right width. */ + if (short_width) + PRINT_TYPE (int, i); + else + { + switch (wide_width) + { + case 0: + PRINT_TYPE (int, i); + break; + case 1: + PRINT_TYPE (long, l); + break; + case 2: + default: +#if defined (__MSVCRT__) + sptr[-3] = 'I'; + sptr[-2] = '6'; + sptr[-1] = '4'; + *sptr++ = ptr[-1]; + *sptr = '\0'; +#endif +#if defined (__GNUC__) || defined (HAVE_LONG_LONG) + PRINT_TYPE (long long, ll); +#else + /* Fake it and hope for the best. */ + PRINT_TYPE (long, l); +#endif + break; + } + } + } + break; + case 'f': + case 'e': + case 'E': + case 'g': + case 'G': + { + if (wide_width == 0) + PRINT_TYPE (double, d); + else + { +#if defined (__GNUC__) || defined (HAVE_LONG_DOUBLE) + PRINT_TYPE (long double, ld); +#else + /* Fake it and hope for the best. */ + PRINT_TYPE (double, d); +#endif + } + } + break; + case 's': + PRINT_TYPE (char *, p); + break; + case 'p': + if (*ptr == 'A') + { + asection *sec; bfd *abfd; const char *group = NULL; struct coff_comdat_info *ci; + ptr++; + sec = (asection *) args[arg_no].p; if (sec == NULL) - /* Invoking %A with a null section pointer is an internal error. */ + /* Invoking %pA with a null section pointer is an + internal error. */ abort (); abfd = sec->owner; if (abfd != NULL @@ -732,57 +868,272 @@ _bfd_default_error_handler (const char *fmt, ...) sec)) != NULL) group = ci->name; if (group != NULL) - snprintf (bufp, avail, "%s[%s]", sec->name, group); + result = fprintf (stream, "%s[%s]", sec->name, group); else - snprintf (bufp, avail, "%s", sec->name); + result = fprintf (stream, "%s", sec->name); } - len = strlen (bufp); - avail = avail - len + 2; - - /* We need to replace any '%' we printed by "%%". - First count how many. */ - q = bufp; - bufp += len; - extra = 0; - while ((q = strchr (q, '%')) != NULL) + else if (*ptr == 'B') { - ++q; - ++extra; + bfd *abfd; + + ptr++; + abfd = (bfd *) args[arg_no].p; + if (abfd == NULL) + /* Invoking %pB with a null bfd pointer is an + internal error. */ + abort (); + else if (abfd->my_archive + && !bfd_is_thin_archive (abfd->my_archive)) + result = fprintf (stream, "%s(%s)", + abfd->my_archive->filename, + abfd->filename); + else + result = fprintf (stream, "%s", abfd->filename); } + else + PRINT_TYPE (void *, p); + break; + default: + abort(); + } + arg_count++; + } + if (result == -1) + return -1; + total_printed += result; + } + + return total_printed; +} + +/* First pass over FORMAT to gather ARGS. Returns number of args. */ + +static unsigned int +_bfd_doprnt_scan (const char *format, union _bfd_doprnt_args *args) +{ + const char *ptr = format; + unsigned int arg_count = 0; + + while (*ptr != '\0') + { + if (*ptr != '%') + { + ptr = strchr (ptr, '%'); + if (ptr == NULL) + break; + } + else if (ptr[1] == '%') + ptr += 2; + else + { + int wide_width = 0, short_width = 0; + unsigned int arg_no; + int arg_type; + + ptr++; + + /* Check for a positional parameter. */ + arg_no = -1u; + if (*ptr != '0' && ISDIGIT (*ptr) && ptr[1] == '$') + { + arg_no = *ptr - '1'; + ptr += 2; + } + + /* Move past flags. */ + while (strchr ("-+ #0'I", *ptr)) + ptr++; + + if (*ptr == '*') + { + unsigned int arg_index; + + ptr++; + arg_index = arg_count; + if (*ptr != '0' && ISDIGIT (*ptr) && ptr[1] == '$') + { + arg_index = *ptr - '1'; + ptr += 2; + } + if (arg_index >= 9) + abort (); + args[arg_index].type = Int; + arg_count++; + } + else + /* Handle explicit numeric value. */ + while (ISDIGIT (*ptr)) + ptr++; - /* If there isn't room, trim off the end of the string. */ - q = bufp; - bufp += extra; - if (extra > avail) + /* Precision. */ + if (*ptr == '.') + { + ptr++; + if (*ptr == '*') { - trim = extra - avail; - bufp -= trim; - do + unsigned int arg_index; + + ptr++; + arg_index = arg_count; + if (*ptr != '0' && ISDIGIT (*ptr) && ptr[1] == '$') { - if (*--q == '%') - --extra; + arg_index = *ptr - '1'; + ptr += 2; } - while (--trim != 0); - *q = '\0'; - avail = extra; + if (arg_index >= 9) + abort (); + args[arg_index].type = Int; + arg_count++; } - avail -= extra; - - /* Now double all '%' chars, shuffling the string as we go. */ - while (extra != 0) + else + /* Handle explicit numeric value. */ + while (ISDIGIT (*ptr)) + ptr++; + } + while (strchr ("hlL", *ptr)) + { + switch (*ptr) { - while ((q[extra] = *q) != '%') - --q; - q[--extra] = '%'; - --q; + case 'h': + short_width = 1; + break; + case 'l': + wide_width++; + break; + case 'L': + wide_width = 2; + break; + default: + abort(); } + ptr++; + } + + ptr++; + if ((int) arg_no < 0) + arg_no = arg_count; + + arg_type = Bad; + switch (ptr[-1]) + { + case 'd': + case 'i': + case 'o': + case 'u': + case 'x': + case 'X': + case 'c': + { + if (short_width) + arg_type = Int; + else + { + switch (wide_width) + { + case 0: + arg_type = Int; + break; + case 1: + arg_type = Long; + break; + case 2: + default: +#if defined (__GNUC__) || defined (HAVE_LONG_LONG) + arg_type = LongLong; +#else + arg_type = Long; +#endif + break; + } + } + } + break; + case 'f': + case 'e': + case 'E': + case 'g': + case 'G': + { + if (wide_width == 0) + arg_type = Double; + else + { +#if defined (__GNUC__) || defined (HAVE_LONG_DOUBLE) + arg_type = LongDouble; +#else + arg_type = Double; +#endif + } + } + break; + case 's': + arg_type = Ptr; + break; + case 'p': + if (*ptr == 'A' || *ptr == 'B') + ptr++; + arg_type = Ptr; + break; + default: + abort(); } + + if (arg_no >= 9) + abort (); + args[arg_no].type = arg_type; + arg_count++; } - p = p + 2; } - vfprintf (stderr, new_fmt, ap); - va_end (ap); + return arg_count; +} + +static void +error_handler_internal (const char *fmt, va_list ap) +{ + unsigned int i, arg_count; + union _bfd_doprnt_args args[9]; + + for (i = 0; i < sizeof (args) / sizeof (args[0]); i++) + args[i].type = Bad; + + arg_count = _bfd_doprnt_scan (fmt, args); + for (i = 0; i < arg_count; i++) + { + switch (args[i].type) + { + case Int: + args[i].i = va_arg (ap, int); + break; + case Long: + args[i].l = va_arg (ap, long); + break; + case LongLong: + args[i].ll = va_arg (ap, long long); + break; + case Double: + args[i].d = va_arg (ap, double); + break; + case LongDouble: + args[i].ld = va_arg (ap, long double); + break; + case Ptr: + args[i].p = va_arg (ap, void *); + break; + default: + abort (); + } + } + + /* PR 4992: Don't interrupt output being sent to stdout. */ + fflush (stdout); + + if (_bfd_error_program_name != NULL) + fprintf (stderr, "%s: ", _bfd_error_program_name); + else + fprintf (stderr, "BFD: "); + + _bfd_doprnt (stderr, fmt, args); /* On AIX, putc is implemented as a macro that triggers a -Wunused-value warning, so use the fputc function to avoid it. */ @@ -796,7 +1147,37 @@ _bfd_default_error_handler (const char *fmt, ...) function pointer permits a program linked against BFD to intercept the messages and deal with them itself. */ -bfd_error_handler_type _bfd_error_handler = _bfd_default_error_handler; +static bfd_error_handler_type _bfd_error_internal = error_handler_internal; + +/* +FUNCTION + _bfd_error_handler + +SYNOPSIS + void _bfd_error_handler (const char *fmt, ...) ATTRIBUTE_PRINTF_1; + +DESCRIPTION + This is the default routine to handle BFD error messages. + Like fprintf (stderr, ...), but also handles some extra format + specifiers. + + %pA section name from section. For group components, prints + group name too. + %pB file name from bfd. For archive components, prints + archive too. + + Beware: Only supports a maximum of 9 format arguments. +*/ + +void +_bfd_error_handler (const char *fmt, ...) +{ + va_list ap; + + va_start (ap, fmt); + _bfd_error_internal (fmt, ap); + va_end (ap); +} /* FUNCTION @@ -815,8 +1196,8 @@ bfd_set_error_handler (bfd_error_handler_type pnew) { bfd_error_handler_type pold; - pold = _bfd_error_handler; - _bfd_error_handler = pnew; + pold = _bfd_error_internal; + _bfd_error_internal = pnew; return pold; } @@ -840,23 +1221,6 @@ bfd_set_error_program_name (const char *name) _bfd_error_program_name = name; } -/* -FUNCTION - bfd_get_error_handler - -SYNOPSIS - bfd_error_handler_type bfd_get_error_handler (void); - -DESCRIPTION - Return the BFD error handler function. -*/ - -bfd_error_handler_type -bfd_get_error_handler (void) -{ - return _bfd_error_handler; -} - /* SUBSECTION BFD assert handler @@ -872,9 +1236,9 @@ SUBSECTION CODE_FRAGMENT . .typedef void (*bfd_assert_handler_type) (const char *bfd_formatmsg, -. const char *bfd_version, -. const char *bfd_file, -. int bfd_line); +. const char *bfd_version, +. const char *bfd_file, +. int bfd_line); . */ @@ -891,14 +1255,14 @@ _bfd_default_assert_handler (const char *bfd_formatmsg, int bfd_line) { - (*_bfd_error_handler) (bfd_formatmsg, bfd_version, bfd_file, bfd_line); + _bfd_error_handler (bfd_formatmsg, bfd_version, bfd_file, bfd_line); } /* Similar to _bfd_error_handler, a program can decide to exit on an internal BFD error. We use a non-variadic type to simplify passing on parameters to other functions, e.g. _bfd_error_handler. */ -bfd_assert_handler_type _bfd_assert_handler = _bfd_default_assert_handler; +static bfd_assert_handler_type _bfd_assert_handler = _bfd_default_assert_handler; /* FUNCTION @@ -921,23 +1285,6 @@ bfd_set_assert_handler (bfd_assert_handler_type pnew) _bfd_assert_handler = pnew; return pold; } - -/* -FUNCTION - bfd_get_assert_handler - -SYNOPSIS - bfd_assert_handler_type bfd_get_assert_handler (void); - -DESCRIPTION - Return the BFD assert handler function. -*/ - -bfd_assert_handler_type -bfd_get_assert_handler (void) -{ - return _bfd_assert_handler; -} /* INODE @@ -1026,18 +1373,10 @@ DESCRIPTION section @var{sec} to the values @var{rel} and @var{count}. The argument @var{abfd} is ignored. +.#define bfd_set_reloc(abfd, asect, location, count) \ +. BFD_SEND (abfd, _bfd_set_reloc, (abfd, asect, location, count)) */ -void -bfd_set_reloc (bfd *ignore_abfd ATTRIBUTE_UNUSED, - sec_ptr asect, - arelent **location, - unsigned int count) -{ - asect->orelocation = location; - asect->reloc_count = count; -} - /* FUNCTION bfd_set_file_flags @@ -1086,6 +1425,7 @@ bfd_set_file_flags (bfd *abfd, flagword flags) void bfd_assert (const char *file, int line) { + /* xgettext:c-format */ (*_bfd_assert_handler) (_("BFD %s assertion fail %s:%d"), BFD_VERSION_STRING, file, line); } @@ -1097,14 +1437,16 @@ void _bfd_abort (const char *file, int line, const char *fn) { if (fn != NULL) - (*_bfd_error_handler) + _bfd_error_handler + /* xgettext:c-format */ (_("BFD %s internal error, aborting at %s:%d in %s\n"), BFD_VERSION_STRING, file, line, fn); else - (*_bfd_error_handler) + _bfd_error_handler + /* xgettext:c-format */ (_("BFD %s internal error, aborting at %s:%d\n"), BFD_VERSION_STRING, file, line); - (*_bfd_error_handler) (_("Please report this bug.\n")); + _bfd_error_handler (_("Please report this bug.\n")); _exit (EXIT_FAILURE); } @@ -1113,7 +1455,7 @@ FUNCTION bfd_get_arch_size SYNOPSIS - int bfd_get_arch_size (bfd *abfd); + int bfd_get_arch_size (bfd *abfd); DESCRIPTION Returns the normalized architecture address size, in bits, as @@ -1140,7 +1482,7 @@ FUNCTION bfd_get_sign_extend_vma SYNOPSIS - int bfd_get_sign_extend_vma (bfd *abfd); + int bfd_get_sign_extend_vma (bfd *abfd); DESCRIPTION Indicates if the target architecture "naturally" sign extends @@ -1178,7 +1520,8 @@ bfd_get_sign_extend_vma (bfd *abfd) || strcmp (name, "pei-x86-64") == 0 || strcmp (name, "pe-arm-wince-little") == 0 || strcmp (name, "pei-arm-wince-little") == 0 - || strcmp (name, "aixcoff-rs6000") == 0) + || strcmp (name, "aixcoff-rs6000") == 0 + || strcmp (name, "aix5coff64-rs6000") == 0) return 1; if (CONST_STRNEQ (name, "mach-o")) @@ -1193,7 +1536,7 @@ FUNCTION bfd_set_start_address SYNOPSIS - bfd_boolean bfd_set_start_address (bfd *abfd, bfd_vma vma); + bfd_boolean bfd_set_start_address (bfd *abfd, bfd_vma vma); DESCRIPTION Make @var{vma} the entry point of output BFD @var{abfd}. @@ -1330,7 +1673,7 @@ bfd_scan_vma (const char *string, const char **end, int base) if (sizeof (bfd_vma) <= sizeof (unsigned long)) return strtoul (string, (char **) end, base); -#ifdef HAVE_STRTOULL +#if defined (HAVE_STRTOULL) && defined (HAVE_LONG_LONG) if (sizeof (bfd_vma) <= sizeof (unsigned long long)) return strtoull (string, (char **) end, base); #endif @@ -1407,8 +1750,8 @@ DESCRIPTION Not enough memory exists to create private data for @var{obfd}. .#define bfd_copy_private_header_data(ibfd, obfd) \ -. BFD_SEND (obfd, _bfd_copy_private_header_data, \ -. (ibfd, obfd)) +. BFD_SEND (obfd, _bfd_copy_private_header_data, \ +. (ibfd, obfd)) */ @@ -1428,29 +1771,8 @@ DESCRIPTION Not enough memory exists to create private data for @var{obfd}. .#define bfd_copy_private_bfd_data(ibfd, obfd) \ -. BFD_SEND (obfd, _bfd_copy_private_bfd_data, \ -. (ibfd, obfd)) - -*/ - -/* -FUNCTION - bfd_merge_private_bfd_data - -SYNOPSIS - bfd_boolean bfd_merge_private_bfd_data (bfd *ibfd, bfd *obfd); - -DESCRIPTION - Merge private BFD information from the BFD @var{ibfd} to the - the output file BFD @var{obfd} when linking. Return <> - on success, <> on error. Possible error returns are: - - o <> - - Not enough memory exists to create private data for @var{obfd}. - -.#define bfd_merge_private_bfd_data(ibfd, obfd) \ -. BFD_SEND (obfd, _bfd_merge_private_bfd_data, \ -. (ibfd, obfd)) +. BFD_SEND (obfd, _bfd_copy_private_bfd_data, \ +. (ibfd, obfd)) */ @@ -1470,7 +1792,7 @@ DESCRIPTION Not enough memory exists to create private data for @var{obfd}. .#define bfd_set_private_flags(abfd, flags) \ -. BFD_SEND (abfd, _bfd_set_private_flags, (abfd, flags)) +. BFD_SEND (abfd, _bfd_set_private_flags, (abfd, flags)) */ @@ -1482,45 +1804,45 @@ DESCRIPTION The following functions exist but have not yet been documented. .#define bfd_sizeof_headers(abfd, info) \ -. BFD_SEND (abfd, _bfd_sizeof_headers, (abfd, info)) +. BFD_SEND (abfd, _bfd_sizeof_headers, (abfd, info)) . .#define bfd_find_nearest_line(abfd, sec, syms, off, file, func, line) \ -. BFD_SEND (abfd, _bfd_find_nearest_line, \ -. (abfd, syms, sec, off, file, func, line, NULL)) +. BFD_SEND (abfd, _bfd_find_nearest_line, \ +. (abfd, syms, sec, off, file, func, line, NULL)) . .#define bfd_find_nearest_line_discriminator(abfd, sec, syms, off, file, func, \ -. line, disc) \ -. BFD_SEND (abfd, _bfd_find_nearest_line, \ -. (abfd, syms, sec, off, file, func, line, disc)) +. line, disc) \ +. BFD_SEND (abfd, _bfd_find_nearest_line, \ +. (abfd, syms, sec, off, file, func, line, disc)) . .#define bfd_find_line(abfd, syms, sym, file, line) \ -. BFD_SEND (abfd, _bfd_find_line, \ -. (abfd, syms, sym, file, line)) +. BFD_SEND (abfd, _bfd_find_line, \ +. (abfd, syms, sym, file, line)) . .#define bfd_find_inliner_info(abfd, file, func, line) \ -. BFD_SEND (abfd, _bfd_find_inliner_info, \ -. (abfd, file, func, line)) +. BFD_SEND (abfd, _bfd_find_inliner_info, \ +. (abfd, file, func, line)) . .#define bfd_debug_info_start(abfd) \ -. BFD_SEND (abfd, _bfd_debug_info_start, (abfd)) +. BFD_SEND (abfd, _bfd_debug_info_start, (abfd)) . .#define bfd_debug_info_end(abfd) \ -. BFD_SEND (abfd, _bfd_debug_info_end, (abfd)) +. BFD_SEND (abfd, _bfd_debug_info_end, (abfd)) . .#define bfd_debug_info_accumulate(abfd, section) \ -. BFD_SEND (abfd, _bfd_debug_info_accumulate, (abfd, section)) +. BFD_SEND (abfd, _bfd_debug_info_accumulate, (abfd, section)) . .#define bfd_stat_arch_elt(abfd, stat) \ -. BFD_SEND (abfd, _bfd_stat_arch_elt,(abfd, stat)) +. BFD_SEND (abfd, _bfd_stat_arch_elt,(abfd, stat)) . .#define bfd_update_armap_timestamp(abfd) \ -. BFD_SEND (abfd, _bfd_update_armap_timestamp, (abfd)) +. BFD_SEND (abfd, _bfd_update_armap_timestamp, (abfd)) . .#define bfd_set_arch_mach(abfd, arch, mach)\ -. BFD_SEND ( abfd, _bfd_set_arch_mach, (abfd, arch, mach)) +. BFD_SEND ( abfd, _bfd_set_arch_mach, (abfd, arch, mach)) . .#define bfd_relax_section(abfd, section, link_info, again) \ -. BFD_SEND (abfd, _bfd_relax_section, (abfd, section, link_info, again)) +. BFD_SEND (abfd, _bfd_relax_section, (abfd, section, link_info, again)) . .#define bfd_gc_sections(abfd, link_info) \ . BFD_SEND (abfd, _bfd_gc_sections, (abfd, link_info)) @@ -1550,7 +1872,7 @@ DESCRIPTION . BFD_SEND (abfd, _bfd_final_link, (abfd, info)) . .#define bfd_free_cached_info(abfd) \ -. BFD_SEND (abfd, _bfd_free_cached_info, (abfd)) +. BFD_SEND (abfd, _bfd_free_cached_info, (abfd)) . .#define bfd_get_dynamic_symtab_upper_bound(abfd) \ . BFD_SEND (abfd, _bfd_get_dynamic_symtab_upper_bound, (abfd)) @@ -1752,7 +2074,7 @@ FUNCTION bfd_emul_get_maxpagesize SYNOPSIS - bfd_vma bfd_emul_get_maxpagesize (const char *); + bfd_vma bfd_emul_get_maxpagesize (const char *); DESCRIPTION Returns the maximum page size, in bytes, as determined by @@ -1798,7 +2120,7 @@ FUNCTION bfd_emul_set_maxpagesize SYNOPSIS - void bfd_emul_set_maxpagesize (const char *, bfd_vma); + void bfd_emul_set_maxpagesize (const char *, bfd_vma); DESCRIPTION For ELF, set the maximum page size for the emulation. It is @@ -1823,7 +2145,7 @@ FUNCTION bfd_emul_get_commonpagesize SYNOPSIS - bfd_vma bfd_emul_get_commonpagesize (const char *); + bfd_vma bfd_emul_get_commonpagesize (const char *, bfd_boolean); DESCRIPTION Returns the common page size, in bytes, as determined by @@ -1834,15 +2156,22 @@ RETURNS */ bfd_vma -bfd_emul_get_commonpagesize (const char *emul) +bfd_emul_get_commonpagesize (const char *emul, bfd_boolean relro) { const bfd_target *target; target = bfd_find_target (emul, NULL); if (target != NULL && target->flavour == bfd_target_elf_flavour) - return xvec_get_elf_backend_data (target)->commonpagesize; + { + const struct elf_backend_data *bed; + bed = xvec_get_elf_backend_data (target); + if (relro) + return bed->relropagesize; + else + return bed->commonpagesize; + } return 0; } @@ -1851,7 +2180,7 @@ FUNCTION bfd_emul_set_commonpagesize SYNOPSIS - void bfd_emul_set_commonpagesize (const char *, bfd_vma); + void bfd_emul_set_commonpagesize (const char *, bfd_vma); DESCRIPTION For ELF, set the common page size for the emulation. It is