From 1047201fd0f402428bb3331638a198413f97f476 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 7 Oct 2016 10:58:35 +1030 Subject: bfd_merge_private_bfd_data tidy bfd_merge_private_bfd_data and _bfd_generic_verify_endian_match are linker functions, so move them to linker.c. bfd/ * Makefile.am (LIBBFD_H_FILES): Update. * doc/Makefile.am (LIBBFD_H_DEP): Likewise. * cpu-sh.c (sh_merge_bfd_arch): Move to.. * elf32-sh.c: ..here, and make static. * elf32-arc.c (arc_elf_merge_private_bfd_data): Delete extraneous error. * elf32-cris.c (cris_elf_merge_private_bfd_data): Don't call _bfd_generic_verify_endian_match. * elf32-microblaze.c (microblaze_elf_merge_private_bfd_data): Delete. (bfd_elf32_bfd_merge_private_bfd_data): Define as _bfd_generic_verify_endian_match. * elf32-mt.c (mt_elf_merge_private_bfd_data): Don't test boolean == FALSE. * elf32-xgate.c (_bfd_xgate_elf_merge_private_bfd_data): Delete. (bfd_elf32_bfd_merge_private_bfd_data): Don't define. * elf32-xgate.h (_bfd_xgate_elf_merge_private_bfd_data): Delete. * libbfd-in.h (_bfd_generic_verify_endian_match): Delete. * libbfd.c (_bfd_generic_verify_endian_match): Move to.. * linker.c: ..here, and make internal. * bfd.c (bfd_merge_private_bfd_data): Move to.. * linker.c: ..here. * Makefile.in: Regenerate. * doc/Makefile.in: Regenerate. * bfd-in2.h: Regenerate. * libbfd.h: Regenerate. opcodes/ * sh-opc.h (sh_merge_bfd_arch): Delete prototype. --- bfd/doc/Makefile.am | 3 +-- bfd/doc/Makefile.in | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'bfd/doc') diff --git a/bfd/doc/Makefile.am b/bfd/doc/Makefile.am index c44c803..1ec5856 100644 --- a/bfd/doc/Makefile.am +++ b/bfd/doc/Makefile.am @@ -252,14 +252,13 @@ linker.stamp: $(srcdir)/../linker.c $(srcdir)/doc.str $(MKDOC) LIBBFD_H_DEP = \ $(srcdir)/../libbfd-in.h \ - $(srcdir)/../init.c \ $(srcdir)/../libbfd.c \ $(srcdir)/../bfdio.c \ $(srcdir)/../bfdwin.c \ $(srcdir)/../cache.c \ $(srcdir)/../reloc.c \ $(srcdir)/../archures.c \ - $(srcdir)/../elf.c \ + $(srcdir)/../linker.c \ $(srcdir)/header.sed \ $(srcdir)/proto.str \ $(MKDOC) diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in index b992872..1a6d811 100644 --- a/bfd/doc/Makefile.in +++ b/bfd/doc/Makefile.in @@ -379,14 +379,13 @@ AM_CPPFLAGS = -I.. -I$(srcdir)/.. -I$(srcdir)/../../include \ LIBBFD_H_DEP = \ $(srcdir)/../libbfd-in.h \ - $(srcdir)/../init.c \ $(srcdir)/../libbfd.c \ $(srcdir)/../bfdio.c \ $(srcdir)/../bfdwin.c \ $(srcdir)/../cache.c \ $(srcdir)/../reloc.c \ $(srcdir)/../archures.c \ - $(srcdir)/../elf.c \ + $(srcdir)/../linker.c \ $(srcdir)/header.sed \ $(srcdir)/proto.str \ $(MKDOC) -- cgit v1.1