From 72a80a16c635aeea4fc0e13364de95cc9b265170 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 2 Feb 2009 03:52:38 +0000 Subject: * elf-bfd.h (bfd_elf_get_str_section): Don't declare. (bfd_elf_find_section, _sh_elf_set_mach_from_flags): Likewise. * elf.c (bfd_elf_get_str_section): Make static. (bfd_elf_find_section): Delete. * libbfd.h: Regenerate. --- bfd/ChangeLog | 8 ++++++++ bfd/elf-bfd.h | 9 --------- bfd/elf.c | 44 +++----------------------------------------- bfd/libbfd.h | 2 -- 4 files changed, 11 insertions(+), 52 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index c1f8a9b..a409367 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2009-02-02 Alan Modra + + * elf-bfd.h (bfd_elf_get_str_section): Don't declare. + (bfd_elf_find_section, _sh_elf_set_mach_from_flags): Likewise. + * elf.c (bfd_elf_get_str_section): Make static. + (bfd_elf_find_section): Delete. + * libbfd.h: Regenerate. + 2009-02-01 Jan Kratochvil * elf-eh-frame.c (REQUIRE_CLEARED_RELOCS) Remove. diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h index c1cc63e..7b8fa69 100644 --- a/bfd/elf-bfd.h +++ b/bfd/elf-bfd.h @@ -1626,8 +1626,6 @@ extern unsigned int _bfd_elf_section_from_bfd_section (bfd *, asection *); extern char *bfd_elf_string_from_elf_section (bfd *, unsigned, unsigned); -extern char *bfd_elf_get_str_section - (bfd *, unsigned); extern Elf_Internal_Sym *bfd_elf_get_elf_syms (bfd *, Elf_Internal_Shdr *, size_t, size_t, Elf_Internal_Sym *, void *, Elf_External_Sym_Shndx *); @@ -1671,8 +1669,6 @@ extern bfd_boolean bfd_elf_make_generic_object (bfd *); extern bfd_boolean bfd_elf_mkcorefile (bfd *); -extern Elf_Internal_Shdr *bfd_elf_find_section - (bfd *, char *); extern bfd_boolean _bfd_elf_make_section_from_shdr (bfd *, Elf_Internal_Shdr *, const char *, int); extern bfd_boolean _bfd_elf_make_section_from_phdr @@ -2143,11 +2139,6 @@ extern bfd_boolean _bfd_elf_merge_object_attributes (bfd *, bfd *); /* Large common section. */ extern asection _bfd_elf_large_com_section; -/* SH ELF specific routine. */ - -extern bfd_boolean _sh_elf_set_mach_from_flags - (bfd *); - /* This is the condition under which finish_dynamic_symbol will be called. If our finish_dynamic_symbol isn't called, we'll need to do something about initializing any .plt and .got entries in relocate_section. */ diff --git a/bfd/elf.c b/bfd/elf.c index 0009ee8..44af469 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -1,7 +1,8 @@ /* ELF executable support for BFD. Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -258,7 +259,7 @@ bfd_elf_mkcorefile (bfd *abfd) return bfd_elf_make_generic_object (abfd); } -char * +static char * bfd_elf_get_str_section (bfd *abfd, unsigned int shindex) { Elf_Internal_Shdr **i_shdrp; @@ -1019,45 +1020,6 @@ _bfd_elf_make_section_from_shdr (bfd *abfd, return TRUE; } -/* -INTERNAL_FUNCTION - bfd_elf_find_section - -SYNOPSIS - struct elf_internal_shdr *bfd_elf_find_section (bfd *abfd, char *name); - -DESCRIPTION - Helper functions for GDB to locate the string tables. - Since BFD hides string tables from callers, GDB needs to use an - internal hook to find them. Sun's .stabstr, in particular, - isn't even pointed to by the .stab section, so ordinary - mechanisms wouldn't work to find it, even if we had some. -*/ - -struct elf_internal_shdr * -bfd_elf_find_section (bfd *abfd, char *name) -{ - Elf_Internal_Shdr **i_shdrp; - char *shstrtab; - unsigned int max; - unsigned int i; - - i_shdrp = elf_elfsections (abfd); - if (i_shdrp != NULL) - { - shstrtab = bfd_elf_get_str_section (abfd, - elf_elfheader (abfd)->e_shstrndx); - if (shstrtab != NULL) - { - max = elf_numsections (abfd); - for (i = 1; i < max; i++) - if (!strcmp (&shstrtab[i_shdrp[i]->sh_name], name)) - return i_shdrp[i]; - } - } - return 0; -} - const char *const bfd_elf_section_type_names[] = { "SHT_NULL", "SHT_PROGBITS", "SHT_SYMTAB", "SHT_STRTAB", "SHT_RELA", "SHT_HASH", "SHT_DYNAMIC", "SHT_NOTE", diff --git a/bfd/libbfd.h b/bfd/libbfd.h index efd13f5..d5ace9e 100644 --- a/bfd/libbfd.h +++ b/bfd/libbfd.h @@ -2075,5 +2075,3 @@ bfd_boolean bfd_default_scan (const struct bfd_arch_info *info, const char *string); /* Extracted from elf.c. */ -struct elf_internal_shdr *bfd_elf_find_section (bfd *abfd, char *name); - -- cgit v1.1