aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorGunther Nikl <gnikl@justmail.de>2020-06-03 15:24:58 +0100
committerNick Clifton <nickc@redhat.com>2020-06-03 15:24:58 +0100
commit0bff75284e1067e22cbe88fad672362db06f22ee (patch)
treec3374d8a516b9800ad84481903259460ed3aae07 /bfd
parentd49e5065ed43ec88627fd8cc6ab9e45fcc0e538a (diff)
downloadgdb-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')
-rw-r--r--bfd/ChangeLog10
-rw-r--r--bfd/aout64.c8
-rw-r--r--bfd/aoutx.h19
-rw-r--r--bfd/i386aout.c1
-rw-r--r--bfd/libaout.h3
5 files changed, 25 insertions, 16 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index d215113..436eb5a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,13 @@
+2020-06-03 Gunther Nikl <gnikl@justmail.de>
+
+ * 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.
+
2020-06-03 H.J. Lu <hongjiu.lu@intel.com>
* elf-bfd.h (_bfd_elf_maybe_set_textrel): New
diff --git a/bfd/aout64.c b/bfd/aout64.c
index 5b43a14..73e3cc7 100644
--- a/bfd/aout64.c
+++ b/bfd/aout64.c
@@ -21,12 +21,4 @@
#define ARCH_SIZE 64
-/* aoutx.h requires definitions for BMAGIC and QMAGIC. */
-#ifndef BMAGIC
-#define BMAGIC 0
-#endif
-#ifndef QMAGIC
-#define QMAGIC 0
-#endif
-
#include "aoutx.h"
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);
diff --git a/bfd/i386aout.c b/bfd/i386aout.c
index 694301b..61e0306 100644
--- a/bfd/i386aout.c
+++ b/bfd/i386aout.c
@@ -38,7 +38,6 @@
the tokens. */
#define MY(OP) CONCAT2 (i386_aout_,OP)
#define TARGETNAME "a.out-i386"
-#define NO_WRITE_HEADER_KLUDGE 1
#include "sysdep.h"
#include "bfd.h"
diff --git a/bfd/libaout.h b/bfd/libaout.h
index 61746db..8e62072 100644
--- a/bfd/libaout.h
+++ b/bfd/libaout.h
@@ -609,9 +609,6 @@ extern bfd_boolean NAME (aout, bfd_free_cached_info)
#define aout_32_get_section_contents _bfd_generic_get_section_contents
#define aout_64_get_section_contents _bfd_generic_get_section_contents
-#ifndef NO_WRITE_HEADER_KLUDGE
-#define NO_WRITE_HEADER_KLUDGE 0
-#endif
#ifndef aout_32_bfd_is_local_label_name
#define aout_32_bfd_is_local_label_name bfd_generic_is_local_label_name