diff options
| author | Gunther Nikl <gnikl@justmail.de> | 2020-06-03 15:24:58 +0100 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2020-06-03 15:24:58 +0100 |
| commit | 0bff75284e1067e22cbe88fad672362db06f22ee (patch) | |
| tree | c3374d8a516b9800ad84481903259460ed3aae07 /bfd/aoutx.h | |
| parent | d49e5065ed43ec88627fd8cc6ab9e45fcc0e538a (diff) | |
| download | gdb-0bff75284e1067e22cbe88fad672362db06f22ee.zip gdb-0bff75284e1067e22cbe88fad672362db06f22ee.tar.gz gdb-0bff75284e1067e22cbe88fad672362db06f22ee.tar.bz2 | |
This patch set for the generic BFD a.out backend removes a dead #define and makes aoutx.h self-contained: [PATCH 1/2]: bfd: remove unused NO_WRITE_HEADER_KLUDGE #define [PATCH 2/2]: bfd: make aoutx.h self-contained
* aout64.c (BMAGIC, QMAGIC): Do not define.
* aoutx.h (N_IS_BMAGIC, N_SET_QMAGIC): New defines.
(NAME (aout, some_aout_object_p)): Use N_IS_QMAGIC and N_IS_BMAGIC
to check the file format.
(adjust_z_magic): Use N_SET_QMAGIC to set file format.
* i386aout.c (NO_WRITE_HEADER_KLUDGE): Delete define.
* libaout.h (NO_WRITE_HEADER_KLUDGE): Do not define.
Diffstat (limited to 'bfd/aoutx.h')
| -rw-r--r-- | bfd/aoutx.h | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/bfd/aoutx.h b/bfd/aoutx.h index 08083c1..8fe2a62 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h @@ -128,6 +128,18 @@ DESCRIPTION #include "aout/stab_gnu.h" #include "aout/ar.h" +#ifdef BMAGIC +#define N_IS_BMAGIC(x) (N_MAGIC (x) == BMAGIC) +#else +#define N_IS_BMAGIC(x) (0) +#endif + +#ifdef QMAGIC +#define N_SET_QMAGIC(x) N_SET_MAGIC (x, QMAGIC) +#else +#define N_SET_QMAGIC(x) do { /**/ } while (0) +#endif + /* SUBSECTION Relocations @@ -492,7 +504,7 @@ NAME (aout, some_aout_object_p) (bfd *abfd, abfd->flags |= D_PAGED | WP_TEXT; adata (abfd).magic = z_magic; } - else if (N_MAGIC (execp) == QMAGIC) + else if (N_IS_QMAGIC (execp)) { abfd->flags |= D_PAGED | WP_TEXT; adata (abfd).magic = z_magic; @@ -503,8 +515,7 @@ NAME (aout, some_aout_object_p) (bfd *abfd, abfd->flags |= WP_TEXT; adata (abfd).magic = n_magic; } - else if (N_MAGIC (execp) == OMAGIC - || N_MAGIC (execp) == BMAGIC) + else if (N_MAGIC (execp) == OMAGIC || N_IS_BMAGIC (execp)) adata (abfd).magic = o_magic; else /* Should have been checked with N_BADMAG before this routine @@ -1026,7 +1037,7 @@ adjust_z_magic (bfd *abfd, struct internal_exec *execp) if (ztih && (!abdp || (abdp && !abdp->exec_header_not_counted))) execp->a_text += adata (abfd).exec_bytes_size; if (obj_aout_subformat (abfd) == q_magic_format) - N_SET_MAGIC (execp, QMAGIC); + N_SET_QMAGIC (execp); else N_SET_MAGIC (execp, ZMAGIC); |