From de64ce13a78669f094d6909fce51d210e2f9d2c0 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 21 Jan 2016 13:15:02 +1030 Subject: [PATCH] Rename elf-linux-psinfo.h to elf-linux-core.h Since it will sometime have more than just prpsinfo. Also, elf32-ppc.c needlessly includes this header. * elf-linux-core.h: Rename from elf-linux-psinfo.h. * elf.c: Adjust #include. * elf32-ppc.c: Don't #include elf-linux-psinfo.h * Makefile.am (SOURCE_HFILES): Update. * Makefile.in: Regenerate. * po/SRC-PORFILES.in: Regenerate. --- bfd/ChangeLog | 9 +++++++++ bfd/Makefile.am | 2 +- bfd/Makefile.in | 2 +- bfd/{elf-linux-psinfo.h => elf-linux-core.h} | 0 bfd/elf.c | 2 +- bfd/elf32-ppc.c | 1 - bfd/po/SRC-POTFILES.in | 2 +- 7 files changed, 13 insertions(+), 5 deletions(-) rename bfd/{elf-linux-psinfo.h => elf-linux-core.h} (100%) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 4523178c3d1..d06be409612 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,12 @@ +2016-01-21 Alan Modra + + * elf-linux-core.h: Rename from elf-linux-psinfo.h. + * elf.c: Adjust #include. + * elf32-ppc.c: Don't #include elf-linux-psinfo.h + * Makefile.am (SOURCE_HFILES): Update. + * Makefile.in: Regenerate. + * po/SRC-PORFILES.in: Regenerate. + 2016-01-21 Alan Modra * configure.ac: Move corefile selection later in file. Move diff --git a/bfd/Makefile.am b/bfd/Makefile.am index cb3a8564b08..db6f059aa2a 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -790,7 +790,7 @@ CFILES = $(SOURCE_CFILES) $(BUILD_CFILES) ## This is a list of all .h files which are in the source tree. SOURCE_HFILES = \ aout-target.h aoutf1.h aoutx.h coffcode.h coffswap.h ecoffswap.h \ - elf-bfd.h elf-hppa.h elf-linux-psinfo.h elf32-hppa.h \ + elf-bfd.h elf-hppa.h elf-linux-core.h elf32-hppa.h \ elf64-hppa.h elfcode.h elfcore.h \ freebsd.h genlink.h go32stub.h \ libaout.h libbfd.h libcoff.h libecoff.h libhppa.h libieee.h \ diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 6b90be7d42f..2a5de7cd293 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -1095,7 +1095,7 @@ BUILD_CFILES = \ CFILES = $(SOURCE_CFILES) $(BUILD_CFILES) SOURCE_HFILES = \ aout-target.h aoutf1.h aoutx.h coffcode.h coffswap.h ecoffswap.h \ - elf-bfd.h elf-hppa.h elf-linux-psinfo.h elf32-hppa.h \ + elf-bfd.h elf-hppa.h elf-linux-core.h elf32-hppa.h \ elf64-hppa.h elfcode.h elfcore.h \ freebsd.h genlink.h go32stub.h \ libaout.h libbfd.h libcoff.h libecoff.h libhppa.h libieee.h \ diff --git a/bfd/elf-linux-psinfo.h b/bfd/elf-linux-core.h similarity index 100% rename from bfd/elf-linux-psinfo.h rename to bfd/elf-linux-core.h diff --git a/bfd/elf.c b/bfd/elf.c index b2a50bff3e7..dba5a0f0002 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -42,7 +42,7 @@ SECTION #include "elf-bfd.h" #include "libiberty.h" #include "safe-ctype.h" -#include "elf-linux-psinfo.h" +#include "elf-linux-core.h" #ifdef CORE_HEADER #include CORE_HEADER diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c index 54cb5d4edc7..c2f2b700543 100644 --- a/bfd/elf32-ppc.c +++ b/bfd/elf32-ppc.c @@ -35,7 +35,6 @@ #include "elf32-ppc.h" #include "elf-vxworks.h" #include "dwarf2.h" -#include "elf-linux-psinfo.h" typedef enum split16_format_type { diff --git a/bfd/po/SRC-POTFILES.in b/bfd/po/SRC-POTFILES.in index 25375de26bf..f12ad705411 100644 --- a/bfd/po/SRC-POTFILES.in +++ b/bfd/po/SRC-POTFILES.in @@ -157,7 +157,7 @@ elf-bfd.h elf-eh-frame.c elf-hppa.h elf-ifunc.c -elf-linux-psinfo.h +elf-linux-core.h elf-m10200.c elf-m10300.c elf-nacl.c -- 2.30.2