From: Alan Modra <amodra@gmail.com>
To: binutils@sourceware.org
Subject: Tidy pe flag in coff_data
Date: Fri, 6 Jan 2023 21:14:02 +1030 [thread overview]
Message-ID: <Y7f7chtgwRfAVNME@squeak.grove.modra.org> (raw)
Make it a bool, use obj_pe accessor everywhere.
diff --git a/bfd/coff-arm.c b/bfd/coff-arm.c
index c0b2b04b26a..694ae8daa08 100644
--- a/bfd/coff-arm.c
+++ b/bfd/coff-arm.c
@@ -953,7 +953,7 @@ arm_emit_base_file_entry (struct bfd_link_info *info,
+ input_section->output_offset
+ input_section->output_section->vma);
- if (coff_data (output_bfd)->pe)
+ if (obj_pe (output_bfd))
addr -= pe_data (output_bfd)->pe_opthdr.ImageBase;
if (fwrite (&addr, sizeof (addr), 1, (FILE *) info->base_file) == 1)
return true;
diff --git a/bfd/coff-mcore.c b/bfd/coff-mcore.c
index 561333d596b..e360d5efe14 100644
--- a/bfd/coff-mcore.c
+++ b/bfd/coff-mcore.c
@@ -220,7 +220,7 @@ mcore_emit_base_file_entry (struct bfd_link_info *info,
+ input_section->output_offset
+ input_section->output_section->vma;
- if (coff_data (output_bfd)->pe)
+ if (obj_pe (output_bfd))
addr -= pe_data (output_bfd)->pe_opthdr.ImageBase;
if (fwrite (&addr, sizeof (addr), 1, (FILE *) info->base_file) == 1)
diff --git a/bfd/coffgen.c b/bfd/coffgen.c
index 74636a9e305..f21cf2ca523 100644
--- a/bfd/coffgen.c
+++ b/bfd/coffgen.c
@@ -1826,8 +1826,7 @@ coff_get_normalized_symtab (bfd *abfd)
/* Ordinary short filename, put into memory anyway. The
Microsoft PE tools sometimes store a filename in
multiple AUX entries. */
- if (internal_ptr->u.syment.n_numaux > 1
- && coff_data (abfd)->pe)
+ if (internal_ptr->u.syment.n_numaux > 1 && obj_pe (abfd))
internal_ptr->u.syment._n._n_n._n_offset =
((uintptr_t)
copy_name (abfd,
@@ -1842,7 +1841,7 @@ coff_get_normalized_symtab (bfd *abfd)
}
/* 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++)
{
aux = internal_ptr + numaux + 1;
diff --git a/bfd/cofflink.c b/bfd/cofflink.c
index d6ccae4ffe2..07226882e0d 100644
--- a/bfd/cofflink.c
+++ b/bfd/cofflink.c
@@ -1168,7 +1168,7 @@ _bfd_coff_final_link (bfd *abfd,
static char *
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);
@@ -1400,7 +1400,7 @@ _bfd_coff_link_input_bfd (struct coff_final_link_info *flaginfo, bfd *input_bfd)
output_index = syment_base;
outsym = flaginfo->outsyms;
- if (coff_data (output_bfd)->pe
+ if (obj_pe (output_bfd)
&& ! process_embedded_commands (output_bfd, flaginfo->info, input_bfd))
return false;
@@ -3057,7 +3057,7 @@ _bfd_coff_generic_relocate_section (bfd *output_bfd,
- input_section->vma
+ input_section->output_offset
+ input_section->output_section->vma);
- if (coff_data (output_bfd)->pe)
+ if (obj_pe (output_bfd))
addr -= pe_data(output_bfd)->pe_opthdr.ImageBase;
if (fwrite (&addr, 1, sizeof (bfd_vma), (FILE *) info->base_file)
!= sizeof (bfd_vma))
diff --git a/bfd/coffswap.h b/bfd/coffswap.h
index e809deaf0ef..03f52bd0486 100644
--- a/bfd/coffswap.h
+++ b/bfd/coffswap.h
@@ -426,7 +426,7 @@ coff_swap_aux_in (bfd *abfd,
#if FILNMLEN != E_FILNMLEN
#error we need to cope with truncating or extending FILNMLEN
#else
- if (numaux > 1 && coff_data (abfd)->pe)
+ if (numaux > 1 && obj_pe (abfd))
{
if (indx == 0)
memcpy (in->x_file.x_n.x_fname, ext->x_file.x_fname,
diff --git a/bfd/libcoff-in.h b/bfd/libcoff-in.h
index d27e5d4394f..a0d286d37f4 100644
--- a/bfd/libcoff-in.h
+++ b/bfd/libcoff-in.h
@@ -101,7 +101,7 @@ typedef struct coff_tdata
bool go32;
/* Is this a PE format coff file? */
- int pe;
+ bool pe;
/* Copy of some of the f_flags bits in the COFF filehdr structure,
used by ARM code. */
diff --git a/bfd/libcoff.h b/bfd/libcoff.h
index f03330fcfa0..c2c1f4add3a 100644
--- a/bfd/libcoff.h
+++ b/bfd/libcoff.h
@@ -105,7 +105,7 @@ typedef struct coff_tdata
bool go32;
/* Is this a PE format coff file? */
- int pe;
+ bool pe;
/* Copy of some of the f_flags bits in the COFF filehdr structure,
used by ARM code. */
diff --git a/bfd/peicode.h b/bfd/peicode.h
index cc5a54e1843..06642c3db5a 100644
--- a/bfd/peicode.h
+++ b/bfd/peicode.h
@@ -1090,7 +1090,7 @@ pe_ILF_build_a_bfd (bfd * abfd,
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. */
diff --git a/ld/emultempl/beos.em b/ld/emultempl/beos.em
index 1f3b67b6372..521d92797ec 100644
--- a/ld/emultempl/beos.em
+++ b/ld/emultempl/beos.em
@@ -379,7 +379,7 @@ gld${EMULATION_NAME}_after_open (void)
/* Pass the wacky PE command line options into the output bfd.
FIXME: This should be done via a function, rather than by
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"));
}
diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em
index d201a97dac1..bce1d1b9052 100644
--- a/ld/emultempl/pe.em
+++ b/ld/emultempl/pe.em
@@ -1515,7 +1515,7 @@ gld${EMULATION_NAME}_after_open (void)
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)->pe == 0)
+ || !obj_pe (link_info.output_bfd))
einfo (_("%F%P: cannot perform PE operations on non PE output file '%pB'\n"),
link_info.output_bfd);
diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em
index d61cab86d75..69b1c3ec79b 100644
--- a/ld/emultempl/pep.em
+++ b/ld/emultempl/pep.em
@@ -1519,7 +1519,7 @@ gld${EMULATION_NAME}_after_open (void)
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)->pe == 0)
+ || !obj_pe (link_info.output_bfd))
einfo (_("%F%P: cannot perform PE operations on non PE output file '%pB'\n"),
link_info.output_bfd);
--
Alan Modra
Australia Development Lab, IBM
reply other threads:[~2023-01-06 10:44 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y7f7chtgwRfAVNME@squeak.grove.modra.org \
--to=amodra@gmail.com \
--cc=binutils@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).