riscv
/
binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Remove PEI_HEADERS define 

I noticed a few files double-included libcoff.h, and digging deeper I
found that the PEI_HEADERS define is a sort of external include guard.

This patch adds include guards to the few files in include/coff that
were missing one, and then removes the PEI_HEADERS workaround and the
redundant includes.

I didn't see anything in these files that indicated that
double-inclusion would be useful, so it seems to me that this approach
is ok.

Tested by rebuilding with --enable-targets=all.

2023-08-02  Tom Tromey  <tromey@adacore.com>

	* pei-x86_64.c (PEI_HEADERS): Do not define.
	* pei-loongarch64.c (PEI_HEADERS): Do not define.
	* pei-aarch64.c (PEI_HEADERS): Do not define.
	* pe-x86_64.c (PEI_HEADERS): Do not define.
	* pe-aarch64.c (PEI_HEADERS): Do not define.
	* libpei.h (_LIBPEI_H): Add include guard.
	* coff-x86_64.c (PEI_HEADERS): Do not check.
	* coff-loongarch64.c (PEI_HEADERS): Do not check.
	* coff-aarch64.c (PEI_HEADERS): Do not check.

include/ChangeLog
2023-08-02  Tom Tromey  <tromey@adacore.com>

	* coff/x86_64.h (COFF_X86_64_H): Add include guard.
	* coff/loongarch64.h (COFF_LOONGARCH64_H): Add include guard.
	* coff/aarch64.h (COFF_AARCH64_H): Add include guard.
gdb-14-branch
Tom Tromey 3 years ago
committed by Tom Tromey
parent
f8c4789c7f
commit
f559e52a8e
14 changed files with 36 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      bfd/ChangeLog
  2. 7
      bfd/coff-aarch64.c
  3. 7
      bfd/coff-loongarch64.c
  4. 5
      bfd/coff-x86_64.c
  5. 3
      bfd/libpei.h
  6. 1
      bfd/pe-aarch64.c
  7. 1
      bfd/pe-x86_64.c
  8. 1
      bfd/pei-aarch64.c
  9. 1
      bfd/pei-loongarch64.c
  10. 4
      bfd/pei-x86_64.c
  11. 6
      include/ChangeLog
  12. 5
      include/coff/aarch64.h
  13. 5
      include/coff/loongarch64.h
  14. 5
      include/coff/x86_64.h

12
bfd/ChangeLog
View File

@ -1,3 +1,15 @@
2023-08-02 Tom Tromey <tromey@adacore.com>
* pei-x86_64.c (PEI_HEADERS): Do not define.
* pei-loongarch64.c (PEI_HEADERS): Do not define.
* pei-aarch64.c (PEI_HEADERS): Do not define.
* pe-x86_64.c (PEI_HEADERS): Do not define.
* pe-aarch64.c (PEI_HEADERS): Do not define.
* libpei.h (_LIBPEI_H): Add include guard.
* coff-x86_64.c (PEI_HEADERS): Do not check.
* coff-loongarch64.c (PEI_HEADERS): Do not check.
* coff-aarch64.c (PEI_HEADERS): Do not check.
2023-07-24 Johannes Schauer Marin Rodrigues <josch@debian.org>
* peXXigen.c (_bfd_XXi_only_swap_filehdr_out): If inserting a

7
bfd/coff-aarch64.c
View File

@ -23,10 +23,6 @@
#define COFF_WITH_peAArch64
#endif
/* Note we have to make sure not to include headers twice.
Not all headers are wrapped in #ifdef guards, so we define
PEI_HEADERS to prevent double including here. */
#ifndef PEI_HEADERS
#include "sysdep.h"
#include "bfd.h"
#include "libbfd.h"
@ -35,9 +31,6 @@
#include "coff/pe.h"
#include "libcoff.h"
#include "libiberty.h"
#endif
#include "libcoff.h"
/* For these howto special functions,
output_bfd == NULL => final link, or objdump -W and other calls to

7
bfd/coff-loongarch64.c
View File

@ -23,10 +23,6 @@
#define COFF_WITH_peLoongArch64
#endif
/* Note we have to make sure not to include headers twice.
Not all headers are wrapped in #ifdef guards, so we define
PEI_HEADERS to prevent double including here. */
#ifndef PEI_HEADERS
#include "sysdep.h"
#include "bfd.h"
#include "libbfd.h"
@ -35,9 +31,6 @@
#include "coff/pe.h"
#include "libcoff.h"
#include "libiberty.h"
#endif
#include "libcoff.h"
/* The page size is a guess based on ELF. */

5
bfd/coff-x86_64.c
View File

@ -20,10 +20,6 @@
Written by Kai Tietz, OneVision Software GmbH&CoKg. */
/* Note we have to make sure not to include headers twice.
Not all headers are wrapped in #ifdef guards, so we define
PEI_HEADERS to prevent double including here. */
#ifndef PEI_HEADERS
#include "sysdep.h"
#include "bfd.h"
#include "libbfd.h"
@ -31,7 +27,6 @@
#include "coff/internal.h"
#include "libcoff.h"
#include "libiberty.h"
#endif
#define BADMAG(x) AMD64BADMAG(x)

3
bfd/libpei.h
View File

@ -19,6 +19,8 @@
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
MA 02110-1301, USA. */
#ifndef _LIBPEI_H
#define _LIBPEI_H
/* Most of this hacked by Steve Chamberlain,
sac@cygnus.com
@ -445,3 +447,4 @@ bool _bfd_peAArch64_print_ce_compressed_pdata (bfd *, void *);
bool _bfd_peLoongArch64_print_ce_compressed_pdata (bfd *, void *);
bool _bfd_pep_print_ce_compressed_pdata (bfd *, void *);
#endif /* _LIBPEI_H */

1
bfd/pe-aarch64.c
View File

@ -55,7 +55,6 @@
{ COFF_SECTION_NAME_PARTIAL_MATCH (".gnu.linkonce.wi."), \
COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }
#define PEI_HEADERS
#include "sysdep.h"
#include "bfd.h"
#include "libbfd.h"

1
bfd/pe-x86_64.c
View File

@ -20,7 +20,6 @@
Written by Kai Tietz, OneVision Software GmbH&CoKg. */
#define PEI_HEADERS
#include "sysdep.h"
#include "bfd.h"
#include "libbfd.h"

1
bfd/pei-aarch64.c
View File

@ -56,7 +56,6 @@
{ COFF_SECTION_NAME_PARTIAL_MATCH (".gnu.linkonce.wi."), \
COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }
#define PEI_HEADERS
#include "sysdep.h"
#include "bfd.h"
#include "libbfd.h"

1
bfd/pei-loongarch64.c
View File

@ -56,7 +56,6 @@
{ COFF_SECTION_NAME_PARTIAL_MATCH (".gnu.linkonce.wi."), \
COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }
#define PEI_HEADERS
#include "sysdep.h"
#include "bfd.h"
#include "libbfd.h"

4
bfd/pei-x86_64.c
View File

@ -58,10 +58,6 @@
{ COFF_SECTION_NAME_PARTIAL_MATCH (".gnu.linkonce.wi."), \
COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }
/* Note we have to make sure not to include headers twice.
Not all headers are wrapped in #ifdef guards, so we define
PEI_HEADERS to prevent double including in coff-x86_64.c */
#define PEI_HEADERS
#include "sysdep.h"
#include "bfd.h"
#include "libbfd.h"

6
include/ChangeLog
View File

@ -1,3 +1,9 @@
2023-08-02 Tom Tromey <tromey@adacore.com>
* coff/x86_64.h (COFF_X86_64_H): Add include guard.
* coff/loongarch64.h (COFF_LOONGARCH64_H): Add include guard.
* coff/aarch64.h (COFF_AARCH64_H): Add include guard.
2023-07-30 Jose E. Marchesi <jose.marchesi@oracle.com>
* elf/bpf.h (EF_BPF_CPUVER): Define.

5
include/coff/aarch64.h
View File

@ -17,6 +17,9 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef COFF_AARCH64_H
#define COFF_AARCH64_H
#define COFFAARCH64 1
#define L_LNNO_SIZE 2
@ -82,3 +85,5 @@ struct external_reloc
#define IMAGE_REL_ARM64_REL32 0x0011 /* The 32-bit relative address from the byte following the relocation. */
#define ARM_NOTE_SECTION ".note"
#endif /* COFF_AARCH64_H */

5
include/coff/loongarch64.h
View File

@ -17,6 +17,9 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef COFF_LOONGARCH64_H
#define COFF_LOONGARCH64_H
#define COFFLOONGARCH64 1
#define L_LNNO_SIZE 2
@ -59,3 +62,5 @@ struct external_reloc
#define RELOC struct external_reloc
#define RELSZ 14
#endif /* COFF_LOONGARCH64_H */

5
include/coff/x86_64.h
View File

@ -20,6 +20,9 @@
Written by Kai Tietz, OneVision Software GmbH&CoKg. */
#ifndef COFF_X86_64_H
#define COFF_X86_64_H
#define L_LNNO_SIZE 2
#define INCLUDE_COMDAT_FIELDS_IN_AUXENT
@ -105,3 +108,5 @@ struct external_reloc
#define R_PCRBYTE 18
#define R_PCRWORD 19
#define R_PCRLONG 20
#endif /* COFF_X86_64_H */

Write Preview
Loading…
Cancel
Save