/* Support for the generic parts of PE/PEI, for BFD.
- Copyright (C) 1995-2022 Free Software Foundation, Inc.
+ Copyright (C) 1995-2023 Free Software Foundation, Inc.
Written by Cygnus Solutions.
This file is part of BFD, the Binary File Descriptor library.
pe->dos_message[15] = 0x0;
memset (& pe->pe_opthdr, 0, sizeof pe->pe_opthdr);
+
+ bfd_coff_long_section_names (abfd)
+ = coff_backend_info (abfd)->_bfd_coff_long_section_names;
+
return true;
}
#ifdef COFF_IMAGE_WITH_PE
\f
-/* Code to handle Microsoft's Image Library Format.
+/* Code to handle Microsoft's Import Library Format.
Also known as LINK6 format.
Documentation about this format can be found at:
- http://msdn.microsoft.com/library/specs/pecoff_section8.htm */
+ https://learn.microsoft.com/en-us/windows/win32/debug/pe-format#import-library-format */
/* The following constants specify the sizes of the various data
structures that we have to create in order to build a bfd describing
#define SIZEOF_IDATA2 (5 * 4)
/* For PEx64 idata4 & 5 have thumb size of 8 bytes. */
-#ifdef COFF_WITH_pex64
+#if defined(COFF_WITH_pex64) || defined(COFF_WITH_peAArch64)
#define SIZEOF_IDATA4 (2 * 4)
#define SIZEOF_IDATA5 (2 * 4)
#else
abort ();
coff_section_data (vars->abfd, sec)->relocs = vars->int_reltab;
- coff_section_data (vars->abfd, sec)->keep_relocs = true;
sec->relocation = vars->reltab;
sec->reloc_count = vars->relcount;
esym = vars->esym_ptr;
/* Copy the symbol's name into the string table. */
- sprintf (vars->string_ptr, "%s%s", prefix, symbol_name);
+ int len = sprintf (vars->string_ptr, "%s%s", prefix, symbol_name);
if (section == NULL)
section = bfd_und_section_ptr;
vars->table_ptr ++;
vars->native_ptr ++;
vars->esym_ptr ++;
- vars->string_ptr += strlen (symbol_name) + strlen (prefix) + 1;
+ vars->string_ptr += len + 1;
BFD_ASSERT (vars->string_ptr < vars->end_string_ptr);
}
abort ();
}
+ /* Now create a symbol describing the imported value. */
+ switch (import_type)
+ {
+ case IMPORT_CODE:
+ pe_ILF_make_a_symbol (& vars, "", symbol_name, text,
+ BSF_NOT_AT_END | BSF_FUNCTION);
+
+ break;
+
+ case IMPORT_DATA:
+ /* Nothing to do here. */
+ break;
+
+ default:
+ /* XXX code not yet written. */
+ abort ();
+ }
+
+ /* Create an import symbol for the DLL, without the .dll suffix. */
+ ptr = (bfd_byte *) strrchr (source_dll, '.');
+ if (ptr)
+ * ptr = 0;
+ pe_ILF_make_a_symbol (& vars, "__IMPORT_DESCRIPTOR_", source_dll, NULL, 0);
+ if (ptr)
+ * ptr = '.';
+
/* Initialise the bfd. */
memset (& internal_f, 0, sizeof (internal_f));
if (bfd_coff_mkobject_hook (abfd, (void *) & internal_f, NULL) == NULL)
goto error_return;
- coff_data (abfd)->pe = 1;
+ obj_pe (abfd) = true;
#ifdef THUMBPEMAGIC
if (vars.magic == THUMBPEMAGIC)
/* Stop some linker warnings about thumb code not supporting interworking. */
bfd_cache_close (abfd);
abfd->iostream = (void *) vars.bim;
- abfd->flags |= BFD_IN_MEMORY /* | HAS_LOCALS */;
+ abfd->flags |= BFD_IN_MEMORY | HAS_SYMS;
abfd->iovec = &_bfd_memory_iovec;
abfd->where = 0;
abfd->origin = 0;
+ abfd->size = 0;
obj_sym_filepos (abfd) = 0;
- /* Now create a symbol describing the imported value. */
- switch (import_type)
- {
- case IMPORT_CODE:
- pe_ILF_make_a_symbol (& vars, "", symbol_name, text,
- BSF_NOT_AT_END | BSF_FUNCTION);
-
- break;
-
- case IMPORT_DATA:
- /* Nothing to do here. */
- break;
-
- default:
- /* XXX code not yet written. */
- abort ();
- }
-
- /* Create an import symbol for the DLL, without the .dll suffix. */
- ptr = (bfd_byte *) strrchr (source_dll, '.');
- if (ptr)
- * ptr = 0;
- pe_ILF_make_a_symbol (& vars, "__IMPORT_DESCRIPTOR_", source_dll, NULL, 0);
- if (ptr)
- * ptr = '.';
-
/* Point the bfd at the symbol table. */
obj_symbols (abfd) = vars.sym_cache;
abfd->symcount = vars.sym_index;
obj_conv_table_size (abfd) = vars.sym_index;
obj_coff_strings (abfd) = vars.string_table;
+ obj_coff_strings_len (abfd) = vars.string_ptr - vars.string_table;
obj_coff_keep_strings (abfd) = true;
- abfd->flags |= HAS_SYMS;
-
return true;
error_return:
return false;
}
-/* We have detected a Image Library Format archive element.
+/* Cleanup function, returned from check_format hook. */
+
+static void
+pe_ILF_cleanup (bfd *abfd)
+{
+ struct bfd_in_memory *bim = abfd->iostream;
+ free (bim->buffer);
+ free (bim);
+ abfd->iostream = NULL;
+}
+
+/* We have detected an Import Library Format archive element.
Decode the element and return the appropriate target. */
static bfd_cleanup
unsigned int magic;
/* Upon entry the first six bytes of the ILF header have
- already been read. Now read the rest of the header. */
+ already been read. Now read the rest of the header. */
if (bfd_bread (buffer, (bfd_size_type) 14, abfd) != 14)
return NULL;
return NULL;
}
- return _bfd_no_cleanup;
+ return pe_ILF_cleanup;
}
static void
bfd_coff_swap_aouthdr_in (abfd, opthdr, &internal_a);
struct internal_extra_pe_aouthdr *a = &internal_a.pe;
+
+#ifdef ARM
+ /* Use Subsystem to distinguish between pei-arm-little and
+ pei-arm-wince-little. */
+#ifdef WINCE
+ if (a->Subsystem != IMAGE_SUBSYSTEM_WINDOWS_CE_GUI)
+#else
+ if (a->Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CE_GUI)
+#endif
+ {
+ bfd_set_error (bfd_error_wrong_format);
+ return NULL;
+ }
+#endif
+
if ((a->SectionAlignment & -a->SectionAlignment) != a->SectionAlignment
|| a->SectionAlignment >= 0x80000000)
{
- const char **warn = _bfd_per_xvec_warn (abfd->xvec);
- *warn = _("%pB: adjusting invalid SectionAlignment");
+ _bfd_error_handler (_("%pB: adjusting invalid SectionAlignment"),
+ abfd);
a->SectionAlignment &= -a->SectionAlignment;
if (a->SectionAlignment >= 0x80000000)
a->SectionAlignment = 0x40000000;
if ((a->FileAlignment & -a->FileAlignment) != a->FileAlignment
|| a->FileAlignment > a->SectionAlignment)
{
- const char **warn = _bfd_per_xvec_warn (abfd->xvec);
- *warn = _("%pB: adjusting invalid FileAlignment");
+ _bfd_error_handler (_("%pB: adjusting invalid FileAlignment"),
+ abfd);
a->FileAlignment &= -a->FileAlignment;
if (a->FileAlignment > a->SectionAlignment)
a->FileAlignment = a->SectionAlignment;
}
if (a->NumberOfRvaAndSizes > IMAGE_NUMBEROF_DIRECTORY_ENTRIES)
- {
- const char **warn = _bfd_per_xvec_warn (abfd->xvec);
- *warn = _("%pB: invalid NumberOfRvaAndSizes");
- }
+ _bfd_error_handler (_("%pB: invalid NumberOfRvaAndSizes"), abfd);
}
result = coff_real_object_p (abfd, internal_f.f_nscns, &internal_f,
projects / binutils-gdb.git / blobdiff