From fab2b376e305bfb4c55a51a15d8c7a293628d735 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Mon, 1 Feb 2021 11:28:09 +0000 Subject: [PATCH] sim/rx: add some missing includes In load.c there's some GCC warnings about undefined functions (bfd_get_elf_phdr_upper_bound and bfd_get_elf_phdrs). To get the declarations of these functions include 'elf-bfd.h'. This headers also pulls in other elf related headers, like 'elf/internal.h' and 'elf/common.h', so these no longer need to be explicitly included from load.c. In trace.c and include for trace.h is missing, again this results in GCC warnings for missing function declarations. sim/rx/ChangeLog: * load.c: Replace 'elf/internal.h' and 'elf/common.h' includes with 'elf-bfd.h' include. * trace.c: Add 'trace.h' include. --- sim/rx/ChangeLog | 6 ++++++ sim/rx/load.c | 3 +-- sim/rx/trace.c | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog index c67b8d5fe77..d71bb44c800 100644 --- a/sim/rx/ChangeLog +++ b/sim/rx/ChangeLog @@ -1,3 +1,9 @@ +2021-02-08 Andrew Burgess + + * load.c: Replace 'elf/internal.h' and 'elf/common.h' includes + with 'elf-bfd.h' include. + * trace.c: Add 'trace.h' include. + 2021-02-08 Andrew Burgess * reg.c (trace_register_changes): Use PRIx64 in printf format diff --git a/sim/rx/load.c b/sim/rx/load.c index d74f4ff3872..a8a473346c6 100644 --- a/sim/rx/load.c +++ b/sim/rx/load.c @@ -28,8 +28,7 @@ along with this program. If not, see . */ #include "cpu.h" #include "mem.h" #include "load.h" -#include "elf/internal.h" -#include "elf/common.h" +#include "elf-bfd.h" /* Helper function for invoking a GDB-specified printf. */ static void diff --git a/sim/rx/trace.c b/sim/rx/trace.c index 9d9f2dfd98d..e5db49b5ca9 100644 --- a/sim/rx/trace.c +++ b/sim/rx/trace.c @@ -34,6 +34,7 @@ along with this program. If not, see . */ #include "cpu.h" #include "mem.h" #include "load.h" +#include "trace.h" static int sim_dis_read (bfd_vma memaddr, bfd_byte * ptr, unsigned int length, -- 2.30.2