X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fbfd.c;h=a3c522cbf8eee615477cde2902a1eebbdadc80f3;hb=8aaaf7577f070c91086533d959ac36a15d1d604f;hp=23a435043a01533ae3fb902bf5e98a0ff2bb4734;hpb=c08bb8dd9bd9fd101018b287726187d7ed6a0035;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/bfd.c b/bfd/bfd.c index 23a435043a..a3c522cbf8 100644 --- a/bfd/bfd.c +++ b/bfd/bfd.c @@ -1,5 +1,5 @@ /* Generic BFD library interface and support routines. - Copyright (C) 1990-2017 Free Software Foundation, Inc. + Copyright (C) 1990-2019 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. *} @@ -91,7 +92,7 @@ CODE_FRAGMENT . ENUM_BITFIELD (bfd_direction) direction : 2; . . {* Format_specific flags. *} -. flagword flags : 20; +. flagword flags; . . {* Values that may appear in the flags field of a BFD. These also . appear in the object_flags field of the bfd_target structure, where @@ -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,23 +161,26 @@ 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 +. +. {* Put pathnames into archives (non-POSIX). *} +.#define BFD_ARCHIVE_FULL_PATH 0x100000 . . {* Flags bits to be saved in bfd_preserve_save. *} .#define BFD_FLAGS_SAVED \ @@ -219,6 +223,9 @@ CODE_FRAGMENT . {* Set if this is a thin archive. *} . unsigned int is_thin_archive : 1; . +. {* Set if this archive should not cache element positions. *} +. unsigned int no_element_cache : 1; +. . {* Set if only required symbols should be added in the link hash table for . this object. Used by VMS linkers. *} . unsigned int selective_search : 1; @@ -235,6 +242,9 @@ CODE_FRAGMENT . {* Set if this is a plugin output file. *} . unsigned int lto_output : 1; . +. {* Set if this is a slim LTO object not loaded with a compiler plugin. *} +. unsigned int lto_slim_object : 1; +. . {* Set to dummy BFD created when claimed by a compiler plug-in . library. *} . bfd *plugin_dummy_bfd; @@ -290,7 +300,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. *} @@ -304,21 +314,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; @@ -354,6 +358,78 @@ CODE_FRAGMENT . const struct bfd_build_id *build_id; .}; . +.static inline const char * +.bfd_get_filename (const bfd *abfd) +.{ +. return abfd->filename; +.} +. +.static inline bfd_boolean +.bfd_get_cacheable (const bfd *abfd) +.{ +. return abfd->cacheable; +.} +. +.static inline enum bfd_format +.bfd_get_format (const bfd *abfd) +.{ +. return abfd->format; +.} +. +.static inline flagword +.bfd_get_file_flags (const bfd *abfd) +.{ +. return abfd->flags; +.} +. +.static inline bfd_vma +.bfd_get_start_address (const bfd *abfd) +.{ +. return abfd->start_address; +.} +. +.static inline unsigned int +.bfd_get_symcount (const bfd *abfd) +.{ +. return abfd->symcount; +.} +. +.static inline unsigned int +.bfd_get_dynamic_symcount (const bfd *abfd) +.{ +. return abfd->dynsymcount; +.} +. +.static inline struct bfd_symbol ** +.bfd_get_outsymbols (const bfd *abfd) +.{ +. return abfd->outsymbols; +.} +. +.static inline unsigned int +.bfd_count_sections (const bfd *abfd) +.{ +. return abfd->section_count; +.} +. +.static inline bfd_boolean +.bfd_has_map (const bfd *abfd) +.{ +. return abfd->has_armap; +.} +. +.static inline bfd_boolean +.bfd_is_thin_archive (const bfd *abfd) +.{ +. return abfd->is_thin_archive; +.} +. +.static inline void * +.bfd_usrdata (const bfd *abfd) +.{ +. return abfd->usrdata; +.} +. .{* See note beside bfd_set_section_userdata. *} .static inline bfd_boolean .bfd_set_cacheable (bfd * abfd, bfd_boolean val) @@ -362,6 +438,148 @@ CODE_FRAGMENT . return TRUE; .} . +.static inline void +.bfd_set_thin_archive (bfd *abfd, bfd_boolean val) +.{ +. abfd->is_thin_archive = val; +.} +. +.static inline void +.bfd_set_usrdata (bfd *abfd, void *val) +.{ +. abfd->usrdata = val; +.} +. +.static inline asection * +.bfd_asymbol_section (const asymbol *sy) +.{ +. return sy->section; +.} +. +.static inline bfd_vma +.bfd_asymbol_value (const asymbol *sy) +.{ +. return sy->section->vma + sy->value; +.} +. +.static inline const char * +.bfd_asymbol_name (const asymbol *sy) +.{ +. return sy->name; +.} +. +.static inline struct bfd * +.bfd_asymbol_bfd (const asymbol *sy) +.{ +. return sy->the_bfd; +.} +. +.static inline void +.bfd_set_asymbol_name (asymbol *sy, const char *name) +.{ +. sy->name = name; +.} +. +.static inline bfd_size_type +.bfd_get_section_limit_octets (const bfd *abfd, const asection *sec) +.{ +. if (abfd->direction != write_direction && sec->rawsize != 0) +. return sec->rawsize; +. return sec->size; +.} +. +.{* Find the address one past the end of SEC. *} +.static inline bfd_size_type +.bfd_get_section_limit (const bfd *abfd, const asection *sec) +.{ +. return (bfd_get_section_limit_octets (abfd, sec) +. / bfd_octets_per_byte (abfd, sec)); +.} +. +.{* Functions to handle insertion and deletion of a bfd's sections. These +. only handle the list pointers, ie. do not adjust section_count, +. target_index etc. *} +.static inline void +.bfd_section_list_remove (bfd *abfd, asection *s) +.{ +. asection *next = s->next; +. asection *prev = s->prev; +. if (prev) +. prev->next = next; +. else +. abfd->sections = next; +. if (next) +. next->prev = prev; +. else +. abfd->section_last = prev; +.} +. +.static inline void +.bfd_section_list_append (bfd *abfd, asection *s) +.{ +. s->next = 0; +. if (abfd->section_last) +. { +. s->prev = abfd->section_last; +. abfd->section_last->next = s; +. } +. else +. { +. s->prev = 0; +. abfd->sections = s; +. } +. abfd->section_last = s; +.} +. +.static inline void +.bfd_section_list_prepend (bfd *abfd, asection *s) +.{ +. s->prev = 0; +. if (abfd->sections) +. { +. s->next = abfd->sections; +. abfd->sections->prev = s; +. } +. else +. { +. s->next = 0; +. abfd->section_last = s; +. } +. abfd->sections = s; +.} +. +.static inline void +.bfd_section_list_insert_after (bfd *abfd, asection *a, asection *s) +.{ +. asection *next = a->next; +. s->next = next; +. s->prev = a; +. a->next = s; +. if (next) +. next->prev = s; +. else +. abfd->section_last = s; +.} +. +.static inline void +.bfd_section_list_insert_before (bfd *abfd, asection *b, asection *s) +.{ +. asection *prev = b->prev; +. s->prev = prev; +. s->next = b; +. b->prev = s; +. if (prev) +. prev->next = s; +. else +. abfd->sections = s; +.} +. +.static inline bfd_boolean +.bfd_section_removed_from_list (const bfd *abfd, const asection *s) +.{ +. return s->next ? s->next->prev != s : abfd->section_last != s; +.} +. */ #include "sysdep.h" @@ -402,7 +620,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 @@ -438,6 +656,7 @@ CODE_FRAGMENT . bfd_error_bad_value, . bfd_error_file_truncated, . bfd_error_file_too_big, +. bfd_error_sorry, . bfd_error_on_input, . bfd_error_invalid_error_code .} @@ -451,28 +670,29 @@ 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_("sorry, cannot handle this file"), + N_("error reading %s: %s"), + N_("#") }; /* @@ -497,32 +717,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 (); } /* @@ -611,22 +846,45 @@ CODE_FRAGMENT static const char *_bfd_error_program_name; -/* This macro and _doprnt taken from libiberty _doprnt.c, tidied a - little and extended to handle '%A' and '%B'. */ +/* Support for positional parameters. */ + +union _bfd_doprnt_args +{ + int i; + long l; + long long ll; + double d; + long double ld; + void *p; + enum + { + Bad, + Int, + Long, + LongLong, + Double, + LongDouble, + Ptr + } type; +}; + +/* This macro and _bfd_doprnt taken from libiberty _doprnt.c, tidied a + little and extended to handle '%pA', '%pB' and positional parameters. */ -#define PRINT_TYPE(TYPE) \ +#define PRINT_TYPE(TYPE, FIELD) \ do \ { \ - TYPE value = va_arg (ap, TYPE); \ + TYPE value = (TYPE) args[arg_no].FIELD; \ result = fprintf (stream, specifier, value); \ } while (0) static int -_doprnt (FILE *stream, const char *format, va_list ap) +_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; while (*ptr != '\0') { @@ -642,39 +900,75 @@ _doprnt (FILE *stream, const char *format, va_list ap) result = fprintf (stream, "%s", ptr); ptr += result; } + else if (ptr[1] == '%') + { + 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] == '$') + { + arg_no = *ptr - '1'; + ptr += 2; + } + /* Move past flags. */ - while (strchr ("-+ #0", *ptr)) + while (strchr ("-+ #0'I", *ptr)) *sptr++ = *ptr++; if (*ptr == '*') { - int value = abs (va_arg (ap, int)); - sptr += sprintf (sptr, "%d", value); + 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 == '.') { /* Copy and go past the period. */ *sptr++ = *ptr++; if (*ptr == '*') { - int value = abs (va_arg (ap, int)); - sptr += sprintf (sptr, "%d", value); + 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. */ @@ -703,6 +997,8 @@ _doprnt (FILE *stream, const char *format, va_list ap) /* Copy the type specifier, and NULL terminate. */ *sptr++ = *ptr++; *sptr = '\0'; + if ((int) arg_no < 0) + arg_no = arg_count; switch (ptr[-1]) { @@ -718,24 +1014,31 @@ _doprnt (FILE *stream, const char *format, va_list ap) as an int and trust the C library printf to cast it to the right width. */ if (short_width) - PRINT_TYPE (int); + PRINT_TYPE (int, i); else { switch (wide_width) { case 0: - PRINT_TYPE (int); + PRINT_TYPE (int, i); break; case 1: - PRINT_TYPE (long); + PRINT_TYPE (long, l); break; case 2: default: -#if defined(__GNUC__) || defined(HAVE_LONG_LONG) - PRINT_TYPE (long long); +#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); + PRINT_TYPE (long, l); #endif break; } @@ -749,93 +1052,304 @@ _doprnt (FILE *stream, const char *format, va_list ap) case 'G': { if (wide_width == 0) - PRINT_TYPE (double); + PRINT_TYPE (double, d); else { -#if defined(__GNUC__) || defined(HAVE_LONG_DOUBLE) - PRINT_TYPE (long double); +#if defined (__GNUC__) || defined (HAVE_LONG_DOUBLE) + PRINT_TYPE (long double, ld); #else /* Fake it and hope for the best. */ - PRINT_TYPE (double); + PRINT_TYPE (double, d); #endif } } break; case 's': - PRINT_TYPE (char *); + PRINT_TYPE (char *, p); break; case 'p': - PRINT_TYPE (void *); - break; - case '%': - fputc ('%', stream); - result = 1; + 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 %pA with a null section pointer is an + internal error. */ + abort (); + abfd = sec->owner; + if (abfd != NULL + && bfd_get_flavour (abfd) == bfd_target_elf_flavour + && elf_next_in_group (sec) != NULL + && (sec->flags & SEC_GROUP) == 0) + group = elf_group_name (sec); + else if (abfd != NULL + && bfd_get_flavour (abfd) == bfd_target_coff_flavour + && (ci = bfd_coff_get_comdat_section (sec->owner, + sec)) != NULL) + group = ci->name; + if (group != NULL) + result = fprintf (stream, "%s[%s]", sec->name, group); + else + result = fprintf (stream, "%s", sec->name); + } + else if (*ptr == 'B') + { + 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; - case 'A': + 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++; + + /* Precision. */ + if (*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++; + } + while (strchr ("hlL", *ptr)) + { + switch (*ptr) + { + 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': { - asection *sec = va_arg (ap, asection *); - bfd *abfd; - const char *group = NULL; - struct coff_comdat_info *ci; - - if (sec == NULL) - /* Invoking %A with a null section pointer is an - internal error. */ - abort (); - abfd = sec->owner; - if (abfd != NULL - && bfd_get_flavour (abfd) == bfd_target_elf_flavour - && elf_next_in_group (sec) != NULL - && (sec->flags & SEC_GROUP) == 0) - group = elf_group_name (sec); - else if (abfd != NULL - && bfd_get_flavour (abfd) == bfd_target_coff_flavour - && (ci = bfd_coff_get_comdat_section (sec->owner, - sec)) != NULL) - group = ci->name; - if (group != NULL) - result = fprintf (stream, "%s[%s]", sec->name, group); + if (short_width) + arg_type = Int; else - result = fprintf (stream, "%s", sec->name); + { + 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 'B': + case 'f': + case 'e': + case 'E': + case 'g': + case 'G': { - bfd *abfd = va_arg (ap, bfd *); - - 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)) - result = fprintf (stream, "%s(%s)", - abfd->my_archive->filename, abfd->filename); + if (wide_width == 0) + arg_type = Double; else - result = fprintf (stream, "%s", abfd->filename); + { +#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++; } - if (result == -1) - return -1; - total_printed += result; } - return total_printed; + return arg_count; } -/* This is the default routine to handle BFD error messages. - Like fprintf (stderr, ...), but also handles some extra format specifiers. - - %A section name from section. For group components, print group name too. - %B file name from bfd. For archive components, prints archive too. */ - 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); @@ -844,7 +1358,7 @@ error_handler_internal (const char *fmt, va_list ap) else fprintf (stderr, "BFD: "); - _doprnt (stderr, fmt, ap); + _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. */ @@ -860,6 +1374,26 @@ error_handler_internal (const char *fmt, va_list ap) 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, ...) { @@ -927,9 +1461,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); . */ @@ -1064,18 +1598,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 @@ -1111,7 +1637,7 @@ bfd_set_file_flags (bfd *abfd, flagword flags) return FALSE; } - bfd_get_file_flags (abfd) = flags; + abfd->flags = flags; if ((flags & bfd_applicable_file_flags (abfd)) != flags) { bfd_set_error (bfd_error_invalid_operation); @@ -1154,7 +1680,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 @@ -1181,7 +1707,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 @@ -1200,7 +1726,7 @@ RETURNS int bfd_get_sign_extend_vma (bfd *abfd) { - char *name; + const char *name; if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) return get_elf_backend_data (abfd)->sign_extend_vma; @@ -1219,7 +1745,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")) @@ -1234,7 +1761,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}. @@ -1371,7 +1898,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 @@ -1448,8 +1975,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)) */ @@ -1469,8 +1996,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)) +. BFD_SEND (obfd, _bfd_copy_private_bfd_data, \ +. (ibfd, obfd)) */ @@ -1490,7 +2017,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)) */ @@ -1502,45 +2029,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)) @@ -1554,6 +2081,9 @@ DESCRIPTION .#define bfd_is_group_section(abfd, sec) \ . BFD_SEND (abfd, _bfd_is_group_section, (abfd, sec)) . +.#define bfd_group_name(abfd, sec) \ +. BFD_SEND (abfd, _bfd_group_name, (abfd, sec)) +. .#define bfd_discard_group(abfd, sec) \ . BFD_SEND (abfd, _bfd_discard_group, (abfd, sec)) . @@ -1570,7 +2100,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)) @@ -1772,7 +2302,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 @@ -1818,7 +2348,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 @@ -1843,7 +2373,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 @@ -1854,15 +2384,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; } @@ -1871,7 +2408,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 @@ -2023,6 +2560,8 @@ bfd_update_compression_header (bfd *abfd, bfd_byte *contents, bfd_put_32 (abfd, sec->size, &echdr->ch_size); bfd_put_32 (abfd, 1 << sec->alignment_power, &echdr->ch_addralign); + /* bfd_log2 (alignof (Elf32_Chdr)) */ + bfd_set_section_alignment (sec, 2); } else { @@ -2033,6 +2572,8 @@ bfd_update_compression_header (bfd *abfd, bfd_byte *contents, bfd_put_64 (abfd, sec->size, &echdr->ch_size); bfd_put_64 (abfd, 1 << sec->alignment_power, &echdr->ch_addralign); + /* bfd_log2 (alignof (Elf64_Chdr)) */ + bfd_set_section_alignment (sec, 3); } } else @@ -2045,6 +2586,8 @@ bfd_update_compression_header (bfd *abfd, bfd_byte *contents, order. */ memcpy (contents, "ZLIB", 4); bfd_putb64 (sec->size, contents + 4); + /* No way to keep the original alignment, just use 1 always. */ + bfd_set_section_alignment (sec, 0); } } } @@ -2059,12 +2602,14 @@ bfd_update_compression_header (bfd *abfd, bfd_byte *contents, SYNOPSIS bfd_boolean bfd_check_compression_header (bfd *abfd, bfd_byte *contents, asection *sec, - bfd_size_type *uncompressed_size); + bfd_size_type *uncompressed_size, + unsigned int *uncompressed_alignment_power); DESCRIPTION Check the compression header at CONTENTS of SEC in ABFD and - store the uncompressed size in UNCOMPRESSED_SIZE if the - compression header is valid. + store the uncompressed size in UNCOMPRESSED_SIZE and the + uncompressed data alignment in UNCOMPRESSED_ALIGNMENT_POWER + if the compression header is valid. RETURNS Return TRUE if the compression header is valid. @@ -2073,7 +2618,8 @@ RETURNS bfd_boolean bfd_check_compression_header (bfd *abfd, bfd_byte *contents, asection *sec, - bfd_size_type *uncompressed_size) + bfd_size_type *uncompressed_size, + unsigned int *uncompressed_alignment_power) { if (bfd_get_flavour (abfd) == bfd_target_elf_flavour && (elf_section_flags (sec) & SHF_COMPRESSED) != 0) @@ -2095,9 +2641,10 @@ bfd_check_compression_header (bfd *abfd, bfd_byte *contents, chdr.ch_addralign = bfd_get_64 (abfd, &echdr->ch_addralign); } if (chdr.ch_type == ELFCOMPRESS_ZLIB - && chdr.ch_addralign == 1U << sec->alignment_power) + && chdr.ch_addralign == (chdr.ch_addralign & -chdr.ch_addralign)) { *uncompressed_size = chdr.ch_size; + *uncompressed_alignment_power = bfd_log2 (chdr.ch_addralign); return TRUE; } } @@ -2160,10 +2707,6 @@ bfd_convert_section_size (bfd *ibfd, sec_ptr isec, bfd *obfd, { bfd_size_type hdr_size; - /* Do nothing if input file will be decompressed. */ - if ((ibfd->flags & BFD_DECOMPRESS)) - return size; - /* Do nothing if either input or output aren't ELF. */ if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour || bfd_get_flavour (obfd) != bfd_target_elf_flavour) @@ -2174,6 +2717,14 @@ bfd_convert_section_size (bfd *ibfd, sec_ptr isec, bfd *obfd, == get_elf_backend_data (obfd)->s->elfclass) return size; + /* Convert GNU property size. */ + if (CONST_STRNEQ (isec->name, NOTE_GNU_PROPERTY_SECTION_NAME)) + return _bfd_elf_convert_gnu_property_size (ibfd, obfd); + + /* Do nothing if input file will be decompressed. */ + if ((ibfd->flags & BFD_DECOMPRESS)) + return size; + /* Do nothing if the input section isn't a SHF_COMPRESSED section. */ hdr_size = bfd_get_compression_header_size (ibfd, isec); if (hdr_size == 0) @@ -2214,10 +2765,6 @@ bfd_convert_section_contents (bfd *ibfd, sec_ptr isec, bfd *obfd, Elf_Internal_Chdr chdr; bfd_boolean use_memmove; - /* Do nothing if input file will be decompressed. */ - if ((ibfd->flags & BFD_DECOMPRESS)) - return TRUE; - /* Do nothing if either input or output aren't ELF. */ if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour || bfd_get_flavour (obfd) != bfd_target_elf_flavour) @@ -2228,6 +2775,15 @@ bfd_convert_section_contents (bfd *ibfd, sec_ptr isec, bfd *obfd, == get_elf_backend_data (obfd)->s->elfclass) return TRUE; + /* Convert GNU properties. */ + if (CONST_STRNEQ (isec->name, NOTE_GNU_PROPERTY_SECTION_NAME)) + return _bfd_elf_convert_gnu_properties (ibfd, isec, obfd, ptr, + ptr_size); + + /* Do nothing if input file will be decompressed. */ + if ((ibfd->flags & BFD_DECOMPRESS)) + return TRUE; + /* Do nothing if the input section isn't a SHF_COMPRESSED section. */ ihdr_size = bfd_get_compression_header_size (ibfd, isec); if (ihdr_size == 0) @@ -2260,7 +2816,7 @@ bfd_convert_section_contents (bfd *ibfd, sec_ptr isec, bfd *obfd, use_memmove = TRUE; } - size = bfd_get_section_size (isec) - ihdr_size + ohdr_size; + size = bfd_section_size (isec) - ihdr_size + ohdr_size; if (!use_memmove) { contents = (bfd_byte *) bfd_malloc (size);