MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
* 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.
This commit is contained in:
Gunther Nikl 2020-06-03 15:24:58 +01:00 committed by Nick Clifton
parent d49e5065ed
commit 0bff75284e
5 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bfd/ChangeLog
View File

@ -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

8
bfd/aout64.c
View File

@ -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"

19
bfd/aoutx.h
View File

@ -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);

1
bfd/i386aout.c
View File

@ -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"

3
bfd/libaout.h
View File

@ -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