Tidy pe flag in coff_data

Make it a bool, use obj_pe accessor everywhere.
This commit is contained in:
Alan Modra
2023-01-06 19:34:15 +10:30
parent 22a95e1a37
commit 10df41b188
11 changed files with 14 additions and 15 deletions

View File

@@ -953,7 +953,7 @@ arm_emit_base_file_entry (struct bfd_link_info *info,
+ input_section->output_offset + input_section->output_offset
+ input_section->output_section->vma); + input_section->output_section->vma);
if (coff_data (output_bfd)->pe) if (obj_pe (output_bfd))
addr -= pe_data (output_bfd)->pe_opthdr.ImageBase; addr -= pe_data (output_bfd)->pe_opthdr.ImageBase;
if (fwrite (&addr, sizeof (addr), 1, (FILE *) info->base_file) == 1) if (fwrite (&addr, sizeof (addr), 1, (FILE *) info->base_file) == 1)
return true; return true;

View File

@@ -220,7 +220,7 @@ mcore_emit_base_file_entry (struct bfd_link_info *info,
+ input_section->output_offset + input_section->output_offset
+ input_section->output_section->vma; + input_section->output_section->vma;
if (coff_data (output_bfd)->pe) if (obj_pe (output_bfd))
addr -= pe_data (output_bfd)->pe_opthdr.ImageBase; addr -= pe_data (output_bfd)->pe_opthdr.ImageBase;
if (fwrite (&addr, sizeof (addr), 1, (FILE *) info->base_file) == 1) if (fwrite (&addr, sizeof (addr), 1, (FILE *) info->base_file) == 1)

View File

@@ -1826,8 +1826,7 @@ coff_get_normalized_symtab (bfd *abfd)
/* Ordinary short filename, put into memory anyway. The /* Ordinary short filename, put into memory anyway. The
Microsoft PE tools sometimes store a filename in Microsoft PE tools sometimes store a filename in
multiple AUX entries. */ multiple AUX entries. */
if (internal_ptr->u.syment.n_numaux > 1 if (internal_ptr->u.syment.n_numaux > 1 && obj_pe (abfd))
&& coff_data (abfd)->pe)
internal_ptr->u.syment._n._n_n._n_offset = internal_ptr->u.syment._n._n_n._n_offset =
((uintptr_t) ((uintptr_t)
copy_name (abfd, copy_name (abfd,
@@ -1842,7 +1841,7 @@ coff_get_normalized_symtab (bfd *abfd)
} }
/* Normalize other strings available in C_FILE aux entries. */ /* Normalize other strings available in C_FILE aux entries. */
if (!coff_data (abfd)->pe) if (!obj_pe (abfd))
for (int numaux = 1; numaux < internal_ptr->u.syment.n_numaux; numaux++) for (int numaux = 1; numaux < internal_ptr->u.syment.n_numaux; numaux++)
{ {
aux = internal_ptr + numaux + 1; aux = internal_ptr + numaux + 1;

View File

@@ -1168,7 +1168,7 @@ _bfd_coff_final_link (bfd *abfd,
static char * static char *
dores_com (char *ptr, bfd *output_bfd, int heap) dores_com (char *ptr, bfd *output_bfd, int heap)
{ {
if (coff_data(output_bfd)->pe) if (obj_pe (output_bfd))
{ {
int val = strtoul (ptr, &ptr, 0); int val = strtoul (ptr, &ptr, 0);
@@ -1400,7 +1400,7 @@ _bfd_coff_link_input_bfd (struct coff_final_link_info *flaginfo, bfd *input_bfd)
output_index = syment_base; output_index = syment_base;
outsym = flaginfo->outsyms; outsym = flaginfo->outsyms;
if (coff_data (output_bfd)->pe if (obj_pe (output_bfd)
&& ! process_embedded_commands (output_bfd, flaginfo->info, input_bfd)) && ! process_embedded_commands (output_bfd, flaginfo->info, input_bfd))
return false; return false;
@@ -3057,7 +3057,7 @@ _bfd_coff_generic_relocate_section (bfd *output_bfd,
- input_section->vma - input_section->vma
+ input_section->output_offset + input_section->output_offset
+ input_section->output_section->vma); + input_section->output_section->vma);
if (coff_data (output_bfd)->pe) if (obj_pe (output_bfd))
addr -= pe_data(output_bfd)->pe_opthdr.ImageBase; addr -= pe_data(output_bfd)->pe_opthdr.ImageBase;
if (fwrite (&addr, 1, sizeof (bfd_vma), (FILE *) info->base_file) if (fwrite (&addr, 1, sizeof (bfd_vma), (FILE *) info->base_file)
!= sizeof (bfd_vma)) != sizeof (bfd_vma))

View File

@@ -426,7 +426,7 @@ coff_swap_aux_in (bfd *abfd,
#if FILNMLEN != E_FILNMLEN #if FILNMLEN != E_FILNMLEN
#error we need to cope with truncating or extending FILNMLEN #error we need to cope with truncating or extending FILNMLEN
#else #else
if (numaux > 1 && coff_data (abfd)->pe) if (numaux > 1 && obj_pe (abfd))
{ {
if (indx == 0) if (indx == 0)
memcpy (in->x_file.x_n.x_fname, ext->x_file.x_fname, memcpy (in->x_file.x_n.x_fname, ext->x_file.x_fname,

View File

@@ -101,7 +101,7 @@ typedef struct coff_tdata
bool go32; bool go32;
/* Is this a PE format coff file? */ /* Is this a PE format coff file? */
int pe; bool pe;
/* Copy of some of the f_flags bits in the COFF filehdr structure, /* Copy of some of the f_flags bits in the COFF filehdr structure,
used by ARM code. */ used by ARM code. */

View File

@@ -105,7 +105,7 @@ typedef struct coff_tdata
bool go32; bool go32;
/* Is this a PE format coff file? */ /* Is this a PE format coff file? */
int pe; bool pe;
/* Copy of some of the f_flags bits in the COFF filehdr structure, /* Copy of some of the f_flags bits in the COFF filehdr structure,
used by ARM code. */ used by ARM code. */

View File

@@ -1090,7 +1090,7 @@ pe_ILF_build_a_bfd (bfd * abfd,
if (bfd_coff_mkobject_hook (abfd, (void *) & internal_f, NULL) == NULL) if (bfd_coff_mkobject_hook (abfd, (void *) & internal_f, NULL) == NULL)
goto error_return; goto error_return;
coff_data (abfd)->pe = 1; obj_pe (abfd) = true;
#ifdef THUMBPEMAGIC #ifdef THUMBPEMAGIC
if (vars.magic == THUMBPEMAGIC) if (vars.magic == THUMBPEMAGIC)
/* Stop some linker warnings about thumb code not supporting interworking. */ /* Stop some linker warnings about thumb code not supporting interworking. */

View File

@@ -379,7 +379,7 @@ gld${EMULATION_NAME}_after_open (void)
/* Pass the wacky PE command line options into the output bfd. /* Pass the wacky PE command line options into the output bfd.
FIXME: This should be done via a function, rather than by FIXME: This should be done via a function, rather than by
including an internal BFD header. */ including an internal BFD header. */
if (!coff_data(link_info.output_bfd)->pe) if (!obj_pe (link_info.output_bfd))
{ {
einfo (_("%F%P: PE operations on non PE file\n")); einfo (_("%F%P: PE operations on non PE file\n"));
} }

View File

@@ -1515,7 +1515,7 @@ gld${EMULATION_NAME}_after_open (void)
if (bfd_get_flavour (link_info.output_bfd) != bfd_target_coff_flavour if (bfd_get_flavour (link_info.output_bfd) != bfd_target_coff_flavour
|| coff_data (link_info.output_bfd) == NULL || coff_data (link_info.output_bfd) == NULL
|| coff_data (link_info.output_bfd)->pe == 0) || !obj_pe (link_info.output_bfd))
einfo (_("%F%P: cannot perform PE operations on non PE output file '%pB'\n"), einfo (_("%F%P: cannot perform PE operations on non PE output file '%pB'\n"),
link_info.output_bfd); link_info.output_bfd);

View File

@@ -1519,7 +1519,7 @@ gld${EMULATION_NAME}_after_open (void)
if (bfd_get_flavour (link_info.output_bfd) != bfd_target_coff_flavour if (bfd_get_flavour (link_info.output_bfd) != bfd_target_coff_flavour
|| coff_data (link_info.output_bfd) == NULL || coff_data (link_info.output_bfd) == NULL
|| coff_data (link_info.output_bfd)->pe == 0) || !obj_pe (link_info.output_bfd))
einfo (_("%F%P: cannot perform PE operations on non PE output file '%pB'\n"), einfo (_("%F%P: cannot perform PE operations on non PE output file '%pB'\n"),
link_info.output_bfd); link_info.output_bfd);