Remove PEI_HEADERS define
authorTom Tromey <tom@tromey.com>
Sun, 30 Jul 2023 16:26:07 +0000 (10:26 -0600)
committerTom Tromey <tromey@adacore.com>
Thu, 3 Aug 2023 13:39:15 +0000 (07:39 -0600)
commitf559e52a8e79585e0b13156e949a7fd46060a714
tree9ccc07385f1c6e11b233b4b711f8cbd37ddf8d45
parentf8c4789c7f4efa3726ec39256b9860e4df9f8177
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.
14 files changed:
bfd/ChangeLog
bfd/coff-aarch64.c
bfd/coff-loongarch64.c
bfd/coff-x86_64.c
bfd/libpei.h
bfd/pe-aarch64.c
bfd/pe-x86_64.c
bfd/pei-aarch64.c
bfd/pei-loongarch64.c
bfd/pei-x86_64.c
include/ChangeLog
include/coff/aarch64.h
include/coff/loongarch64.h
include/coff/x86_64.h