along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
/* Problems and other issues to resolve.
(1) BFD expects there to be some fixed number of "sections" in
section header table is missing, then gdb should probably try
to make do with the program header table. (FIXME)
+ (2) The code in this file is compiled twice, once in 32-bit mode and
+ once in 64-bit mode. More of it should be made size-independent
+ and moved into elf.c.
+
*/
+#include <assert.h>
#include <string.h> /* For strrchr and friends */
#include "bfd.h"
#include "sysdep.h"
#include "libbfd.h"
#include "libelf.h"
+#ifndef alloca
+PTR alloca ();
+#endif
+
+/* Renaming structures, typedefs, macros and functions to be size-specific. */
#define Elf_External_Ehdr NAME(Elf,External_Ehdr)
-#define Elf_Internal_Ehdr NAME(Elf,Internal_Ehdr)
#define Elf_External_Sym NAME(Elf,External_Sym)
-#define Elf_Internal_Sym NAME(Elf,Internal_Sym)
#define Elf_External_Shdr NAME(Elf,External_Shdr)
-#define Elf_Internal_Shdr NAME(Elf,Internal_Shdr)
#define Elf_External_Phdr NAME(Elf,External_Phdr)
-#define Elf_Internal_Phdr NAME(Elf,Internal_Phdr)
#define Elf_External_Rel NAME(Elf,External_Rel)
#define Elf_External_Rela NAME(Elf,External_Rela)
-#define Elf_Internal_Rel NAME(Elf,Internal_Rel)
-#define Elf_Internal_Rela NAME(Elf,Internal_Rela)
#define elf_symbol_type NAME(elf,symbol_type)
-#define elf_internal_shdr NAME(elf,internal_shdr)
-#define elf_backend_data NAME(elf,backend_data)
#define elf_core_file_failing_command NAME(bfd_elf,core_file_failing_command)
#define elf_core_file_failing_signal NAME(bfd_elf,core_file_failing_signal)
#define elf_core_file_matches_executable_p NAME(bfd_elf,core_file_matches_executable_p)
#define elf_object_p NAME(bfd_elf,object_p)
#define elf_core_file_p NAME(bfd_elf,core_file_p)
-#define elf_mkobject NAME(bfd_elf,mkobject)
-#define elf_write_object_contents NAME(bfd_elf,write_object_contents)
#define elf_get_symtab_upper_bound NAME(bfd_elf,get_symtab_upper_bound)
#define elf_get_reloc_upper_bound NAME(bfd_elf,get_reloc_upper_bound)
#define elf_canonicalize_reloc NAME(bfd_elf,canonicalize_reloc)
#define elf_set_section_contents NAME(bfd_elf,set_section_contents)
#define elf_no_info_to_howto NAME(bfd_elf,no_info_to_howto)
#define elf_no_info_to_howto_rel NAME(bfd_elf,no_info_to_howto_rel)
-#define elf_get_sect_thunk NAME(bfd_elf,get_sect_thunk)
-#define elf_hash NAME(bfd_elf,hash)
-
-
-#ifdef HAVE_PROCFS /* Some core file support requires host /proc files */
-#include <sys/procfs.h>
-#else
-#define bfd_prstatus(abfd, descdata, descsz, filepos) /* Define away */
-#define bfd_fpregset(abfd, descdata, descsz, filepos) /* Define away */
-#define bfd_prpsinfo(abfd, descdata, descsz, filepos) /* Define away */
-#endif
+#define elf_new_section_hook NAME(bfd_elf,new_section_hook)
+#define write_relocs NAME(bfd_elf,_write_relocs)
-#ifndef INLINE
-#if __GNUC__ >= 2
-#define INLINE __inline__
-#else
-#define INLINE
+#if ARCH_SIZE == 64
+#define ELF_R_INFO(X,Y) ELF64_R_INFO(X,Y)
+#define ELF_R_SYM(X) ELF64_R_SYM(X)
+#define ELFCLASS ELFCLASS64
#endif
+#if ARCH_SIZE == 32
+#define ELF_R_INFO(X,Y) ELF32_R_INFO(X,Y)
+#define ELF_R_SYM(X) ELF32_R_SYM(X)
+#define ELFCLASS ELFCLASS32
#endif
-/* Forward declarations of static functions */
+static int shstrtab_length_fixed;
+
+struct elf_sect_data {
+ int reloc_sec;
+ /* more? */
+};
-static char * elf_read PARAMS ((bfd *, long, int));
+/* Forward declarations of static functions */
static struct sec * section_from_elf_index PARAMS ((bfd *, int));
static boolean elf_slurp_symbol_table PARAMS ((bfd *, asymbol **));
-static char * elf_get_str_section PARAMS ((bfd *, unsigned int));
-
static int elf_symbol_from_bfd_symbol PARAMS ((bfd *,
struct symbol_cache_entry **));
-static boolean elf_map_symbols PARAMS ((bfd *));
+static void elf_map_symbols PARAMS ((bfd *));
+static void swap_out_syms PARAMS ((bfd *));
-/* Some private data is stashed away for future use using the tdata pointer
- in the bfd structure. */
+#ifdef DEBUG
+static void elf_debug_section PARAMS ((char *, int, Elf_Internal_Shdr *));
+static void elf_debug_file PARAMS ((Elf_Internal_Ehdr *));
+#endif
-struct elf_obj_tdata
-{
- Elf_Internal_Ehdr elf_header[1]; /* Actual data, but ref like ptr */
- Elf_Internal_Shdr *elf_sect_ptr;
- struct strtab *strtab_ptr;
- int symtab_section;
- int num_locals;
- int num_globals;
- int *symtab_map;
- void *prstatus; /* The raw /proc prstatus structure */
- void *prpsinfo; /* The raw /proc prpsinfo structure */
- Elf_External_Sym *raw_syms;
- Elf_Internal_Sym *internal_syms;
- elf_symbol_type *symbols;
-};
+#define elf_string_from_elf_strtab(abfd,strindex) \
+ elf_string_from_elf_section(abfd,elf_elfheader(abfd)->e_shstrndx,strindex)
-#define elf_tdata(bfd) ((bfd) -> tdata.elf_obj_data)
-#define elf_elfheader(bfd) (elf_tdata(bfd) -> elf_header)
-#define elf_elfsections(bfd) (elf_tdata(bfd) -> elf_sect_ptr)
-#define elf_shstrtab(bfd) (elf_tdata(bfd) -> strtab_ptr)
-#define elf_onesymtab(bfd) (elf_tdata(bfd) -> symtab_section)
-#define elf_num_locals(bfd) (elf_tdata(bfd) -> num_locals)
-#define elf_num_globals(bfd) (elf_tdata(bfd) -> num_globals)
-#define elf_symtab_map(bfd) (elf_tdata(bfd) -> symtab_map)
-#define core_prpsinfo(bfd) (elf_tdata(bfd) -> prpsinfo)
-#define core_prstatus(bfd) (elf_tdata(bfd) -> prstatus)
-#define obj_symbols(bfd) (elf_tdata(bfd) -> symbols)
-#define obj_raw_syms(bfd) (elf_tdata(bfd) -> raw_syms)
-#define obj_internal_syms(bfd) (elf_tdata(bfd) -> internal_syms)
+\f
+/* Structure swapping routines */
+
+/* Should perhaps use put_offset, put_word, etc. For now, the two versions
+ can be handled by explicitly specifying 32 bits or "the long type". */
+#if ARCH_SIZE == 64
+#define put_word bfd_h_put_64
+#define get_word bfd_h_get_64
+#endif
+#if ARCH_SIZE == 32
+#define put_word bfd_h_put_32
+#define get_word bfd_h_get_32
+#endif
/* Translate an ELF symbol in external format into an ELF symbol in internal
format. */
Elf_Internal_Sym * dst)
{
dst->st_name = bfd_h_get_32 (abfd, (bfd_byte *) src->st_name);
- dst->st_value = bfd_h_get_32 (abfd, (bfd_byte *) src->st_value);
- dst->st_size = bfd_h_get_32 (abfd, (bfd_byte *) src->st_size);
+ dst->st_value = get_word (abfd, (bfd_byte *) src->st_value);
+ dst->st_size = get_word (abfd, (bfd_byte *) src->st_size);
dst->st_info = bfd_h_get_8 (abfd, (bfd_byte *) src->st_info);
dst->st_other = bfd_h_get_8 (abfd, (bfd_byte *) src->st_other);
dst->st_shndx = bfd_h_get_16 (abfd, (bfd_byte *) src->st_shndx);
Elf_External_Sym * dst)
{
bfd_h_put_32 (abfd, src->st_name, dst->st_name);
- bfd_h_put_32 (abfd, src->st_value, dst->st_value);
- bfd_h_put_32 (abfd, src->st_size, dst->st_size);
+ put_word (abfd, src->st_value, dst->st_value);
+ put_word (abfd, src->st_size, dst->st_size);
bfd_h_put_8 (abfd, src->st_info, dst->st_info);
bfd_h_put_8 (abfd, src->st_other, dst->st_other);
bfd_h_put_16 (abfd, src->st_shndx, dst->st_shndx);
dst->e_type = bfd_h_get_16 (abfd, (bfd_byte *) src->e_type);
dst->e_machine = bfd_h_get_16 (abfd, (bfd_byte *) src->e_machine);
dst->e_version = bfd_h_get_32 (abfd, (bfd_byte *) src->e_version);
- dst->e_entry = bfd_h_get_32 (abfd, (bfd_byte *) src->e_entry);
- dst->e_phoff = bfd_h_get_32 (abfd, (bfd_byte *) src->e_phoff);
- dst->e_shoff = bfd_h_get_32 (abfd, (bfd_byte *) src->e_shoff);
+ dst->e_entry = get_word (abfd, (bfd_byte *) src->e_entry);
+ dst->e_phoff = get_word (abfd, (bfd_byte *) src->e_phoff);
+ dst->e_shoff = get_word (abfd, (bfd_byte *) src->e_shoff);
dst->e_flags = bfd_h_get_32 (abfd, (bfd_byte *) src->e_flags);
dst->e_ehsize = bfd_h_get_16 (abfd, (bfd_byte *) src->e_ehsize);
dst->e_phentsize = bfd_h_get_16 (abfd, (bfd_byte *) src->e_phentsize);
bfd_h_put_16 (abfd, src->e_type, dst->e_type);
bfd_h_put_16 (abfd, src->e_machine, dst->e_machine);
bfd_h_put_32 (abfd, src->e_version, dst->e_version);
- bfd_h_put_32 (abfd, src->e_entry, dst->e_entry);
- bfd_h_put_32 (abfd, src->e_phoff, dst->e_phoff);
- bfd_h_put_32 (abfd, src->e_shoff, dst->e_shoff);
+ put_word (abfd, src->e_entry, dst->e_entry);
+ put_word (abfd, src->e_phoff, dst->e_phoff);
+ put_word (abfd, src->e_shoff, dst->e_shoff);
bfd_h_put_32 (abfd, src->e_flags, dst->e_flags);
bfd_h_put_16 (abfd, src->e_ehsize, dst->e_ehsize);
bfd_h_put_16 (abfd, src->e_phentsize, dst->e_phentsize);
{
dst->sh_name = bfd_h_get_32 (abfd, (bfd_byte *) src->sh_name);
dst->sh_type = bfd_h_get_32 (abfd, (bfd_byte *) src->sh_type);
- dst->sh_flags = bfd_h_get_32 (abfd, (bfd_byte *) src->sh_flags);
- dst->sh_addr = bfd_h_get_32 (abfd, (bfd_byte *) src->sh_addr);
- dst->sh_offset = bfd_h_get_32 (abfd, (bfd_byte *) src->sh_offset);
- dst->sh_size = bfd_h_get_32 (abfd, (bfd_byte *) src->sh_size);
+ dst->sh_flags = get_word (abfd, (bfd_byte *) src->sh_flags);
+ dst->sh_addr = get_word (abfd, (bfd_byte *) src->sh_addr);
+ dst->sh_offset = get_word (abfd, (bfd_byte *) src->sh_offset);
+ dst->sh_size = get_word (abfd, (bfd_byte *) src->sh_size);
dst->sh_link = bfd_h_get_32 (abfd, (bfd_byte *) src->sh_link);
dst->sh_info = bfd_h_get_32 (abfd, (bfd_byte *) src->sh_info);
- dst->sh_addralign = bfd_h_get_32 (abfd, (bfd_byte *) src->sh_addralign);
- dst->sh_entsize = bfd_h_get_32 (abfd, (bfd_byte *) src->sh_entsize);
+ dst->sh_addralign = get_word (abfd, (bfd_byte *) src->sh_addralign);
+ dst->sh_entsize = get_word (abfd, (bfd_byte *) src->sh_entsize);
/* we haven't done any processing on it yet, so... */
dst->rawdata = (void *) 0;
}
/* note that all elements of dst are *arrays of unsigned char* already... */
bfd_h_put_32 (abfd, src->sh_name, dst->sh_name);
bfd_h_put_32 (abfd, src->sh_type, dst->sh_type);
- bfd_h_put_32 (abfd, src->sh_flags, dst->sh_flags);
- bfd_h_put_32 (abfd, src->sh_addr, dst->sh_addr);
- bfd_h_put_32 (abfd, src->sh_offset, dst->sh_offset);
- bfd_h_put_32 (abfd, src->sh_size, dst->sh_size);
+ put_word (abfd, src->sh_flags, dst->sh_flags);
+ put_word (abfd, src->sh_addr, dst->sh_addr);
+ put_word (abfd, src->sh_offset, dst->sh_offset);
+ put_word (abfd, src->sh_size, dst->sh_size);
bfd_h_put_32 (abfd, src->sh_link, dst->sh_link);
bfd_h_put_32 (abfd, src->sh_info, dst->sh_info);
- bfd_h_put_32 (abfd, src->sh_addralign, dst->sh_addralign);
- bfd_h_put_32 (abfd, src->sh_entsize, dst->sh_entsize);
+ put_word (abfd, src->sh_addralign, dst->sh_addralign);
+ put_word (abfd, src->sh_entsize, dst->sh_entsize);
}
Elf_Internal_Phdr * dst)
{
dst->p_type = bfd_h_get_32 (abfd, (bfd_byte *) src->p_type);
- dst->p_offset = bfd_h_get_32 (abfd, (bfd_byte *) src->p_offset);
- dst->p_vaddr = bfd_h_get_32 (abfd, (bfd_byte *) src->p_vaddr);
- dst->p_paddr = bfd_h_get_32 (abfd, (bfd_byte *) src->p_paddr);
- dst->p_filesz = bfd_h_get_32 (abfd, (bfd_byte *) src->p_filesz);
- dst->p_memsz = bfd_h_get_32 (abfd, (bfd_byte *) src->p_memsz);
dst->p_flags = bfd_h_get_32 (abfd, (bfd_byte *) src->p_flags);
- dst->p_align = bfd_h_get_32 (abfd, (bfd_byte *) src->p_align);
+ dst->p_offset = get_word (abfd, (bfd_byte *) src->p_offset);
+ dst->p_vaddr = get_word (abfd, (bfd_byte *) src->p_vaddr);
+ dst->p_paddr = get_word (abfd, (bfd_byte *) src->p_paddr);
+ dst->p_filesz = get_word (abfd, (bfd_byte *) src->p_filesz);
+ dst->p_memsz = get_word (abfd, (bfd_byte *) src->p_memsz);
+ dst->p_align = get_word (abfd, (bfd_byte *) src->p_align);
}
-/* ... */
-
static void
DEFUN (elf_swap_phdr_out, (abfd, src, dst),
bfd * abfd AND
{
/* note that all elements of dst are *arrays of unsigned char* already... */
bfd_h_put_32 (abfd, src->p_type, dst->p_type);
- bfd_h_put_32 (abfd, src->p_offset, dst->p_offset);
- bfd_h_put_32 (abfd, src->p_vaddr, dst->p_vaddr);
- bfd_h_put_32 (abfd, src->p_paddr, dst->p_paddr);
- bfd_h_put_32 (abfd, src->p_filesz, dst->p_filesz);
- bfd_h_put_32 (abfd, src->p_memsz, dst->p_memsz);
+ put_word (abfd, src->p_offset, dst->p_offset);
+ put_word (abfd, src->p_vaddr, dst->p_vaddr);
+ put_word (abfd, src->p_paddr, dst->p_paddr);
+ put_word (abfd, src->p_filesz, dst->p_filesz);
+ put_word (abfd, src->p_memsz, dst->p_memsz);
bfd_h_put_32 (abfd, src->p_flags, dst->p_flags);
- bfd_h_put_32 (abfd, src->p_align, dst->p_align);
+ put_word (abfd, src->p_align, dst->p_align);
}
/* Translate an ELF reloc from external format to internal format. */
-static void
+static INLINE void
DEFUN (elf_swap_reloc_in, (abfd, src, dst),
bfd * abfd AND
Elf_External_Rel * src AND
Elf_Internal_Rel * dst)
{
- dst->r_offset = bfd_h_get_32 (abfd, (bfd_byte *) src->r_offset);
- dst->r_info = bfd_h_get_32 (abfd, (bfd_byte *) src->r_info);
+ dst->r_offset = get_word (abfd, (bfd_byte *) src->r_offset);
+ dst->r_info = get_word (abfd, (bfd_byte *) src->r_info);
}
-static void
+static INLINE void
DEFUN (elf_swap_reloca_in, (abfd, src, dst),
bfd * abfd AND
Elf_External_Rela * src AND
Elf_Internal_Rela * dst)
{
- dst->r_offset = bfd_h_get_32 (abfd, (bfd_byte *) src->r_offset);
- dst->r_info = bfd_h_get_32 (abfd, (bfd_byte *) src->r_info);
- dst->r_addend = bfd_h_get_32 (abfd, (bfd_byte *) src->r_addend);
+ dst->r_offset = get_word (abfd, (bfd_byte *) src->r_offset);
+ dst->r_info = get_word (abfd, (bfd_byte *) src->r_info);
+ dst->r_addend = get_word (abfd, (bfd_byte *) src->r_addend);
}
/* Translate an ELF reloc from internal format to external format. */
-static void
+static INLINE void
DEFUN (elf_swap_reloc_out, (abfd, src, dst),
bfd * abfd AND
Elf_Internal_Rel * src AND
Elf_External_Rel * dst)
{
- bfd_h_put_32 (abfd, src->r_offset, dst->r_offset);
- bfd_h_put_32 (abfd, src->r_info, dst->r_info);
+ put_word (abfd, src->r_offset, dst->r_offset);
+ put_word (abfd, src->r_info, dst->r_info);
}
-static void
+static INLINE void
DEFUN (elf_swap_reloca_out, (abfd, src, dst),
bfd * abfd AND
Elf_Internal_Rela * src AND
Elf_External_Rela * dst)
{
- bfd_h_put_32 (abfd, src->r_offset, dst->r_offset);
- bfd_h_put_32 (abfd, src->r_info, dst->r_info);
- bfd_h_put_32 (abfd, src->r_addend, dst->r_addend);
+ put_word (abfd, src->r_offset, dst->r_offset);
+ put_word (abfd, src->r_info, dst->r_info);
+ put_word (abfd, src->r_addend, dst->r_addend);
}
-/*
-INTERNAL_FUNCTION
- bfd_elf_find_section
-
-SYNOPSIS
- struct elf32_internal_shdr *bfd_elf32_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.
-*/
+\f
-struct elf_internal_shdr *
-DEFUN (NAME (bfd_elf,find_section), (abfd, name),
- bfd * abfd AND
- char *name)
+/* String table creation/manipulation routines */
+
+static struct strtab *
+DEFUN (bfd_new_strtab, (abfd),
+ bfd * abfd)
{
- Elf_Internal_Shdr *i_shdrp;
- Elf_Internal_Shdr *gotit = NULL;
- char *shstrtab;
- unsigned int max;
- unsigned int i;
+ struct strtab *ss;
- i_shdrp = elf_elfsections (abfd);
- if (i_shdrp != NULL)
- {
- shstrtab = elf_get_str_section (abfd, elf_elfheader (abfd)->e_shstrndx);
- if (shstrtab != NULL)
- {
- max = elf_elfheader (abfd)->e_shnum;
- for (i = 1; i < max; i++)
- {
- if (!strcmp (&shstrtab[i_shdrp[i].sh_name], name))
- {
- gotit = &i_shdrp[i];
- }
- }
- }
- }
- return gotit;
-}
+ ss = (struct strtab *) bfd_xmalloc (sizeof (struct strtab));
+ ss->tab = bfd_xmalloc (1);
+ BFD_ASSERT (ss->tab != 0);
+ *ss->tab = 0;
+ ss->nentries = 0;
+ ss->length = 1;
-/* End of GDB support. */
+ return ss;
+}
-static char *
-DEFUN (elf_get_str_section, (abfd, shindex),
+static int
+DEFUN (bfd_add_to_strtab, (abfd, ss, str),
bfd * abfd AND
- unsigned int shindex)
+ struct strtab *ss AND
+ CONST char *str)
{
- Elf_Internal_Shdr *i_shdrp;
- char *shstrtab = NULL;
- unsigned int offset;
- unsigned int shstrtabsize;
+ /* should search first, but for now: */
+ /* include the trailing NUL */
+ int ln = strlen (str) + 1;
- i_shdrp = elf_elfsections (abfd);
- if (i_shdrp != NULL)
- {
- shstrtab = i_shdrp[shindex].rawdata;
- if (shstrtab == NULL)
- {
- /* No cached one, attempt to read, and cache what we read. */
- offset = i_shdrp[shindex].sh_offset;
- shstrtabsize = i_shdrp[shindex].sh_size;
- shstrtab = elf_read (abfd, offset, shstrtabsize);
- i_shdrp[shindex].rawdata = (void *) shstrtab;
- }
- }
- return shstrtab;
+ /* should this be using obstacks? */
+ ss->tab = realloc (ss->tab, ss->length + ln);
+
+ BFD_ASSERT (ss->tab != 0);
+ strcpy (ss->tab + ss->length, str);
+ ss->nentries++;
+ ss->length += ln;
+
+ return ss->length - ln;
}
-static char *
-DEFUN (elf_string_from_elf_section, (abfd, shindex, strindex),
+static int
+DEFUN (bfd_add_2_to_strtab, (abfd, ss, str, str2),
bfd * abfd AND
- unsigned int shindex AND
- unsigned int strindex)
+ struct strtab *ss AND
+ char *str AND
+ CONST char *str2)
{
- Elf_Internal_Shdr *hdr;
-
- if (strindex == 0)
- return "";
+ /* should search first, but for now: */
+ /* include the trailing NUL */
+ int ln = strlen (str) + strlen (str2) + 1;
- hdr = elf_elfsections (abfd) + shindex;
+ /* should this be using obstacks? */
+ if (ss->length)
+ ss->tab = realloc (ss->tab, ss->length + ln);
+ else
+ ss->tab = bfd_xmalloc (ln);
- if (!hdr->rawdata
- && elf_get_str_section (abfd, shindex) == NULL)
- return NULL;
+ BFD_ASSERT (ss->tab != 0);
+ strcpy (ss->tab + ss->length, str);
+ strcpy (ss->tab + ss->length + strlen (str), str2);
+ ss->nentries++;
+ ss->length += ln;
- return ((char *) hdr->rawdata) + strindex;
+ return ss->length - ln;
}
-static INLINE char *
-elf_string_from_elf_strtab (abfd, strindex)
- bfd *abfd;
- int strindex;
-{
- return elf_string_from_elf_section (abfd, elf_elfheader (abfd)->e_shstrndx,
- strindex);
-}
+\f
+/* ELF .o/exec file reading */
/* Create a new bfd section from an ELF section header. */
bfd * abfd AND
unsigned int shindex)
{
- Elf_Internal_Shdr *i_shdrp = elf_elfsections (abfd);
- Elf_Internal_Shdr *hdr = i_shdrp + shindex;
+ Elf_Internal_Shdr *hdr = elf_elfsections (abfd)[shindex];
+ Elf_Internal_Ehdr *ehdr = elf_elfheader (abfd);
asection *newsect;
char *name;
newsect = bfd_make_section (abfd, name);
if (newsect != NULL)
{
+ newsect->filepos = hdr->sh_offset; /* so we can read back the bits */
+ newsect->flags |= SEC_HAS_CONTENTS;
newsect->vma = hdr->sh_addr;
newsect->_raw_size = hdr->sh_size;
- newsect->filepos = hdr->sh_offset; /* so we can read back the bits */
- newsect->flags |= SEC_HAS_CONTENTS;
- newsect->alignment_power = hdr->sh_addralign;
+ newsect->alignment_power = bfd_log2 (hdr->sh_addralign);
if (hdr->sh_flags & SHF_ALLOC)
{
newsect->flags |= SEC_READONLY;
if (hdr->sh_flags & SHF_EXECINSTR)
- newsect->flags |= SEC_CODE; /* FIXME: may only contain SOME code */
+ newsect->flags |= SEC_CODE; /* FIXME: may only contain SOME code */
else
newsect->flags |= SEC_DATA;
hdr->rawdata = (void *) newsect;
}
+ else
+ hdr->rawdata = (void *) bfd_get_section_by_name (abfd, name);
}
return true;
newsect->vma = hdr->sh_addr;
newsect->_raw_size = hdr->sh_size;
newsect->filepos = hdr->sh_offset; /* fake */
- newsect->alignment_power = hdr->sh_addralign;
+ newsect->alignment_power = bfd_log2 (hdr->sh_addralign);
if (hdr->sh_flags & SHF_ALLOC)
newsect->flags |= SEC_ALLOC;
return true;
case SHT_SYMTAB: /* A symbol table */
+ if (elf_onesymtab (abfd) == shindex)
+ return true;
+
BFD_ASSERT (hdr->sh_entsize == sizeof (Elf_External_Sym));
+ BFD_ASSERT (elf_onesymtab (abfd) == 0);
elf_onesymtab (abfd) = shindex;
+ elf_tdata(abfd)->symtab_hdr = *hdr;
+ elf_elfsections(abfd)[shindex] = &elf_tdata(abfd)->symtab_hdr;
abfd->flags |= HAS_SYMS;
return true;
case SHT_STRTAB: /* A string table */
+ if (hdr->rawdata)
+ return true;
+ if (ehdr->e_shstrndx == shindex)
+ {
+ elf_tdata(abfd)->shstrtab_hdr = *hdr;
+ elf_elfsections(abfd)[shindex] = &elf_tdata(abfd)->shstrtab_hdr;
+ hdr->rawdata = (PTR) &elf_tdata(abfd)->shstrtab_hdr;
+ return true;
+ }
+ {
+ int i;
+
+ for (i = 1; i < ehdr->e_shnum; i++)
+ {
+ Elf_Internal_Shdr *hdr2 = elf_elfsections(abfd)[i];
+ if (hdr2->sh_link == shindex)
+ {
+ bfd_section_from_shdr (abfd, i);
+ if (elf_onesymtab (abfd) == i)
+ {
+ elf_tdata(abfd)->strtab_hdr = *hdr;
+ elf_elfsections(abfd)[shindex] = &elf_tdata(abfd)->strtab_hdr;
+ return true;
+ }
+#if 0 /* Not handling other string tables specially right now. */
+ hdr2 = elf_elfsections(abfd)[i]; /* in case it moved */
+ /* We have a strtab for some random other section. */
+ newsect = (asection *) hdr2->rawdata;
+ if (!newsect)
+ break;
+ hdr->rawdata = (PTR) newsect;
+ hdr2 = &elf_section_data (newsect)->str_hdr;
+ *hdr2 = *hdr;
+ elf_elfsections(abfd)[shindex] = hdr2;
+#endif
+ }
+ }
+ }
+
+ newsect = bfd_make_section (abfd, name);
+ if (newsect)
+ {
+ newsect->flags = SEC_HAS_CONTENTS;
+ hdr->rawdata = (PTR) newsect;
+ newsect->_raw_size = hdr->sh_size;
+ newsect->alignment_power = 0;
+ newsect->vma = 0;
+
+ if (hdr->sh_flags & SHF_ALLOC)
+ newsect->flags |= SEC_ALLOC|SEC_LOAD;
+ if (!(hdr->sh_flags & SHF_WRITE))
+ newsect->flags |= SEC_READONLY;
+ if (hdr->sh_flags & SHF_EXECINSTR)
+ newsect->flags |= SEC_CODE;
+ else
+ newsect->flags |= SEC_DATA;
+ }
+
return true;
case SHT_REL:
case SHT_RELA:
- /* *these* do a lot of work -- but build no sections! */
- /* the spec says there can be multiple strtabs, but only one symtab */
- /* but there can be lots of REL* sections. */
+ /* *These* do a lot of work -- but build no sections!
+ The spec says there can be multiple strtabs, but only one symtab,
+ but there can be lots of REL* sections. */
/* FIXME: The above statement is wrong! There are typically at least
- two symbol tables in a dynamically linked executable, ".dynsym"
- which is the dynamic linkage symbol table and ".symtab", which is
- the "traditional" symbol table. -fnf */
+ two symbol tables in a dynamically linked executable, ".dynsym"
+ which is the dynamic linkage symbol table and ".symtab", which is
+ the "traditional" symbol table. -fnf */
{
asection *target_sect;
+ Elf_Internal_Shdr *hdr2;
int use_rela_p = get_elf_backend_data (abfd)->use_rela_p;
/* Don't allow REL relocations on a machine that uses RELA and
BFD_ASSERT (!(!use_rela_p && (hdr->sh_type == SHT_RELA)));
BFD_ASSERT (hdr->sh_entsize ==
(use_rela_p
- ? sizeof (Elf32_External_Rela)
- : sizeof (Elf32_External_Rel)));
+ ? sizeof (Elf_External_Rela)
+ : sizeof (Elf_External_Rel)));
- bfd_section_from_shdr (abfd, hdr->sh_link); /* symbol table */
bfd_section_from_shdr (abfd, hdr->sh_info); /* target */
+ bfd_section_from_shdr (abfd, hdr->sh_link); /* symbol table */
target_sect = section_from_elf_index (abfd, hdr->sh_info);
if (target_sect == NULL)
return false;
-#if 0
- /* FIXME: We are only prepared to read one symbol table, so
- do NOT read the dynamic symbol table since it is only a
- subset of the full symbol table. Also see comment above. -fnf */
- if (!elf_slurp_symbol_table (abfd, i_shdrp + hdr->sh_link))
- return false;
-#endif
-
+ hdr2 = &elf_section_data (target_sect)->rel_hdr;
+ *hdr2 = *hdr;
+ elf_elfsections(abfd)[shindex] = hdr2;
target_sect->reloc_count = hdr->sh_size / hdr->sh_entsize;
target_sect->flags |= SEC_RELOC;
target_sect->relocation = 0;
target_sect->rel_filepos = hdr->sh_offset;
+ abfd->flags |= HAS_RELOC;
return true;
}
break;
return true;
}
-static struct strtab *
-DEFUN (bfd_new_strtab, (abfd),
- bfd * abfd)
-{
- struct strtab *ss;
-
- ss = (struct strtab *) bfd_xmalloc (sizeof (struct strtab));
- ss->tab = bfd_xmalloc (1);
- BFD_ASSERT (ss->tab != 0);
- *ss->tab = 0;
- ss->nentries = 0;
- ss->length = 1;
-
- return ss;
-}
-
-int
-DEFUN (bfd_add_to_strtab, (abfd, ss, str),
- bfd * abfd AND
- struct strtab *ss AND
- CONST char *str)
+boolean
+DEFUN (elf_new_section_hook, (abfd, sec),
+ bfd *abfd
+ AND asection *sec)
{
- /* should search first, but for now: */
- /* include the trailing NUL */
- int ln = strlen (str) + 1;
-
- /* should this be using obstacks? */
- ss->tab = realloc (ss->tab, ss->length + ln);
-
- BFD_ASSERT (ss->tab != 0);
- strcpy (ss->tab + ss->length, str);
- ss->nentries++;
- ss->length += ln;
+ struct bfd_elf_section_data *sdata;
- return ss->length - ln;
+ sdata = (struct bfd_elf_section_data *) bfd_alloc (abfd, sizeof (*sdata));
+ sec->used_by_bfd = (PTR) sdata;
+ memset (sdata, 0, sizeof (*sdata));
+ return true;
}
-static int
-DEFUN (bfd_add_2_to_strtab, (abfd, ss, str, str2),
- bfd * abfd AND
- struct strtab *ss AND
- char *str AND
- CONST char *str2)
-{
- /* should search first, but for now: */
- /* include the trailing NUL */
- int ln = strlen (str) + strlen (str2) + 1;
+/* Create a new bfd section from an ELF program header.
- /* should this be using obstacks? */
- if (ss->length)
- ss->tab = realloc (ss->tab, ss->length + ln);
- else
- ss->tab = bfd_xmalloc (ln);
+ Since program segments have no names, we generate a synthetic name
+ of the form segment<NUM>, where NUM is generally the index in the
+ program header table. For segments that are split (see below) we
+ generate the names segment<NUM>a and segment<NUM>b.
- BFD_ASSERT (ss->tab != 0);
- strcpy (ss->tab + ss->length, str);
- strcpy (ss->tab + ss->length + strlen (str), str2);
- ss->nentries++;
- ss->length += ln;
+ Note that some program segments may have a file size that is different than
+ (less than) the memory size. All this means is that at execution the
+ system must allocate the amount of memory specified by the memory size,
+ but only initialize it with the first "file size" bytes read from the
+ file. This would occur for example, with program segments consisting
+ of combined data+bss.
- return ss->length - ln;
-}
+ To handle the above situation, this routine generates TWO bfd sections
+ for the single program segment. The first has the length specified by
+ the file size of the segment, and the second has the length specified
+ by the difference between the two sizes. In effect, the segment is split
+ into it's initialized and uninitialized parts.
-/* Create a new ELF section from a bfd section. */
+ */
static boolean
-DEFUN (bfd_shdr_from_section, (abfd, hdr, shstrtab, indx),
+DEFUN (bfd_section_from_phdr, (abfd, hdr, index),
bfd * abfd AND
- Elf_Internal_Shdr * hdr AND
- struct strtab *shstrtab AND
- int indx)
+ Elf_Internal_Phdr * hdr AND
+ int index)
{
- asection *sect;
- int ndx;
-
- /* figure out out to write the section name from the bfd section name. MWE */
+ asection *newsect;
+ char *name;
+ char namebuf[64];
+ int split;
- sect = abfd->sections;
- for (ndx = indx; --ndx;)
+ split = ((hdr->p_memsz > 0) &&
+ (hdr->p_filesz > 0) &&
+ (hdr->p_memsz > hdr->p_filesz));
+ sprintf (namebuf, split ? "segment%da" : "segment%d", index);
+ name = bfd_alloc (abfd, strlen (namebuf) + 1);
+ strcpy (name, namebuf);
+ newsect = bfd_make_section (abfd, name);
+ newsect->vma = hdr->p_vaddr;
+ newsect->_raw_size = hdr->p_filesz;
+ newsect->filepos = hdr->p_offset;
+ newsect->flags |= SEC_HAS_CONTENTS;
+ if (hdr->p_type == PT_LOAD)
{
- sect = sect->next;
- }
- hdr[indx].sh_name = bfd_add_to_strtab (abfd, shstrtab,
- bfd_section_name (abfd, sect));
- hdr[indx].sh_addr = sect->vma;
- hdr[indx].sh_size = sect->_raw_size;
- hdr[indx].sh_addralign = sect->alignment_power;
- hdr[indx].sh_flags = 0;
- /* these need to be preserved on */
- hdr[indx].sh_link = 0;
- hdr[indx].sh_info = 0;
- hdr[indx].sh_entsize = 0;
-
- hdr[indx].sh_type = 0;
- if (sect->flags & SEC_RELOC)
- {
- int use_rela_p = get_elf_backend_data (abfd)->use_rela_p;
- hdr[indx].sh_type = use_rela_p ? SHT_RELA : SHT_REL;
- }
-
- if (sect->flags & SEC_HAS_CONTENTS)
- {
- hdr[indx].sh_offset = sect->filepos;
- hdr[indx].sh_size = sect->_raw_size;
- }
- if (sect->flags & SEC_ALLOC)
- {
- hdr[indx].sh_flags |= SHF_ALLOC;
- if (sect->flags & SEC_LOAD)
- {
- /* do something with sh_type ? */
- }
- }
- if (!(sect->flags & SEC_READONLY))
- hdr[indx].sh_flags |= SHF_WRITE;
-
- if (sect->flags & SEC_CODE)
- hdr[indx].sh_flags |= SHF_EXECINSTR;
-
- return true;
-}
-
-/* Create a new bfd section from an ELF program header.
-
- Since program segments have no names, we generate a synthetic name
- of the form segment<NUM>, where NUM is generally the index in the
- program header table. For segments that are split (see below) we
- generate the names segment<NUM>a and segment<NUM>b.
-
- Note that some program segments may have a file size that is different than
- (less than) the memory size. All this means is that at execution the
- system must allocate the amount of memory specified by the memory size,
- but only initialize it with the first "file size" bytes read from the
- file. This would occur for example, with program segments consisting
- of combined data+bss.
-
- To handle the above situation, this routine generates TWO bfd sections
- for the single program segment. The first has the length specified by
- the file size of the segment, and the second has the length specified
- by the difference between the two sizes. In effect, the segment is split
- into it's initialized and uninitialized parts.
-
- */
-
-static boolean
-DEFUN (bfd_section_from_phdr, (abfd, hdr, index),
- bfd * abfd AND
- Elf_Internal_Phdr * hdr AND
- int index)
-{
- asection *newsect;
- char *name;
- char namebuf[64];
- int split;
-
- split = ((hdr->p_memsz > 0) &&
- (hdr->p_filesz > 0) &&
- (hdr->p_memsz > hdr->p_filesz));
- sprintf (namebuf, split ? "segment%da" : "segment%d", index);
- name = bfd_alloc (abfd, strlen (namebuf) + 1);
- strcpy (name, namebuf);
- newsect = bfd_make_section (abfd, name);
- newsect->vma = hdr->p_vaddr;
- newsect->_raw_size = hdr->p_filesz;
- newsect->filepos = hdr->p_offset;
- newsect->flags |= SEC_HAS_CONTENTS;
- if (hdr->p_type == PT_LOAD)
- {
- newsect->flags |= SEC_ALLOC;
- newsect->flags |= SEC_LOAD;
- if (hdr->p_flags & PF_X)
- {
- /* FIXME: all we known is that it has execute PERMISSION,
- may be data. */
- newsect->flags |= SEC_CODE;
- }
+ newsect->flags |= SEC_ALLOC;
+ newsect->flags |= SEC_LOAD;
+ if (hdr->p_flags & PF_X)
+ {
+ /* FIXME: all we known is that it has execute PERMISSION,
+ may be data. */
+ newsect->flags |= SEC_CODE;
+ }
}
if (!(hdr->p_flags & PF_W))
{
return true;
}
-#ifdef HAVE_PROCFS
+/* Begin processing a given object.
-static void
-DEFUN (bfd_prstatus, (abfd, descdata, descsz, filepos),
- bfd * abfd AND
- char *descdata AND
- int descsz AND
- long filepos)
-{
- asection *newsect;
- prstatus_t *status = (prstatus_t *) 0;
+ First we validate the file by reading in the ELF header and checking
+ the magic number. */
- if (descsz == sizeof (prstatus_t))
- {
- newsect = bfd_make_section (abfd, ".reg");
- newsect->_raw_size = sizeof (status->pr_reg);
- newsect->filepos = filepos + (long) &status->pr_reg;
- newsect->flags = SEC_ALLOC | SEC_HAS_CONTENTS;
- newsect->alignment_power = 2;
- if ((core_prstatus (abfd) = bfd_alloc (abfd, descsz)) != NULL)
- {
- memcpy (core_prstatus (abfd), descdata, descsz);
- }
- }
+static INLINE boolean
+DEFUN (elf_file_p, (x_ehdrp), Elf_External_Ehdr * x_ehdrp)
+{
+ return ((x_ehdrp->e_ident[EI_MAG0] == ELFMAG0)
+ && (x_ehdrp->e_ident[EI_MAG1] == ELFMAG1)
+ && (x_ehdrp->e_ident[EI_MAG2] == ELFMAG2)
+ && (x_ehdrp->e_ident[EI_MAG3] == ELFMAG3));
}
-/* Stash a copy of the prpsinfo structure away for future use. */
-
-static void
-DEFUN (bfd_prpsinfo, (abfd, descdata, descsz, filepos),
- bfd * abfd AND
- char *descdata AND
- int descsz AND
- long filepos)
+bfd_target *
+DEFUN (elf_object_p, (abfd), bfd * abfd)
{
- asection *newsect;
+ Elf_External_Ehdr x_ehdr; /* Elf file header, external form */
+ Elf_Internal_Ehdr *i_ehdrp; /* Elf file header, internal form */
+ Elf_External_Shdr x_shdr; /* Section header table entry, external form */
+ Elf_Internal_Shdr *i_shdrp; /* Section header table, internal form */
+ int shindex;
+ char *shstrtab; /* Internal copy of section header stringtab */
+ struct elf_backend_data *ebd; /* Use to get ELF_ARCH stored in xvec */
- if (descsz == sizeof (prpsinfo_t))
+ /* Read in the ELF header in external format. */
+
+ if (bfd_read ((PTR) & x_ehdr, sizeof (x_ehdr), 1, abfd) != sizeof (x_ehdr))
{
- if ((core_prpsinfo (abfd) = bfd_alloc (abfd, descsz)) != NULL)
- {
- memcpy (core_prpsinfo (abfd), descdata, descsz);
- }
+ bfd_error = system_call_error;
+ return NULL;
}
-}
-static void
-DEFUN (bfd_fpregset, (abfd, descdata, descsz, filepos),
- bfd * abfd AND
- char *descdata AND
- int descsz AND
- long filepos)
-{
- asection *newsect;
+ /* Now check to see if we have a valid ELF file, and one that BFD can
+ make use of. The magic number must match, the address size ('class')
+ and byte-swapping must match our XVEC entry, and it must have a
+ section header table (FIXME: See comments re sections at top of this
+ file). */
- newsect = bfd_make_section (abfd, ".reg2");
- newsect->_raw_size = descsz;
- newsect->filepos = filepos;
- newsect->flags = SEC_ALLOC | SEC_HAS_CONTENTS;
- newsect->alignment_power = 2;
-}
+ if (elf_file_p (&x_ehdr) == false)
+ {
+ wrong:
+ bfd_error = wrong_format;
+ return NULL;
+ }
-#endif /* HAVE_PROCFS */
+ if (x_ehdr.e_ident[EI_VERSION] != EV_CURRENT)
+ goto wrong;
-/* Return a pointer to the args (including the command name) that were
- seen by the program that generated the core dump. Note that for
- some reason, a spurious space is tacked onto the end of the args
- in some (at least one anyway) implementations, so strip it off if
- it exists. */
+ if (x_ehdr.e_ident[EI_CLASS] != ELFCLASS)
+ goto wrong;
-char *
-DEFUN (elf_core_file_failing_command, (abfd),
- bfd * abfd)
-{
-#ifdef HAVE_PROCFS
- if (core_prpsinfo (abfd))
+ /* Switch xvec to match the specified byte order. */
+ switch (x_ehdr.e_ident[EI_DATA])
{
- prpsinfo_t *p = core_prpsinfo (abfd);
- char *scan = p->pr_psargs;
- while (*scan++)
- {;
- }
- scan -= 2;
- if ((scan > p->pr_psargs) && (*scan == ' '))
- {
- *scan = '\000';
- }
- return p->pr_psargs;
+ case ELFDATA2MSB: /* Big-endian */
+ if (!abfd->xvec->header_byteorder_big_p)
+ goto wrong;
+ break;
+ case ELFDATA2LSB: /* Little-endian */
+ if (abfd->xvec->header_byteorder_big_p)
+ goto wrong;
+ break;
+ case ELFDATANONE: /* No data encoding specified */
+ default: /* Unknown data encoding specified */
+ goto wrong;
}
-#endif
- return NULL;
-}
-/* Return the number of the signal that caused the core dump. Presumably,
- since we have a core file, we got a signal of some kind, so don't bother
- checking the other process status fields, just return the signal number.
- */
+ /* Allocate an instance of the elf_obj_tdata structure and hook it up to
+ the tdata pointer in the bfd. */
-int
-DEFUN (elf_core_file_failing_signal, (abfd),
- bfd * abfd)
-{
-#ifdef HAVE_PROCFS
- if (core_prstatus (abfd))
+ if (NULL == (elf_tdata (abfd) = (struct elf_obj_tdata *)
+ bfd_zalloc (abfd, sizeof (struct elf_obj_tdata))))
{
- return ((prstatus_t *) (core_prstatus (abfd)))->pr_cursig;
+ bfd_error = no_memory;
+ return NULL;
}
-#endif
- return -1;
-}
-/* Check to see if the core file could reasonably be expected to have
- come for the current executable file. Note that by default we return
- true unless we find something that indicates that there might be a
- problem.
- */
+ /* FIXME: Any `wrong' exits below here will leak memory (tdata). */
-boolean
-DEFUN (elf_core_file_matches_executable_p, (core_bfd, exec_bfd),
- bfd * core_bfd AND
- bfd * exec_bfd)
-{
-#ifdef HAVE_PROCFS
- char *corename;
- char *execname;
+ /* Now that we know the byte order, swap in the rest of the header */
+ i_ehdrp = elf_elfheader (abfd);
+ elf_swap_ehdr_in (abfd, &x_ehdr, i_ehdrp);
+#if DEBUG & 1
+ elf_debug_file (i_ehdrp);
#endif
- /* First, xvecs must match since both are ELF files for the same target. */
+ /* If there is no section header table, we're hosed. */
+ if (i_ehdrp->e_shoff == 0)
+ goto wrong;
- if (core_bfd->xvec != exec_bfd->xvec)
- {
- bfd_error = system_call_error;
- return false;
- }
+ if (i_ehdrp->e_type == ET_EXEC || i_ehdrp->e_type == ET_DYN)
+ abfd->flags |= EXEC_P;
-#ifdef HAVE_PROCFS
+ /* Retrieve the architecture information from the xvec and verify
+ that it matches the machine info stored in the ELF header.
+ This allows us to resolve ambiguous formats that might not
+ otherwise be distinguishable. */
- /* If no prpsinfo, just return true. Otherwise, grab the last component
- of the exec'd pathname from the prpsinfo. */
+ ebd = get_elf_backend_data (abfd);
- if (core_prpsinfo (core_bfd))
+ /* Perhaps the elf architecture value should be another field in the
+ elf backend data? If you change this to work that way, make sure
+ that you still get bfd_arch_unknown for unknown architecture types,
+ and that it still gets accepted by the `generic' elf target. */
+ {
+ int i;
+ enum bfd_architecture arch = bfd_arch_unknown;
+
+ for (i = 0; i < bfd_elf_arch_map_size; i++)
+ {
+ if (bfd_elf_arch_map[i].elf_arch == i_ehdrp->e_machine)
+ {
+ arch = bfd_elf_arch_map[i].bfd_arch;
+ break;
+ }
+ }
+ /* start-sanitize-v9 */
+ if (i_ehdrp->e_machine == EM_SPARC64)
+ arch = bfd_arch_sparc;
+ /* end-sanitize-v9 */
+ if (ebd->arch != arch)
+ goto wrong;
+ bfd_default_set_arch_mach (abfd, arch, 0);
+ }
+
+ /* Allocate space for a copy of the section header table in
+ internal form, seek to the section header table in the file,
+ read it in, and convert it to internal form. As a simple sanity
+ check, verify that the what BFD thinks is the size of each section
+ header table entry actually matches the size recorded in the file. */
+
+ if (i_ehdrp->e_shentsize != sizeof (x_shdr))
+ goto wrong;
+ i_shdrp = (Elf_Internal_Shdr *)
+ bfd_alloc (abfd, sizeof (*i_shdrp) * i_ehdrp->e_shnum);
+ elf_elfsections (abfd) =
+ (Elf_Internal_Shdr **) bfd_alloc (abfd, sizeof (i_shdrp) * i_ehdrp->e_shnum);
+ if (!i_shdrp || !elf_elfsections(abfd))
{
- corename = (((struct prpsinfo *) core_prpsinfo (core_bfd))->pr_fname);
+ bfd_error = no_memory;
+ return NULL;
}
- else
+ if (bfd_seek (abfd, i_ehdrp->e_shoff, SEEK_SET) == -1)
{
- return true;
+ bfd_error = system_call_error;
+ return NULL;
}
-
- /* Find the last component of the executable pathname. */
-
- if ((execname = strrchr (exec_bfd->filename, '/')) != NULL)
+ for (shindex = 0; shindex < i_ehdrp->e_shnum; shindex++)
{
- execname++;
+ if (bfd_read ((PTR) & x_shdr, sizeof x_shdr, 1, abfd)
+ != sizeof (x_shdr))
+ {
+ bfd_error = system_call_error;
+ return NULL;
+ }
+ elf_swap_shdr_in (abfd, &x_shdr, i_shdrp + shindex);
+ elf_elfsections(abfd)[shindex] = i_shdrp + shindex;
}
- else
+ if (i_ehdrp->e_shstrndx)
{
- execname = (char *) exec_bfd->filename;
+ bfd_section_from_shdr (abfd, i_ehdrp->e_shstrndx);
}
- /* See if they match */
+#if 0
+ for (shindex = i_ehdrp->e_shnum - 1; shindex >= 0; shindex--)
+ {
+ if (!strcmp (elf_string_from_elf_strtab (abfd,
+ i_shdrp[shindex].sh_name),
+ ".strtab"))
+ {
+ elf_tdata(abfd)->strtab_hdr = i_shdrp[shindex];
+ elf_elfsections(abfd)[shindex] = &elf_tdata(abfd)->strtab_hdr;
+ }
+ else if (!strcmp (elf_string_from_elf_strtab (abfd,
+ i_shdrp[shindex].sh_name),
+ ".symtab"))
+ {
+ elf_tdata(abfd)->symtab_hdr = i_shdrp[shindex];
+ elf_elfsections(abfd)[shindex] = &elf_tdata(abfd)->symtab_hdr;
+ elf_onesymtab (abfd) = shindex;
+ }
+ }
+#endif
- return strcmp (execname, corename) ? false : true;
+ /* Read in the string table containing the names of the sections. We
+ will need the base pointer to this table later. */
+ /* We read this inline now, so that we don't have to go through
+ bfd_section_from_shdr with it (since this particular strtab is
+ used to find all of the ELF section names.) */
-#else
+ shstrtab = elf_get_str_section (abfd, i_ehdrp->e_shstrndx);
+ if (!shstrtab)
+ return NULL;
- return true;
+ /* Once all of the section headers have been read and converted, we
+ can start processing them. Note that the first section header is
+ a dummy placeholder entry, so we ignore it.
-#endif /* HAVE_PROCFS */
-}
+ We also watch for the symbol table section and remember the file
+ offset and section size for both the symbol table section and the
+ associated string table section. */
-/* ELF core files contain a segment of type PT_NOTE, that holds much of
- the information that would normally be available from the /proc interface
- for the process, at the time the process dumped core. Currently this
- includes copies of the prstatus, prpsinfo, and fpregset structures.
+ for (shindex = 1; shindex < i_ehdrp->e_shnum; shindex++)
+ {
+ bfd_section_from_shdr (abfd, shindex);
+ }
- Since these structures are potentially machine dependent in size and
- ordering, bfd provides two levels of support for them. The first level,
- available on all machines since it does not require that the host
- have /proc support or the relevant include files, is to create a bfd
- section for each of the prstatus, prpsinfo, and fpregset structures,
- without any interpretation of their contents. With just this support,
- the bfd client will have to interpret the structures itself. Even with
- /proc support, it might want these full structures for it's own reasons.
+ /* Remember the entry point specified in the ELF file header. */
- In the second level of support, where HAVE_PROCFS is defined, bfd will
- pick apart the structures to gather some additional information that
- clients may want, such as the general register set, the name of the
- exec'ed file and its arguments, the signal (if any) that caused the
- core dump, etc.
+ bfd_get_start_address (abfd) = i_ehdrp->e_entry;
- */
+ return abfd->xvec;
+}
+
+\f
+/* ELF .o/exec file writing */
+
+/* Create a new ELF section from a bfd section. */
+#if 0 /* not used */
static boolean
-DEFUN (elf_corefile_note, (abfd, hdr),
+DEFUN (bfd_shdr_from_section, (abfd, hdr, shstrtab, indx),
bfd * abfd AND
- Elf_Internal_Phdr * hdr)
+ Elf_Internal_Shdr * hdr AND
+ struct strtab *shstrtab AND
+ int indx)
{
- Elf_External_Note *x_note_p; /* Elf note, external form */
- Elf_Internal_Note i_note; /* Elf note, internal form */
- char *buf = NULL; /* Entire note segment contents */
- char *namedata; /* Name portion of the note */
- char *descdata; /* Descriptor portion of the note */
- char *sectname; /* Name to use for new section */
- long filepos; /* File offset to descriptor data */
- asection *newsect;
+ asection *sect;
+ int ndx;
- if (hdr->p_filesz > 0
- && (buf = (char *) bfd_xmalloc (hdr->p_filesz)) != NULL
- && bfd_seek (abfd, hdr->p_offset, SEEK_SET) != -1
- && bfd_read ((PTR) buf, hdr->p_filesz, 1, abfd) == hdr->p_filesz)
- {
- x_note_p = (Elf_External_Note *) buf;
- while ((char *) x_note_p < (buf + hdr->p_filesz))
- {
- i_note.namesz = bfd_h_get_32 (abfd, (bfd_byte *) x_note_p->namesz);
- i_note.descsz = bfd_h_get_32 (abfd, (bfd_byte *) x_note_p->descsz);
- i_note.type = bfd_h_get_32 (abfd, (bfd_byte *) x_note_p->type);
- namedata = x_note_p->name;
- descdata = namedata + BFD_ALIGN (i_note.namesz, 4);
- filepos = hdr->p_offset + (descdata - buf);
- switch (i_note.type)
- {
- case NT_PRSTATUS:
- /* process descdata as prstatus info */
- bfd_prstatus (abfd, descdata, i_note.descsz, filepos);
- sectname = ".prstatus";
- break;
- case NT_FPREGSET:
- /* process descdata as fpregset info */
- bfd_fpregset (abfd, descdata, i_note.descsz, filepos);
- sectname = ".fpregset";
- break;
- case NT_PRPSINFO:
- /* process descdata as prpsinfo */
- bfd_prpsinfo (abfd, descdata, i_note.descsz, filepos);
- sectname = ".prpsinfo";
- break;
- default:
- /* Unknown descriptor, just ignore it. */
- sectname = NULL;
- break;
- }
- if (sectname != NULL)
- {
- newsect = bfd_make_section (abfd, sectname);
- newsect->_raw_size = i_note.descsz;
- newsect->filepos = filepos;
- newsect->flags = SEC_ALLOC | SEC_HAS_CONTENTS;
- newsect->alignment_power = 2;
- }
- x_note_p = (Elf_External_Note *)
- (descdata + BFD_ALIGN (i_note.descsz, 4));
- }
- }
- if (buf != NULL)
+ sect = abfd->sections;
+ for (ndx = indx; --ndx;)
{
- free (buf);
+ sect = sect->next;
}
- return true;
-
-}
-
-
-/* Read a specified number of bytes at a specified offset in an ELF
- file, into a newly allocated buffer, and return a pointer to the
- buffer. */
-
-static char *
-DEFUN (elf_read, (abfd, offset, size),
- bfd * abfd AND
- long offset AND
- int size)
-{
- char *buf;
+ hdr[indx].sh_name = bfd_add_to_strtab (abfd, shstrtab,
+ bfd_section_name (abfd, sect));
+ hdr[indx].sh_addr = sect->vma;
+ hdr[indx].sh_size = sect->_raw_size;
+ hdr[indx].sh_addralign = 1 << sect->alignment_power;
+ hdr[indx].sh_flags = 0;
+ /* these need to be preserved on */
+ hdr[indx].sh_link = 0;
+ hdr[indx].sh_info = 0;
+ hdr[indx].sh_entsize = 0;
- if ((buf = bfd_alloc (abfd, size)) == NULL)
+ hdr[indx].sh_type = 0;
+ if (sect->flags & SEC_RELOC)
{
- bfd_error = no_memory;
- return NULL;
+ int use_rela_p = get_elf_backend_data (abfd)->use_rela_p;
+ hdr[indx].sh_type = use_rela_p ? SHT_RELA : SHT_REL;
}
- if (bfd_seek (abfd, offset, SEEK_SET) == -1)
+
+ if (sect->flags & SEC_HAS_CONTENTS)
{
- bfd_error = system_call_error;
- return NULL;
+ hdr[indx].sh_offset = sect->filepos;
+ hdr[indx].sh_size = sect->_raw_size;
}
- if (bfd_read ((PTR) buf, size, 1, abfd) != size)
+ if (sect->flags & SEC_ALLOC)
{
- bfd_error = system_call_error;
- return NULL;
+ hdr[indx].sh_flags |= SHF_ALLOC;
+ if (sect->flags & SEC_LOAD)
+ {
+ /* do something with sh_type ? */
+ }
}
- return buf;
-}
-
-/* Begin processing a given object.
+ if (!(sect->flags & SEC_READONLY))
+ hdr[indx].sh_flags |= SHF_WRITE;
- First we validate the file by reading in the ELF header and checking
- the magic number. */
+ if (sect->flags & SEC_CODE)
+ hdr[indx].sh_flags |= SHF_EXECINSTR;
-static INLINE boolean
-DEFUN (elf_file_p, (x_ehdrp), Elf_External_Ehdr * x_ehdrp)
-{
- return ((x_ehdrp->e_ident[EI_MAG0] == ELFMAG0)
- && (x_ehdrp->e_ident[EI_MAG1] == ELFMAG1)
- && (x_ehdrp->e_ident[EI_MAG2] == ELFMAG2)
- && (x_ehdrp->e_ident[EI_MAG3] == ELFMAG3));
+ return true;
}
+#endif
-bfd_target *
-DEFUN (elf_object_p, (abfd), bfd * abfd)
+/*
+ Takes a bfd and a symbol, returns a pointer to the elf specific area
+ of the symbol if there is one.
+ */
+static INLINE elf_symbol_type *
+DEFUN (elf_symbol_from, (ignore_abfd, symbol),
+ bfd * ignore_abfd AND
+ asymbol * symbol)
{
- Elf_External_Ehdr x_ehdr; /* Elf file header, external form */
- Elf_Internal_Ehdr *i_ehdrp; /* Elf file header, internal form */
- Elf_External_Shdr x_shdr; /* Section header table entry, external form */
- Elf_Internal_Shdr *i_shdrp; /* Section header table, internal form */
- int shindex;
- char *shstrtab; /* Internal copy of section header stringtab */
- struct elf_backend_data *ebd; /* Use to get ELF_ARCH stored in xvec */
-
- /* Read in the ELF header in external format. */
-
- if (bfd_read ((PTR) & x_ehdr, sizeof (x_ehdr), 1, abfd) != sizeof (x_ehdr))
- {
- bfd_error = system_call_error;
- return NULL;
- }
-
- /* Now check to see if we have a valid ELF file, and one that BFD can
- make use of. The magic number must match, the address size ('class')
- and byte-swapping must match our XVEC entry, and it must have a
- section header table (FIXME: See comments re sections at top of this
- file). */
-
- if (elf_file_p (&x_ehdr) == false)
- {
- wrong:
- bfd_error = wrong_format;
- return NULL;
- }
-
- if (x_ehdr.e_ident[EI_VERSION] != EV_CURRENT)
- goto wrong;
-
- {
- unsigned int class = 0x12345;
-#if ARCH_SIZE == 64
- class = ELFCLASS64;
-#endif
-#if ARCH_SIZE == 32
- class = ELFCLASS32;
-#endif
- if (x_ehdr.e_ident[EI_CLASS] != class)
- goto wrong;
- }
+ if (symbol->the_bfd->xvec->flavour != bfd_target_elf_flavour)
+ return 0;
- /* Switch xvec to match the specified byte order. */
- switch (x_ehdr.e_ident[EI_DATA])
- {
- case ELFDATA2MSB: /* Big-endian */
- if (!abfd->xvec->header_byteorder_big_p)
- goto wrong;
- break;
- case ELFDATA2LSB: /* Little-endian */
- if (abfd->xvec->header_byteorder_big_p)
- goto wrong;
- break;
- case ELFDATANONE: /* No data encoding specified */
- default: /* Unknown data encoding specified */
- goto wrong;
- }
+ if (symbol->the_bfd->tdata.elf_obj_data == (struct elf_obj_tdata *) NULL)
+ return 0;
- /* Allocate an instance of the elf_obj_tdata structure and hook it up to
- the tdata pointer in the bfd. */
+ return (elf_symbol_type *) symbol;
+}
- if (NULL == (elf_tdata (abfd) = (struct elf_obj_tdata *)
- bfd_zalloc (abfd, sizeof (struct elf_obj_tdata))))
- {
- bfd_error = no_memory;
- return NULL;
- }
+/*
+ Create ELF output from BFD sections.
- /* FIXME: Any `wrong' exits below here will leak memory (tdata). */
+ Essentially, just create the section header and forget about the program
+ header for now.
- /* Now that we know the byte order, swap in the rest of the header */
- i_ehdrp = elf_elfheader (abfd);
- elf_swap_ehdr_in (abfd, &x_ehdr, i_ehdrp);
+*/
- /* If there is no section header table, we're hosed. */
- if (i_ehdrp->e_shoff == 0)
- goto wrong;
+static void
+DEFUN (elf_make_sections, (abfd, asect, obj),
+ bfd * abfd AND
+ asection * asect AND
+ PTR obj)
+{
+ /* most of what is in bfd_shdr_from_section goes in here... */
+ /* and all of these sections generate at *least* one ELF section. */
+ int idx;
- if (i_ehdrp->e_type == ET_EXEC || i_ehdrp->e_type == ET_DYN)
- abfd->flags |= EXEC_P;
+ Elf_Internal_Shdr *this_hdr;
+ this_hdr = &elf_section_data (asect)->this_hdr;
- /* Retrieve the architecture information from the xvec and verify
- that it matches the machine info stored in the ELF header.
- This allows us to resolve ambiguous formats that might not
- otherwise be distinguishable. */
+ this_hdr->sh_addr = asect->vma;
+ this_hdr->sh_size = asect->_raw_size;
+ /* contents already set by elf_set_section_contents */
- ebd = get_elf_backend_data (abfd);
- switch (i_ehdrp->e_machine)
+ if (asect->flags & SEC_RELOC)
{
- default:
- case EM_NONE:
- case EM_M32:
- /* Arguably EM_M32 should be bfd_arch_obscure, but then we would
- need both an elf32-obscure target and an elf32-unknown target.
- The distinction is probably not worth worrying about. */
- if (ebd->arch != bfd_arch_unknown)
- goto wrong;
- bfd_default_set_arch_mach (abfd, bfd_arch_unknown, 0);
- break;
- case EM_SPARC:
- if (ebd->arch != bfd_arch_sparc)
- goto wrong;
- bfd_default_set_arch_mach (abfd, bfd_arch_sparc, 0);
- break;
- case EM_386:
- if (ebd->arch != bfd_arch_i386)
- goto wrong;
- bfd_default_set_arch_mach (abfd, bfd_arch_i386, 0);
- break;
- case EM_68K:
- if (ebd->arch != bfd_arch_m68k)
- goto wrong;
- bfd_default_set_arch_mach (abfd, bfd_arch_m68k, 0);
- break;
- case EM_88K:
- if (ebd->arch != bfd_arch_m88k)
- goto wrong;
- bfd_default_set_arch_mach (abfd, bfd_arch_m88k, 0);
- break;
- case EM_860:
- if (ebd->arch != bfd_arch_i860)
- goto wrong;
- bfd_default_set_arch_mach (abfd, bfd_arch_i860, 0);
- break;
- case EM_MIPS:
- if (ebd->arch != bfd_arch_mips)
- goto wrong;
- bfd_default_set_arch_mach (abfd, bfd_arch_mips, 0);
- break;
- case EM_HPPA:
- if (ebd->arch != bfd_arch_hppa)
- goto wrong;
- bfd_default_set_arch_mach (abfd, bfd_arch_hppa, 0);
- break;
- }
+ /* emit a reloc section, and thus strtab and symtab... */
+ Elf_Internal_Shdr *rela_hdr;
+ Elf_External_Rela *outbound_relocas;
+ Elf_External_Rel *outbound_relocs;
+ int use_rela_p = get_elf_backend_data (abfd)->use_rela_p;
- /* Allocate space for a copy of the section header table in
- internal form, seek to the section header table in the file,
- read it in, and convert it to internal form. As a simple sanity
- check, verify that the what BFD thinks is the size of each section
- header table entry actually matches the size recorded in the file. */
+ rela_hdr = &elf_section_data (asect)->rel_hdr;
- if (i_ehdrp->e_shentsize != sizeof (x_shdr))
- goto wrong;
- i_shdrp = (Elf_Internal_Shdr *)
- bfd_alloc (abfd, sizeof (*i_shdrp) * i_ehdrp->e_shnum);
- if (!i_shdrp)
- {
- bfd_error = no_memory;
- return NULL;
- }
- if (bfd_seek (abfd, i_ehdrp->e_shoff, SEEK_SET) == -1)
- {
- bfd_error = system_call_error;
- return NULL;
+ /* orelocation has the data, reloc_count has the count... */
+ if (use_rela_p)
+ {
+ rela_hdr->sh_type = SHT_RELA;
+ rela_hdr->sh_entsize = sizeof (Elf_External_Rela);
+ }
+ else
+ /* REL relocations */
+ {
+ rela_hdr->sh_type = SHT_REL;
+ rela_hdr->sh_entsize = sizeof (Elf_External_Rel);
+ }
+ rela_hdr->sh_flags = 0;
+ rela_hdr->sh_addr = 0;
+ rela_hdr->sh_offset = 0;
+ rela_hdr->sh_addralign = 0;
+ rela_hdr->size = 0;
}
- for (shindex = 0; shindex < i_ehdrp->e_shnum; shindex++)
+ if (asect->flags & SEC_ALLOC)
{
- if (bfd_read ((PTR) & x_shdr, sizeof x_shdr, 1, abfd)
- != sizeof (x_shdr))
+ this_hdr->sh_flags |= SHF_ALLOC;
+ if (asect->flags & SEC_LOAD)
{
- bfd_error = system_call_error;
- return NULL;
+ /* @@ Do something with sh_type? */
}
- elf_swap_shdr_in (abfd, &x_shdr, i_shdrp + shindex);
}
+ if (!(asect->flags & SEC_READONLY))
+ this_hdr->sh_flags |= SHF_WRITE;
- elf_elfsections (abfd) = i_shdrp;
+ if (asect->flags & SEC_CODE)
+ this_hdr->sh_flags |= SHF_EXECINSTR;
+}
- /* Read in the string table containing the names of the sections. We
- will need the base pointer to this table later. */
- /* We read this inline now, so that we don't have to go through
- bfd_section_from_shdr with it (since this particular strtab is
- used to find all of the ELF section names.) */
+void
+write_relocs (abfd, sec, xxx)
+ bfd *abfd;
+ asection *sec;
+ PTR xxx;
+{
+ Elf_Internal_Shdr *rela_hdr;
+ Elf_External_Rela *outbound_relocas;
+ Elf_External_Rel *outbound_relocs;
+ int idx;
+ int use_rela_p = get_elf_backend_data (abfd)->use_rela_p;
+ asymbol *last_sym = 0;
+ int last_sym_idx;
- shstrtab = elf_get_str_section (abfd, i_ehdrp->e_shstrndx);
- if (!shstrtab)
- return NULL;
+ if ((sec->flags & SEC_RELOC) == 0)
+ return;
+ /* Flags are sometimes inconsistent. */
+ if (sec->reloc_count == 0)
+ return;
- /* Once all of the section headers have been read and converted, we
- can start processing them. Note that the first section header is
- a dummy placeholder entry, so we ignore it.
+ rela_hdr = &elf_section_data (sec)->rel_hdr;
- We also watch for the symbol table section and remember the file
- offset and section size for both the symbol table section and the
- associated string table section. */
+ rela_hdr->sh_size = rela_hdr->sh_entsize * sec->reloc_count;
+ rela_hdr->contents = (void *) bfd_alloc (abfd, rela_hdr->sh_size);
- for (shindex = 1; shindex < i_ehdrp->e_shnum; shindex++)
+ /* orelocation has the data, reloc_count has the count... */
+ if (use_rela_p)
{
- bfd_section_from_shdr (abfd, shindex);
+ outbound_relocas = (Elf_External_Rela *) rela_hdr->contents;
+
+ for (idx = 0; idx < sec->reloc_count; idx++)
+ {
+ Elf_Internal_Rela dst_rela;
+ Elf_External_Rela *src_rela;
+ arelent *ptr;
+ asymbol *sym;
+ int n;
+
+ ptr = sec->orelocation[idx];
+ src_rela = outbound_relocas + idx;
+ if (!(abfd->flags & EXEC_P))
+ dst_rela.r_offset = ptr->address - sec->vma;
+ else
+ dst_rela.r_offset = ptr->address;
+
+ sym = *ptr->sym_ptr_ptr;
+ if (sym == last_sym)
+ n = last_sym_idx;
+ else
+ {
+ last_sym = sym;
+ last_sym_idx = n = elf_symbol_from_bfd_symbol (abfd, &sym);
+ }
+ dst_rela.r_info = ELF_R_INFO (n, ptr->howto->type);
+
+ dst_rela.r_addend = ptr->addend;
+ elf_swap_reloca_out (abfd, &dst_rela, src_rela);
+ }
}
+ else
+ /* REL relocations */
+ {
+ outbound_relocs = (Elf_External_Rel *) rela_hdr->contents;
- /* Remember the entry point specified in the ELF file header. */
+ for (idx = 0; idx < sec->reloc_count; idx++)
+ {
+ Elf_Internal_Rel dst_rel;
+ Elf_External_Rel *src_rel;
+ arelent *ptr;
+ int n;
+ asymbol *sym;
+
+ ptr = sec->orelocation[idx];
+ sym = *ptr->sym_ptr_ptr;
+ src_rel = outbound_relocs + idx;
+ if (!(abfd->flags & EXEC_P))
+ dst_rel.r_offset = ptr->address - sec->vma;
+ else
+ dst_rel.r_offset = ptr->address;
- bfd_get_start_address (abfd) = i_ehdrp->e_entry;
+ if (sym == last_sym)
+ n = last_sym_idx;
+ else
+ {
+ last_sym = sym;
+ last_sym_idx = n = elf_symbol_from_bfd_symbol (abfd, &sym);
+ }
+ dst_rel.r_info = ELF_R_INFO (n, ptr->howto->type);
- return abfd->xvec;
+ elf_swap_reloc_out (abfd, &dst_rel, src_rel);
+
+ /* Update the addend -- FIXME add 64 bit support. */
+ bfd_put_32 (abfd, ptr->addend,
+ (unsigned char *) (elf_section_data (sec)->this_hdr.contents)
+ + dst_rel.r_offset);
+ }
+ }
}
-/*
- Takes a bfd and a symbol, returns a pointer to the elf specific area
- of the symbol if there is one.
- */
-static INLINE elf_symbol_type *
-DEFUN (elf_symbol_from, (ignore_abfd, symbol),
- bfd * ignore_abfd AND
- asymbol * symbol)
+static void
+fix_up_strtabs (abfd, asect, obj)
+ bfd *abfd;
+ asection *asect;
+ PTR obj;
{
- if (symbol->the_bfd->xvec->flavour != bfd_target_elf_flavour)
- return 0;
+ Elf_Internal_Shdr *this_hdr = &elf_section_data (asect)->this_hdr;
+ int this_idx = elf_section_data(asect)->this_idx;
- if (symbol->the_bfd->tdata.elf_obj_data == (struct elf_obj_tdata *) NULL)
- return 0;
+ /* @@ Check flags! */
+ if (!strncmp (asect->name, ".stab", 5)
+ && !strcmp ("str", asect->name + strlen (asect->name) - 3))
+ {
+ size_t len = strlen (asect->name) + 1;
+ char *s = (char *) alloca (len);
+ strcpy (s, asect->name);
+ s[len - 4] = 0;
+ asect = bfd_get_section_by_name (abfd, s);
+ if (!asect)
+ abort ();
+ elf_section_data(asect)->this_hdr.sh_link = this_idx;
- return (elf_symbol_type *) symbol;
+ /* @@ Assuming 32 bits! */
+ this_hdr->sh_entsize = 0xc;
+ }
}
-/* Core files are simply standard ELF formatted files that partition
- the file using the execution view of the file (program header table)
- rather than the linking view. In fact, there is no section header
- table in a core file.
+static void
+DEFUN (elf_fake_sections, (abfd, asect, obj),
+ bfd * abfd AND
+ asection * asect AND
+ PTR obj)
+{
+ /* most of what is in bfd_shdr_from_section goes in here... */
+ /* and all of these sections generate at *least* one ELF section. */
- The process status information (including the contents of the general
- register set) and the floating point register set are stored in a
- segment of type PT_NOTE. We handcraft a couple of extra bfd sections
- that allow standard bfd access to the general registers (.reg) and the
- floating point registers (.reg2).
+ Elf_Internal_Shdr *this_hdr;
+ this_hdr = &elf_section_data (asect)->this_hdr;
+ this_hdr->sh_name =
+ bfd_add_to_strtab (abfd, elf_shstrtab (abfd), asect->name);
+ /* We need to log the type *now* so that elf_section_from_bfd_section
+ can find us... have to set rawdata too. */
+ this_hdr->rawdata = (void *) asect;
+ this_hdr->sh_addralign = 1 << asect->alignment_power;
+ if ((asect->flags & SEC_ALLOC) && (asect->flags & SEC_LOAD))
+ this_hdr->sh_type = SHT_PROGBITS;
+ /* @@ Select conditions correctly! */
+ else if (!strcmp (asect->name, ".bss"))
+ this_hdr->sh_type = SHT_NOBITS;
+ else
+ /* what *do* we put here? */
+ this_hdr->sh_type = SHT_PROGBITS;
+
+ this_hdr->sh_flags = 0;
+ this_hdr->sh_addr = 0;
+ this_hdr->sh_size = 0;
+ this_hdr->sh_entsize = 0;
+ this_hdr->sh_info = 0;
+ this_hdr->sh_link = 0;
+ this_hdr->sh_offset = 0;
+ this_hdr->size = 0;
- */
+ {
+ /* Emit a strtab and symtab, and possibly a reloc section. */
+ Elf_Internal_Shdr *rela_hdr;
+ Elf_Internal_Shdr *symstrtab_hdr;
-bfd_target *
-DEFUN (elf_core_file_p, (abfd), bfd * abfd)
-{
- Elf_External_Ehdr x_ehdr; /* Elf file header, external form */
- Elf_Internal_Ehdr *i_ehdrp; /* Elf file header, internal form */
- Elf_External_Phdr x_phdr; /* Program header table entry, external form */
- Elf_Internal_Phdr *i_phdrp; /* Program header table, internal form */
- unsigned int phindex;
+ /* Note that only one symtab is used, so just remember it
+ for now. */
- /* Read in the ELF header in external format. */
+ if (asect->flags & SEC_RELOC)
+ {
+ int use_rela_p = get_elf_backend_data (abfd)->use_rela_p;
- if (bfd_read ((PTR) & x_ehdr, sizeof (x_ehdr), 1, abfd) != sizeof (x_ehdr))
+ rela_hdr = &elf_section_data (asect)->rel_hdr;
+ rela_hdr->sh_name =
+ bfd_add_2_to_strtab (abfd, elf_shstrtab (abfd),
+ use_rela_p ? ".rela" : ".rel",
+ asect->name);
+ rela_hdr->sh_type = use_rela_p ? SHT_RELA : SHT_REL;
+ rela_hdr->sh_entsize = (use_rela_p
+ ? sizeof (Elf_External_Rela)
+ : sizeof (Elf_External_Rel));
+
+ rela_hdr->sh_flags = 0;
+ rela_hdr->sh_addr = 0;
+ rela_hdr->sh_size = 0;
+ rela_hdr->sh_offset = 0;
+ rela_hdr->sh_addralign = 0;
+ rela_hdr->size = 0;
+ }
+ }
+ if (asect->flags & SEC_ALLOC)
{
- bfd_error = system_call_error;
- return NULL;
+ this_hdr->sh_flags |= SHF_ALLOC;
+ if (asect->flags & SEC_LOAD)
+ {
+ /* @@ Do something with sh_type? */
+ }
}
-
- /* Now check to see if we have a valid ELF file, and one that BFD can
- make use of. The magic number must match, the address size ('class')
- and byte-swapping must match our XVEC entry, and it must have a
- program header table (FIXME: See comments re segments at top of this
- file). */
-
- if (elf_file_p (&x_ehdr) == false)
- {
- wrong:
- bfd_error = wrong_format;
- return NULL;
- }
-
- /* FIXME, Check EI_VERSION here ! */
-
- switch (x_ehdr.e_ident[EI_CLASS])
- {
- case ELFCLASSNONE: /* address size not specified */
- goto wrong; /* No support if can't tell address size */
- case ELFCLASS32: /* 32-bit addresses */
- break;
- case ELFCLASS64: /* 64-bit addresses */
- goto wrong; /* FIXME: 64 bits not yet supported */
- default:
- goto wrong; /* No support if unknown address class */
- }
-
- /* Switch xvec to match the specified byte order. */
- switch (x_ehdr.e_ident[EI_DATA])
- {
- case ELFDATA2MSB: /* Big-endian */
- if (abfd->xvec->byteorder_big_p == false)
- goto wrong;
- break;
- case ELFDATA2LSB: /* Little-endian */
- if (abfd->xvec->byteorder_big_p == true)
- goto wrong;
- break;
- case ELFDATANONE: /* No data encoding specified */
- default: /* Unknown data encoding specified */
- goto wrong;
- }
-
- /* Allocate an instance of the elf_obj_tdata structure and hook it up to
- the tdata pointer in the bfd. */
-
- elf_tdata (abfd) =
- (struct elf_obj_tdata *) bfd_zalloc (abfd, sizeof (struct elf_obj_tdata));
- if (elf_tdata (abfd) == NULL)
- {
- bfd_error = no_memory;
- return NULL;
- }
-
- /* FIXME, `wrong' returns from this point onward, leak memory. */
-
- /* Now that we know the byte order, swap in the rest of the header */
- i_ehdrp = elf_elfheader (abfd);
- elf_swap_ehdr_in (abfd, &x_ehdr, i_ehdrp);
-
- /* If there is no program header, or the type is not a core file, then
- we are hosed. */
- if (i_ehdrp->e_phoff == 0 || i_ehdrp->e_type != ET_CORE)
- goto wrong;
-
- /* Allocate space for a copy of the program header table in
- internal form, seek to the program header table in the file,
- read it in, and convert it to internal form. As a simple sanity
- check, verify that the what BFD thinks is the size of each program
- header table entry actually matches the size recorded in the file. */
-
- if (i_ehdrp->e_phentsize != sizeof (x_phdr))
- goto wrong;
- i_phdrp = (Elf_Internal_Phdr *)
- bfd_alloc (abfd, sizeof (*i_phdrp) * i_ehdrp->e_phnum);
- if (!i_phdrp)
- {
- bfd_error = no_memory;
- return NULL;
- }
- if (bfd_seek (abfd, i_ehdrp->e_phoff, SEEK_SET) == -1)
- {
- bfd_error = system_call_error;
- return NULL;
- }
- for (phindex = 0; phindex < i_ehdrp->e_phnum; phindex++)
- {
- if (bfd_read ((PTR) & x_phdr, sizeof (x_phdr), 1, abfd)
- != sizeof (x_phdr))
- {
- bfd_error = system_call_error;
- return NULL;
- }
- elf_swap_phdr_in (abfd, &x_phdr, i_phdrp + phindex);
- }
-
- /* Once all of the program headers have been read and converted, we
- can start processing them. */
-
- for (phindex = 0; phindex < i_ehdrp->e_phnum; phindex++)
- {
- bfd_section_from_phdr (abfd, i_phdrp + phindex, phindex);
- if ((i_phdrp + phindex)->p_type == PT_NOTE)
- {
- elf_corefile_note (abfd, i_phdrp + phindex);
- }
- }
-
- /* Remember the entry point specified in the ELF file header. */
-
- bfd_get_start_address (abfd) = i_ehdrp->e_entry;
-
- return abfd->xvec;
-}
-
-boolean
-DEFUN (elf_mkobject, (abfd), bfd * abfd)
-{
- /* this just does initialization */
- /* coff_mkobject zalloc's space for tdata.coff_obj_data ... */
- elf_tdata (abfd) = (struct elf_obj_tdata *)
- bfd_zalloc (abfd, sizeof (struct elf_obj_tdata));
- if (elf_tdata (abfd) == 0)
- {
- bfd_error = no_memory;
- return false;
- }
- /* since everything is done at close time, do we need any
- initialization? */
-
- return true;
-}
-
-/*
- Create ELF output from BFD sections.
-
- Essentially, just create the section header and forget about the program
- header for now.
-
-*/
-
-static int
-elf_idx_of_sym (abfd, sym)
- bfd *abfd;
- asymbol *sym;
-{
- int i;
- for (i = 0; i < abfd->symcount; i++)
- {
- if (sym == (asymbol *) abfd->outsymbols[i])
- {
- /* sanity check */
- BFD_ASSERT ((strcmp (sym->name, abfd->outsymbols[i]->name) == 0)
- || (strlen (sym->name) == 0));
- return i + 1;
- }
- }
- return STN_UNDEF;
-}
-
-static void
-DEFUN (elf_make_sections, (abfd, asect, obj),
- bfd * abfd AND
- asection * asect AND
- PTR obj)
-{
- elf_sect_thunk *thunk = (elf_sect_thunk *) obj;
- /* most of what is in bfd_shdr_from_section goes in here... */
- /* and all of these sections generate at *least* one ELF section. */
- int this_section;
- int idx;
-
- /* check if we're making a PROGBITS section... */
- /* if ((asect->flags & SEC_ALLOC) && (asect->flags & SEC_LOAD)) */
- /* this was too strict... what *do* we want to check here? */
- if (1)
- {
- Elf_Internal_Shdr *this_hdr;
- this_section = elf_section_from_bfd_section (abfd, asect);
- this_hdr = &thunk->i_shdrp[this_section];
-
- this_hdr->sh_addr = asect->vma;
- this_hdr->sh_size = asect->_raw_size;
- /* contents already set by elf_set_section_contents */
-
- if (asect->flags & SEC_RELOC)
- {
- /* emit a reloc section, and thus strtab and symtab... */
- Elf_Internal_Shdr *rela_hdr;
- Elf_Internal_Shdr *symtab_hdr;
- Elf_External_Rela *outbound_relocas;
- Elf_External_Rel *outbound_relocs;
- int rela_section;
- int use_rela_p = get_elf_backend_data (abfd)->use_rela_p;
-
- symtab_hdr = &thunk->i_shdrp[thunk->symtab_section];
-
- if (thunk->symtab_section == this_section + 1)
- rela_section = thunk->symtab_section + 2; /* symtab + symstrtab */
- else
- rela_section = this_section + 1;
- rela_hdr = &thunk->i_shdrp[rela_section];
- rela_hdr->sh_link = thunk->symtab_section;
- rela_hdr->sh_info = this_section;
-
- /* orelocation has the data, reloc_count has the count... */
- if (use_rela_p)
- {
- rela_hdr->sh_type = SHT_RELA;
- rela_hdr->sh_entsize = sizeof (Elf_External_Rela);
- rela_hdr->sh_size = rela_hdr->sh_entsize * asect->reloc_count;
- outbound_relocas = (Elf_External_Rela *) bfd_alloc (abfd, rela_hdr->sh_size);
-
- for (idx = 0; idx < asect->reloc_count; idx++)
- {
- Elf_Internal_Rela dst_rela;
- Elf_External_Rela *src_rela;
- arelent *ptr;
-
- ptr = asect->orelocation[idx];
- src_rela = outbound_relocas + idx;
- if (!(abfd->flags & EXEC_P))
- dst_rela.r_offset = ptr->address - asect->vma;
- else
- dst_rela.r_offset = ptr->address;
-
- dst_rela.r_info
- = ELF32_R_INFO (elf_symbol_from_bfd_symbol (abfd, ptr->sym_ptr_ptr),
- ptr->howto->type);
-
- dst_rela.r_addend = ptr->addend;
- elf_swap_reloca_out (abfd, &dst_rela, src_rela);
- }
-
- rela_hdr->contents = (void *) outbound_relocas;
- }
- else
- /* REL relocations */
- {
- rela_hdr->sh_type = SHT_REL;
- rela_hdr->sh_entsize = sizeof (Elf_External_Rel);
- rela_hdr->sh_size = rela_hdr->sh_entsize * asect->reloc_count;
- outbound_relocs = (Elf_External_Rel *)
- bfd_alloc (abfd, rela_hdr->sh_size);
-
- for (idx = 0; idx < asect->reloc_count; idx++)
- {
- Elf_Internal_Rel dst_rel;
- Elf_External_Rel *src_rel;
- arelent *ptr;
-
- ptr = asect->orelocation[idx];
- src_rel = outbound_relocs + idx;
- if (!(abfd->flags & EXEC_P))
- dst_rel.r_offset = ptr->address - asect->vma;
- else
- dst_rel.r_offset = ptr->address;
-
- dst_rel.r_info
- = ELF32_R_INFO (elf_symbol_from_bfd_symbol (abfd, ptr->sym_ptr_ptr),
- ptr->howto->type);
-
- elf_swap_reloc_out (abfd, &dst_rel, src_rel);
-
- /* Update the addend -- FIXME add 64 bit support. */
-#ifdef DEBUG
- fprintf (stderr, "Updating addend: 0x%.8lx = %d, this_section = %d\n",
- (long) ((unsigned char *) (elf_elfsections (abfd)[this_section].contents)
- + dst_rel.r_offset), ptr->addend, this_section);
-#endif
-
- bfd_put_32 (abfd, ptr->addend,
- (unsigned char *) (elf_elfsections (abfd)[this_section].contents)
- + dst_rel.r_offset);
- }
- rela_hdr->contents = (void *) outbound_relocs;
- }
- }
- if (asect->flags & SEC_ALLOC)
- {
- this_hdr->sh_flags |= SHF_ALLOC;
- if (asect->flags & SEC_LOAD)
- {
- /* @@ Do something with sh_type? */
- }
- }
- if (!(asect->flags & SEC_READONLY))
- this_hdr->sh_flags |= SHF_WRITE;
-
- if (asect->flags & SEC_CODE)
- this_hdr->sh_flags |= SHF_EXECINSTR;
- }
-}
-
-static void
-DEFUN (elf_fake_sections, (abfd, asect, obj),
- bfd * abfd AND
- asection * asect AND
- PTR obj)
-{
- elf_sect_thunk *thunk = (elf_sect_thunk *) obj;
- /* most of what is in bfd_shdr_from_section goes in here... */
- /* and all of these sections generate at *least* one ELF section. */
- int this_section;
-
- /* check if we're making a PROGBITS section... */
- /* if ((asect->flags & SEC_ALLOC) && (asect->flags & SEC_LOAD)) */
- /* this was too strict... what *do* we want to check here? */
- if (1)
- {
- Elf_Internal_Shdr *this_hdr;
- this_section = thunk->i_ehdr->e_shnum++;
- this_hdr = &thunk->i_shdrp[this_section];
- this_hdr->sh_name =
- bfd_add_to_strtab (abfd, thunk->shstrtab, asect->name);
- /* we need to log the type *now* so that elf_section_from_bfd_section
- can find us... have to set rawdata too. */
- this_hdr->rawdata = (void *) asect;
- this_hdr->sh_addralign = asect->alignment_power;
- if ((asect->flags & SEC_ALLOC) && (asect->flags & SEC_LOAD))
- this_hdr->sh_type = SHT_PROGBITS;
- /* @@ Select conditions correctly! */
- else if (!strcmp (asect->name, ".bss"))
- this_hdr->sh_type = SHT_NOBITS;
- else
- /* what *do* we put here? */
- this_hdr->sh_type = SHT_PROGBITS;
-
-
- {
- /* Emit a strtab and symtab, and possibly a reloc section. */
- Elf_Internal_Shdr *rela_hdr;
- Elf_Internal_Shdr *symtab_hdr;
- Elf_Internal_Shdr *symstrtab_hdr;
- int rela_section;
- int symstrtab_section;
-
- /* Note that only one symtab is used, so just remember it
- for now. */
- if (!thunk->symtab_section)
- {
- thunk->symtab_section = thunk->i_ehdr->e_shnum++;
- symtab_hdr = &thunk->i_shdrp[thunk->symtab_section];
- symtab_hdr->sh_name =
- bfd_add_to_strtab (abfd, thunk->shstrtab, ".symtab");
- symtab_hdr->sh_type = SHT_SYMTAB;
- symtab_hdr->sh_entsize = sizeof (Elf_External_Sym);
-
- symstrtab_section = thunk->i_ehdr->e_shnum++;
- BFD_ASSERT (symstrtab_section == thunk->symtab_section + 1);
- symstrtab_hdr = &thunk->i_shdrp[symstrtab_section];
- symtab_hdr->sh_link = symstrtab_section;
- symstrtab_hdr->sh_name =
- bfd_add_to_strtab (abfd, thunk->shstrtab, ".strtab");
- symstrtab_hdr->sh_type = SHT_STRTAB;
-
- symtab_hdr->contents = 0;
- symstrtab_hdr->contents = 0;
- symstrtab_hdr->sh_size = 0;
- }
- else
- symtab_hdr = &thunk->i_shdrp[thunk->symtab_section];
-
- if (asect->flags & SEC_RELOC)
- {
- int use_rela_p = get_elf_backend_data (abfd)->use_rela_p;
-
- rela_section = thunk->i_ehdr->e_shnum++;
- rela_hdr = &thunk->i_shdrp[rela_section];
- rela_hdr->sh_name =
- bfd_add_2_to_strtab (abfd, thunk->shstrtab,
- use_rela_p ? ".rela" : ".rel",
- asect->name);
- rela_hdr->sh_type = use_rela_p ? SHT_RELA : SHT_REL;
- rela_hdr->sh_link = thunk->symtab_section;
- rela_hdr->sh_info = this_section;
- rela_hdr->sh_entsize = sizeof (Elf_External_Rela);
- }
- }
- if (asect->flags & SEC_ALLOC)
- {
- this_hdr->sh_flags |= SHF_ALLOC;
- if (asect->flags & SEC_LOAD)
- {
- /* @@ Do something with sh_type? */
- }
- }
- if (!(asect->flags & SEC_READONLY))
- this_hdr->sh_flags |= SHF_WRITE;
- if (asect->flags & SEC_CODE)
- this_hdr->sh_flags |= SHF_EXECINSTR;
- }
-}
+ if (!(asect->flags & SEC_READONLY))
+ this_hdr->sh_flags |= SHF_WRITE;
+ if (asect->flags & SEC_CODE)
+ this_hdr->sh_flags |= SHF_EXECINSTR;
+}
/*
name of a BFD section.
*/
-struct elf32_internal_shdr *
-DEFUN (bfd_elf_locate_sh, (abfd, strtab, shdrp, name),
+static struct elfNAME (internal_shdr) *
+DEFUN (elf_locate_sh, (abfd, strtab, shdrp, name),
bfd * abfd AND
struct strtab *strtab AND
- struct elf32_internal_shdr *shdrp AND
+ struct elfNAME (internal_shdr) *shdrp AND
CONST char *name)
{
Elf_Internal_Shdr *gotit = NULL;
/* Map symbol from it's internal number to the external number, moving
all local symbols to be at the head of the list. */
-static boolean
+static INLINE int
+sym_is_global (sym)
+ asymbol *sym;
+{
+ if (sym->flags & BSF_GLOBAL)
+ {
+ if (sym->flags & BSF_LOCAL)
+ abort ();
+ return 1;
+ }
+ if (sym->section == &bfd_und_section)
+ return 1;
+ if (bfd_is_com_section (sym->section))
+ return 1;
+ if (sym->flags & (BSF_LOCAL | BSF_SECTION_SYM | BSF_FILE))
+ return 0;
+ return 0;
+}
+
+static void
DEFUN (elf_map_symbols, (abfd), bfd * abfd)
{
int symcount = bfd_get_symcount (abfd);
asymbol **syms = bfd_get_outsymbols (abfd);
- flagword flags;
int num_locals = 0;
int num_globals = 0;
int num_locals2 = 0;
are actually relocated against. */
for (asect = abfd->sections; asect; asect = asect->next)
{
- if (asect->flags & (SEC_LOAD | SEC_DATA | SEC_CODE))
+ if (/*asect->flags & (SEC_LOAD | SEC_DATA | SEC_CODE)*/1)
num_sections++;
}
for (asect = abfd->sections; asect; asect = asect->next)
{
- if (asect->flags & (SEC_LOAD | SEC_DATA | SEC_CODE))
+ if (/* asect->flags & (SEC_LOAD | SEC_DATA | SEC_CODE) */ 1)
{
asymbol *sym = syms[symcount++] = bfd_make_empty_symbol (abfd);
sym->the_bfd = abfd;
/* Identify and classify all of the symbols. */
for (idx = 0; idx < symcount; idx++)
{
- flags = syms[idx]->flags;
- if (flags & (BSF_LOCAL | BSF_SECTION_SYM | BSF_FILE))
+ if (!sym_is_global (syms[idx]))
num_locals++;
else
num_globals++;
dummy symbol. */
for (idx = 0; idx < symcount; idx++)
{
- flags = syms[idx]->flags;
- if (flags & (BSF_LOCAL | BSF_SECTION_SYM | BSF_FILE))
+ if (!sym_is_global (syms[idx]))
symtab_map[idx] = 1 + num_locals2++;
else
symtab_map[idx] = 1 + num_locals + num_globals2++;
elf_num_globals (abfd) = num_globals;
}
+static void assign_section_numbers ();
+static void assign_file_positions_except_relocs ();
static boolean
DEFUN (elf_compute_section_file_positions, (abfd), bfd * abfd)
Elf_Internal_Shdr *i_shdrp; /* Section header table, internal form */
struct strtab *shstrtab;
int count, maxsections;
- elf_sect_thunk est;
-
- if (!elf_shstrtab (abfd))
- {
- i_ehdrp = elf_elfheader (abfd); /* build new header in tdata memory */
- shstrtab = bfd_new_strtab (abfd);
-
- i_ehdrp->e_ident[EI_MAG0] = ELFMAG0;
- i_ehdrp->e_ident[EI_MAG1] = ELFMAG1;
- i_ehdrp->e_ident[EI_MAG2] = ELFMAG2;
- i_ehdrp->e_ident[EI_MAG3] = ELFMAG3;
-
- i_ehdrp->e_ident[EI_CLASS] = ELFCLASS32; /* FIXME: find out from bfd */
- i_ehdrp->e_ident[EI_DATA] =
- abfd->xvec->byteorder_big_p ? ELFDATA2MSB : ELFDATA2LSB;
- i_ehdrp->e_ident[EI_VERSION] = EV_CURRENT;
-
- for (count = EI_PAD; count < EI_NIDENT; count++)
- i_ehdrp->e_ident[count] = 0;
-
- i_ehdrp->e_type = (abfd->flags & EXEC_P) ? ET_EXEC : ET_REL;
- switch (bfd_get_arch (abfd))
- {
- case bfd_arch_unknown:
- i_ehdrp->e_machine = EM_NONE;
- break;
- case bfd_arch_sparc:
- i_ehdrp->e_machine = EM_SPARC;
- break;
- case bfd_arch_i386:
- i_ehdrp->e_machine = EM_386;
- break;
- case bfd_arch_m68k:
- i_ehdrp->e_machine = EM_68K;
- break;
- case bfd_arch_m88k:
- i_ehdrp->e_machine = EM_88K;
- break;
- case bfd_arch_i860:
- i_ehdrp->e_machine = EM_860;
- break;
- case bfd_arch_mips: /* MIPS Rxxxx */
- i_ehdrp->e_machine = EM_MIPS; /* only MIPS R3000 */
- break;
- case bfd_arch_hppa:
- i_ehdrp->e_machine = EM_HPPA;
- break;
- /* also note that EM_M32, AT&T WE32100 is unknown to bfd */
- default:
- i_ehdrp->e_machine = EM_NONE;
- }
- i_ehdrp->e_version = EV_CURRENT;
- i_ehdrp->e_ehsize = sizeof (Elf_External_Ehdr);
-
- /* no program header, for now. */
- i_ehdrp->e_phoff = 0;
- i_ehdrp->e_phentsize = 0;
- i_ehdrp->e_phnum = 0;
-
- /* each bfd section is section header entry */
- i_ehdrp->e_entry = bfd_get_start_address (abfd);
- i_ehdrp->e_shentsize = sizeof (Elf_External_Shdr);
-
- /* figure at most each section can have a rel, strtab, symtab */
- maxsections = 4 * bfd_count_sections (abfd) + 2;
- i_ehdrp->e_shoff = i_ehdrp->e_ehsize;
-
- /* and we'll just have to fix up the offsets later. */
- /* outbase += i_ehdr.e_shentsize * i_ehdr.e_shnum; */
-
- i_shdrp = (Elf_Internal_Shdr *)
- bfd_alloc (abfd, sizeof (*i_shdrp) * maxsections);
- if (!i_shdrp)
- {
- bfd_error = no_memory;
- return false;
- }
- for (count = 0; count < maxsections; count++)
- {
- i_shdrp[count].rawdata = 0;
- i_shdrp[count].contents = 0;
- }
+ bfd_map_over_sections (abfd, elf_fake_sections, 0);
+ assign_section_numbers (abfd);
- i_shdrp[0].sh_name = 0;
- i_shdrp[0].sh_type = SHT_NULL;
- i_shdrp[0].sh_flags = 0;
- i_shdrp[0].sh_addr = 0;
- i_shdrp[0].sh_offset = 0;
- i_shdrp[0].sh_size = 0;
- i_shdrp[0].sh_link = SHN_UNDEF;
- i_shdrp[0].sh_info = 0;
- i_shdrp[0].sh_addralign = 0;
- i_shdrp[0].sh_entsize = 0;
+ bfd_map_over_sections (abfd, elf_make_sections, 0);
- i_ehdrp->e_shnum = 1;
+ bfd_map_over_sections (abfd, fix_up_strtabs, 0); /* .stab/.stabstr &c */
- elf_elfsections (abfd) = i_shdrp;
- elf_shstrtab (abfd) = shstrtab;
- }
- est.i_ehdr = elf_elfheader (abfd);
- est.i_shdrp = elf_elfsections (abfd);
- est.shstrtab = elf_shstrtab (abfd);
- est.symtab_section = 0; /* elf_fake_sections fills it in */
+ swap_out_syms (abfd);
- elf_map_symbols (abfd);
- bfd_map_over_sections (abfd, elf_fake_sections, &est);
- {
- asection *secp;
- asection *psecp = (asection *) 0;
- int idx;
- Elf_Internal_Shdr *shp;
+ assign_file_positions_except_relocs (abfd);
- for (idx = 0, secp = abfd->sections; secp; idx++, secp = secp->next)
- {
- if (psecp == (asection *) 0)
- {
- secp->filepos = est.i_ehdr->e_shoff + (est.i_ehdr->e_shnum + 1) * sizeof (Elf_External_Shdr);
- }
- else
- {
- secp->filepos = psecp->filepos + psecp->_cooked_size;
- }
- shp = bfd_elf_locate_sh (abfd, est.shstrtab, est.i_shdrp, secp->name);
- if (shp)
- shp->sh_offset = secp->filepos;
- psecp = secp;
- }
- }
- elf_onesymtab (abfd) = est.symtab_section;
return true;
}
Elf32_Half phdr_cnt)
{
/* first program header entry goes after the file header */
- int outbase = i_ehdrp->e_ehsize;
+ int outbase = i_ehdrp->e_phoff;
int i;
Elf_External_Phdr x_phdr;
return true;
}
+#if 0
static Elf_Internal_Phdr *
DEFUN (elf_build_phdrs, (abfd, i_ehdrp, i_shdrp, phdr_cnt),
bfd * abfd AND
/* F. Set up the "end of program header table" sentinel. */
- bzero ((char *) (phdr_buf + idx), sizeof (Elf_Internal_Phdr));
+ memset ((char *) (phdr_buf + idx), 0, sizeof (Elf_Internal_Phdr));
idx++;
BFD_ASSERT (idx - 1 == *phdr_cnt);
return phdr_buf;
}
+#endif
-boolean
-DEFUN (elf_write_object_contents, (abfd), bfd * abfd)
-{
- Elf_External_Ehdr x_ehdr; /* Elf file header, external form */
- Elf_Internal_Ehdr *i_ehdrp; /* Elf file header, internal form */
- Elf_Internal_Phdr *i_phdrp = 0; /* Program header table, internal form */
- Elf_External_Shdr *x_shdrp; /* Section header table, external form */
- Elf_Internal_Shdr *i_shdrp; /* Section header table, internal form */
- asection *nsect;
- elf_sect_thunk est;
+static const Elf_Internal_Shdr null_shdr;
- int outbase = 0;
- int count;
- int scnt;
- struct strtab *shstrtab;
+/* Assign all ELF section numbers. The dummy first section is handled here
+ too. The link/info pointers for the standard section types are filled
+ in here too, while we're at it. (Link pointers for .stab sections are
+ not filled in here.) */
+static void
+assign_section_numbers (abfd)
+ bfd *abfd;
+{
+ struct elf_obj_tdata *t = elf_tdata (abfd);
+ asection *sec;
+ int section_number = 1;
+ int i;
+ Elf_Internal_Shdr **i_shdrp;
- if (abfd->output_has_begun == false)
+ t->shstrtab_hdr.sh_size = elf_shstrtab(abfd)->length;
+ t->shstrtab_hdr.contents = (void *) elf_shstrtab(abfd)->tab;
+ shstrtab_length_fixed = 1;
+
+ t->shstrtab_section = section_number++;
+ elf_elfheader(abfd)->e_shstrndx = t->shstrtab_section;
+ if (abfd->symcount)
{
- elf_compute_section_file_positions (abfd);
- abfd->output_has_begun = true;
+ t->symtab_section = section_number++;
+ t->strtab_section = section_number++;
+ t->symtab_hdr.sh_link = t->strtab_section;
+ }
+ for (sec = abfd->sections; sec; sec = sec->next)
+ {
+ struct bfd_elf_section_data *d = elf_section_data (sec);
+ d->this_idx = section_number++;
+ if (sec->flags & SEC_RELOC)
+ {
+ d->rel_idx = section_number++;
+ d->rel_hdr.sh_link = t->symtab_section;
+ d->rel_hdr.sh_info = d->this_idx;
+ }
+ else
+ d->rel_idx = 0;
+ /* No handling for per-section string tables currently. */
+ }
+ elf_elfheader(abfd)->e_shnum = section_number;
+
+ /* Set up the list of section header pointers, in agreement with the
+ indices. */
+ i_shdrp = (Elf_Internal_Shdr **)
+ bfd_alloc (abfd, section_number * sizeof (Elf_Internal_Shdr *));
+ elf_elfsections(abfd) = i_shdrp;
+ for (i = 0; i < section_number; i++)
+ i_shdrp[i] = 0;
+
+ i_shdrp[0] = (Elf_Internal_Shdr *) &null_shdr;
+ i_shdrp[t->shstrtab_section] = &t->shstrtab_hdr;
+ if (abfd->symcount)
+ {
+ i_shdrp[t->symtab_section] = &t->symtab_hdr;
+ i_shdrp[t->strtab_section] = &t->strtab_hdr;
+ }
+ for (sec = abfd->sections; sec; sec = sec->next)
+ {
+ struct bfd_elf_section_data *d = elf_section_data (sec);
+ i_shdrp[d->this_idx] = &d->this_hdr;
+ if (d->rel_idx)
+ i_shdrp[d->rel_idx] = &d->rel_hdr;
+ }
+ /* Make sure we got everything.... */
+ for (i = 0; i < section_number; i++)
+ if (i_shdrp[i] == 0)
+ abort ();
+}
+
+static INLINE file_ptr
+assign_file_position_for_section (i_shdrp, offset)
+ Elf_Internal_Shdr *i_shdrp;
+ file_ptr offset;
+{
+ i_shdrp->sh_offset = offset;
+ if (i_shdrp->sh_type != SHT_NOBITS)
+ offset += i_shdrp->sh_size;
+ return offset;
+}
+
+static INLINE file_ptr
+assign_file_positions_for_symtab_and_strtabs (abfd, off)
+ bfd *abfd;
+ file_ptr off;
+{
+ struct elf_obj_tdata *t = elf_tdata (abfd);
+
+ off = assign_file_position_for_section (&t->shstrtab_hdr, off);
+ off = assign_file_position_for_section (&t->symtab_hdr, off);
+ off = assign_file_position_for_section (&t->strtab_hdr, off);
+ return off;
+}
+
+struct seg_info {
+ bfd_vma low, mem_size;
+ file_ptr file_size;
+ int start_pos;
+ int sh_flags;
+ struct seg_info *next;
+};
+
+static void
+map_program_segments (abfd)
+ bfd *abfd;
+{
+ Elf_Internal_Shdr **i_shdrpp = elf_elfsections (abfd);
+ Elf_Internal_Ehdr *i_ehdrp = elf_elfheader (abfd);
+ Elf_Internal_Shdr *i_shdrp;
+ Elf_Internal_Phdr *phdr;
+ char *done;
+ int i, n_left = 0;
+ file_ptr lowest_offset = 0;
+ struct seg_info *seg = 0;
+
+ done = (char *) alloca (i_ehdrp->e_shnum);
+ memset (done, 0, i_ehdrp->e_shnum);
+ for (i = 0; i < i_ehdrp->e_shnum; i++)
+ {
+ i_shdrp = i_shdrpp[i];
+ /* If it's going to be mapped in, it's been assigned a position. */
+ if (i_shdrp->sh_offset + 1 == 0)
+ {
+ /* Well, not really, but we won't process it here. */
+ done[i] = 1;
+ continue;
+ }
+ if (i_shdrp->sh_offset < lowest_offset
+ || lowest_offset == 0)
+ lowest_offset = i_shdrp->sh_offset;
+ /* Only interested in PROGBITS or NOBITS for generating segments. */
+ switch (i_shdrp->sh_type)
+ {
+ case SHT_PROGBITS:
+ case SHT_NOBITS:
+ break;
+ default:
+ done[i] = 1;
+ }
+ if (!done[i])
+ n_left++;
+ }
+ while (n_left)
+ {
+ bfd_vma lowest_vma = -1, high;
+ int low_sec = 0;
+ int mem_size;
+ int file_size = 0;
+
+ for (i = 1; i < i_ehdrp->e_shnum; i++)
+ {
+ i_shdrp = i_shdrpp[i];
+ if (!done[i] && i_shdrp->sh_addr < lowest_vma)
+ {
+ lowest_vma = i_shdrp->sh_addr;
+ low_sec = i;
+ }
+ }
+ if (low_sec == 0)
+ abort ();
+ /* So now we know the lowest vma of any unassigned sections; start
+ a segment there. */
+ {
+ struct seg_info *s;
+ s = (struct seg_info *) bfd_alloc (abfd, sizeof (struct seg_info));
+ s->next = seg;
+ seg = s;
+ }
+ seg->low = lowest_vma;
+ i_shdrp = i_shdrpp[low_sec];
+ seg->start_pos = i_shdrp->sh_offset;
+ seg->sh_flags = i_shdrp->sh_flags;
+ done[low_sec] = 1, n_left--;
+ mem_size = i_shdrp->sh_size;
+ high = lowest_vma + i_shdrp->sh_size;
+
+ if (i_shdrp->sh_type == SHT_PROGBITS)
+ file_size = i_shdrp->sh_size;
+
+ for (i = 0; i < i_ehdrp->e_shnum; i++)
+ {
+ file_ptr f1;
+
+ if (file_size != mem_size)
+ break;
+ if (done[i])
+ continue;
+ i_shdrp = i_shdrpp[i];
+ /* position of next byte on disk */
+ f1 = seg->start_pos + file_size;
+ if (i_shdrp->sh_type == SHT_PROGBITS)
+ {
+ if (i_shdrp->sh_offset - f1 != i_shdrp->sh_addr - high)
+ continue;
+ }
+ else /* sh_type == NOBITS */
+ {
+ /* If the section in question has no contents in the disk
+ file, we really don't care where it supposedly starts.
+ But we don't want to bother merging it into this segment
+ if it doesn't start on this memory page. */
+ bfd_vma page1, page2;
+ bfd_vma maxpagesize = get_elf_backend_data (abfd)->maxpagesize;
+
+ /* page number in address space of current end of seg */
+ page1 = (high - 1 + maxpagesize - 1) / maxpagesize;
+ /* page number in address space of start of this section */
+ page2 = (i_shdrp->sh_addr + maxpagesize - 1) / maxpagesize;
+
+ if (page1 != page2)
+ continue;
+ }
+ done[i] = 1, n_left--;
+ if (i_shdrp->sh_type == SHT_PROGBITS)
+ file_size = i_shdrp->sh_offset + i_shdrp->sh_size - seg->start_pos;
+ mem_size = i_shdrp->sh_addr + i_shdrp->sh_size - seg->low;
+ high = i_shdrp->sh_addr + i_shdrp->sh_size;
+ i = 0;
+ }
+ seg->file_size = file_size;
+ seg->mem_size = mem_size;
+ }
+ /* Now do something with the list of segments we've built up. */
+ {
+ bfd_vma maxpagesize = get_elf_backend_data (abfd)->maxpagesize;
+ struct seg_info *s;
+ int n_segs = 0;
+ int sz;
+
+ for (s = seg; s; s = s->next)
+ {
+ n_segs++;
+ }
+ i_ehdrp->e_phentsize = sizeof (Elf_External_Phdr);
+ sz = sizeof (Elf_External_Phdr) * n_segs;
+ if (i_ehdrp->e_ehsize + sz <= lowest_offset)
+ i_ehdrp->e_phoff = i_ehdrp->e_ehsize;
+ else
+ {
+ i_ehdrp->e_phoff = elf_tdata (abfd)->next_file_pos;
+ elf_tdata (abfd)->next_file_pos += sz;
+ }
+ phdr = (Elf_Internal_Phdr*) bfd_alloc (abfd,
+ n_segs * sizeof (Elf_Internal_Phdr));
+ elf_tdata (abfd)->phdr = phdr;
+ while (seg)
+ {
+ phdr->p_type = PT_LOAD; /* only type we really support so far */
+ phdr->p_offset = seg->start_pos;
+ phdr->p_vaddr = seg->low;
+ phdr->p_paddr = 0;
+ phdr->p_filesz = seg->file_size;
+ phdr->p_memsz = seg->mem_size;
+ phdr->p_flags = PF_R;
+ phdr->p_align = maxpagesize; /* ? */
+ if (seg->sh_flags & SHF_WRITE)
+ phdr->p_flags |= PF_W;
+ if (seg->sh_flags & SHF_EXECINSTR)
+ phdr->p_flags |= PF_X;
+ phdr++;
+ seg = seg->next;
+ }
+ i_ehdrp->e_phnum = n_segs;
+ }
+ elf_write_phdrs (abfd, i_ehdrp, elf_tdata (abfd)->phdr, i_ehdrp->e_phnum);
+}
+
+static void
+assign_file_positions_except_relocs (abfd)
+ bfd *abfd;
+{
+ /* For now, we ignore the possibility of having program segments, which
+ may require some alignment in the file. That'll require padding, and
+ some interesting calculations to optimize file space usage.
+
+ Also, since the application may change the list of relocations for
+ a given section, we don't figure them in here. We'll put them at the
+ end of the file, at positions computed during bfd_close.
+
+ The order, for now: <ehdr> <shdr> <sec1> <sec2> <sec3> ... <rel1> ...
+ or: <ehdr> <phdr> <sec1> <sec2> ... <shdr> <rel1> ... */
+
+ file_ptr off;
+ int i;
+ Elf_Internal_Shdr **i_shdrpp = elf_elfsections (abfd);
+ Elf_Internal_Shdr *i_shdrp;
+ Elf_Internal_Ehdr *i_ehdrp = elf_elfheader (abfd);
+ int exec_p = (abfd->flags & EXEC_P) != 0;
+
+ /* Everything starts after the ELF file header. */
+ off = i_ehdrp->e_ehsize;
+
+ if (!exec_p)
+ {
+ /* Section headers. */
+ i_ehdrp->e_shoff = off;
+ off += i_ehdrp->e_shnum * i_ehdrp->e_shentsize;
+
+ off = assign_file_positions_for_symtab_and_strtabs (abfd, off);
+ }
+ for (i = 0; i < i_ehdrp->e_shnum; i++)
+ {
+ i_shdrp = i_shdrpp[i];
+ if (i_shdrp->sh_type == SHT_REL || i_shdrp->sh_type == SHT_RELA)
+ {
+ i_shdrp->sh_offset = -1;
+ continue;
+ }
+ if (exec_p)
+ {
+ bfd_vma maxpagesize = get_elf_backend_data (abfd)->maxpagesize;
+ if (maxpagesize == 0)
+ maxpagesize = 1; /* make the arithmetic work */
+ /* This isn't necessarily going to give the best packing, if the
+ segments require padding between them, but since that isn't
+ usually the case, this'll do. */
+ if ((i_shdrp->sh_flags & SHF_ALLOC) == 0)
+ {
+ i_shdrp->sh_offset = -1;
+ continue;
+ }
+ /* Blindly assume that the segments are ordered optimally. With
+ the default LD script, they will be. */
+ {
+ /* need big unsigned type */
+ bfd_vma addtl_off;
+ addtl_off = i_shdrp->sh_addr - off;
+ addtl_off = addtl_off % maxpagesize;
+ if (addtl_off)
+ {
+ off += addtl_off;
+ }
+ }
+ if (i_shdrp->sh_type == SHT_NOBITS)
+ {
+ file_ptr off2;
+ i_shdrp->sh_offset = off;
+ if (off % maxpagesize != 0)
+ off2 = maxpagesize - (off % maxpagesize);
+ if (off2 > i_shdrp->sh_size)
+ off2 = i_shdrp->sh_size;
+ off += off2;
+ }
+ }
+ off = assign_file_position_for_section (i_shdrp, off);
+ if (exec_p
+ && get_elf_backend_data(abfd)->maxpagesize > 1
+ && i_shdrp->sh_type == SHT_PROGBITS
+ && (i_shdrp->sh_flags & SHF_ALLOC)
+ && (i_shdrp->sh_offset - i_shdrp->sh_addr) % get_elf_backend_data(abfd)->maxpagesize != 0)
+ abort ();
+ }
+ if (exec_p)
+ {
+ elf_tdata (abfd)->next_file_pos = off;
+ map_program_segments (abfd);
+ off = elf_tdata (abfd)->next_file_pos;
+
+ /* Section headers. */
+ i_ehdrp->e_shoff = off;
+ off += i_ehdrp->e_shnum * i_ehdrp->e_shentsize;
+
+ off = assign_file_positions_for_symtab_and_strtabs (abfd, off);
+
+ for (i = 0; i < i_ehdrp->e_shnum; i++)
+ {
+ i_shdrp = i_shdrpp[i];
+ if (i_shdrp->sh_offset + 1 == 0
+ && i_shdrp->sh_type != SHT_REL
+ && i_shdrp->sh_type != SHT_RELA)
+ off = assign_file_position_for_section (i_shdrp, off);
+ }
}
+ elf_tdata (abfd)->next_file_pos = off;
+}
+
+static boolean
+prep_headers (abfd)
+ bfd *abfd;
+{
+ Elf_External_Ehdr x_ehdr; /* Elf file header, external form */
+ Elf_Internal_Ehdr *i_ehdrp; /* Elf file header, internal form */
+ Elf_Internal_Phdr *i_phdrp = 0; /* Program header table, internal form */
+ Elf_External_Shdr *x_shdrp; /* Section header table, external form */
+ Elf_Internal_Shdr **i_shdrp; /* Section header table, internal form */
+
+ int count;
+ int scnt;
+ struct strtab *shstrtab;
i_ehdrp = elf_elfheader (abfd);
i_shdrp = elf_elfsections (abfd);
- shstrtab = elf_shstrtab (abfd);
- est.i_ehdr = i_ehdrp;
- est.i_shdrp = i_shdrp;
- est.shstrtab = shstrtab;
- est.symtab_section = elf_onesymtab (abfd); /* filled in by elf_fake */
+ shstrtab = bfd_new_strtab (abfd);
+ elf_shstrtab (abfd) = shstrtab;
+
+ i_ehdrp->e_ident[EI_MAG0] = ELFMAG0;
+ i_ehdrp->e_ident[EI_MAG1] = ELFMAG1;
+ i_ehdrp->e_ident[EI_MAG2] = ELFMAG2;
+ i_ehdrp->e_ident[EI_MAG3] = ELFMAG3;
+
+ i_ehdrp->e_ident[EI_CLASS] = ELFCLASS;
+ i_ehdrp->e_ident[EI_DATA] =
+ abfd->xvec->byteorder_big_p ? ELFDATA2MSB : ELFDATA2LSB;
+ i_ehdrp->e_ident[EI_VERSION] = EV_CURRENT;
+
+ for (count = EI_PAD; count < EI_NIDENT; count++)
+ i_ehdrp->e_ident[count] = 0;
+
+ i_ehdrp->e_type = (abfd->flags & EXEC_P) ? ET_EXEC : ET_REL;
+ switch (bfd_get_arch (abfd))
+ {
+ case bfd_arch_unknown:
+ i_ehdrp->e_machine = EM_NONE;
+ break;
+ case bfd_arch_sparc:
+ i_ehdrp->e_machine = EM_SPARC;
+ /* start-sanitize-v9 */
+#if ARCH_SIZE == 64
+ i_ehdrp->e_machine = EM_SPARC64;
+#endif
+ /* end-sanitize-v9 */
+ break;
+ case bfd_arch_i386:
+ i_ehdrp->e_machine = EM_386;
+ break;
+ case bfd_arch_m68k:
+ i_ehdrp->e_machine = EM_68K;
+ break;
+ case bfd_arch_m88k:
+ i_ehdrp->e_machine = EM_88K;
+ break;
+ case bfd_arch_i860:
+ i_ehdrp->e_machine = EM_860;
+ break;
+ case bfd_arch_mips: /* MIPS Rxxxx */
+ i_ehdrp->e_machine = EM_MIPS; /* only MIPS R3000 */
+ break;
+ case bfd_arch_hppa:
+ i_ehdrp->e_machine = EM_HPPA;
+ break;
+ /* also note that EM_M32, AT&T WE32100 is unknown to bfd */
+ default:
+ i_ehdrp->e_machine = EM_NONE;
+ }
+ i_ehdrp->e_version = EV_CURRENT;
+ i_ehdrp->e_ehsize = sizeof (Elf_External_Ehdr);
+
+ /* no program header, for now. */
+ i_ehdrp->e_phoff = 0;
+ i_ehdrp->e_phentsize = 0;
+ i_ehdrp->e_phnum = 0;
+
+ /* each bfd section is section header entry */
+ i_ehdrp->e_entry = bfd_get_start_address (abfd);
+ i_ehdrp->e_shentsize = sizeof (Elf_External_Shdr);
+
+ /* if we're building an executable, we'll need a program header table */
+ if (abfd->flags & EXEC_P)
+ {
+ /* it all happens later */
+#if 0
+ i_ehdrp->e_phentsize = sizeof (Elf_External_Phdr);
+
+ /* elf_build_phdrs() returns a (NULL-terminated) array of
+ Elf_Internal_Phdrs */
+ i_phdrp = elf_build_phdrs (abfd, i_ehdrp, i_shdrp, &i_ehdrp->e_phnum);
+ i_ehdrp->e_phoff = outbase;
+ outbase += i_ehdrp->e_phentsize * i_ehdrp->e_phnum;
+#endif
+ }
+ else
+ {
+ i_ehdrp->e_phentsize = 0;
+ i_phdrp = 0;
+ i_ehdrp->e_phoff = 0;
+ }
+
+ elf_tdata (abfd)->symtab_hdr.sh_name = bfd_add_to_strtab (abfd, shstrtab,
+ ".symtab");
+ elf_tdata (abfd)->strtab_hdr.sh_name = bfd_add_to_strtab (abfd, shstrtab,
+ ".strtab");
+ elf_tdata (abfd)->shstrtab_hdr.sh_name = bfd_add_to_strtab (abfd, shstrtab,
+ ".shstrtab");
+
+}
+
+static void
+swap_out_syms (abfd)
+ bfd *abfd;
+{
+ struct strtab *shstrtab = elf_shstrtab (abfd);
- bfd_map_over_sections (abfd, elf_make_sections, &est);
+ elf_map_symbols (abfd);
/* Dump out the symtabs. */
{
struct strtab *stt = bfd_new_strtab (abfd);
Elf_Internal_Shdr *symtab_hdr;
Elf_Internal_Shdr *symstrtab_hdr;
- int symstrtab_section;
Elf_External_Sym *outbound_syms;
int idx;
- symtab_hdr = &i_shdrp[est.symtab_section];
+ symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
symtab_hdr->sh_type = SHT_SYMTAB;
symtab_hdr->sh_entsize = sizeof (Elf_External_Sym);
symtab_hdr->sh_size = symtab_hdr->sh_entsize * (symcount + 1);
symtab_hdr->sh_info = elf_num_locals (abfd) + 1;
/* see assert in elf_fake_sections that supports this: */
- symstrtab_section = est.symtab_section + 1;
- symstrtab_hdr = &i_shdrp[symstrtab_section];
- symtab_hdr->sh_link = symstrtab_section;
+ symstrtab_hdr = &elf_tdata (abfd)->strtab_hdr;
symstrtab_hdr->sh_type = SHT_STRTAB;
outbound_syms = (Elf_External_Sym *)
Elf_Internal_Sym sym;
bfd_vma value = syms[idx]->value;
- sym.st_name = bfd_add_to_strtab (abfd, stt, syms[idx]->name);
-
- value += syms[idx]->section->output_section->vma
- + syms[idx]->section->output_offset;
- sym.st_value = value;
-
- sym.st_size = (Elf32_Word) (elf_symbol_from (abfd, syms[idx]))->internal_elf_sym.st_size;
+ if (syms[idx]->flags & BSF_SECTION_SYM)
+ /* Section symbols have no names. */
+ sym.st_name = 0;
+ else
+ sym.st_name = bfd_add_to_strtab (abfd, stt, syms[idx]->name);
- if (syms[idx]->flags & BSF_WEAK)
- sym.st_info = ELF_ST_INFO (STB_WEAK, STT_OBJECT);
- else if (syms[idx]->flags & BSF_LOCAL)
+ if (bfd_is_com_section (syms[idx]->section))
{
- if (syms[idx]->flags & BSF_FUNCTION)
- sym.st_info = ELF_ST_INFO (STB_LOCAL, STT_FUNC);
- else
- sym.st_info = ELF_ST_INFO (STB_LOCAL, STT_OBJECT);
+ /* ELF common symbols put the alignment into the `value' field,
+ and the size into the `size' field. This is backwards from
+ how BFD handles it, so reverse it here. */
+ sym.st_size = value;
+ /* Should retrieve this from somewhere... */
+ sym.st_value = 16;
+ sym.st_shndx = SHN_COMMON;
+ }
+ else
+ {
+ asection *sec = syms[idx]->section;
+ elf_symbol_type *type_ptr;
+ int shndx;
+
+ if (sec->output_section)
+ {
+ value += sec->output_offset;
+ sec = sec->output_section;
+ }
+ value += sec->vma;
+ sym.st_value = value;
+ type_ptr = elf_symbol_from (abfd, syms[idx]);
+ sym.st_size = type_ptr ? type_ptr->internal_elf_sym.st_size : 0;
+ sym.st_shndx = shndx = elf_section_from_bfd_section (abfd, sec);
+ if (shndx == -1)
+ {
+ asection *sec2;
+ /* Writing this would be a hell of a lot easier if we had
+ some decent documentation on bfd, and knew what to expect
+ of the library, and what to demand of applications. For
+ example, it appears that `objcopy' might not set the
+ section of a symbol to be a section that is actually in
+ the output file. */
+ sec2 = bfd_get_section_by_name (abfd, sec->name);
+ assert (sec2 != 0);
+ sym.st_shndx = shndx = elf_section_from_bfd_section (abfd, sec2);
+ assert (shndx != -1);
+ }
}
- else if (syms[idx]->flags & BSF_GLOBAL)
+
+ if (bfd_is_com_section (syms[idx]->section))
+ sym.st_info = ELF_ST_INFO (STB_GLOBAL, STT_NOTYPE);
+ else if (syms[idx]->section == &bfd_und_section)
+ sym.st_info = ELF_ST_INFO (STB_GLOBAL, STT_NOTYPE);
+ else if (syms[idx]->flags & BSF_WEAK)
+ sym.st_info = ELF_ST_INFO (STB_WEAK, STT_OBJECT);
+ else if (syms[idx]->flags & BSF_SECTION_SYM)
+ sym.st_info = ELF_ST_INFO (STB_LOCAL, STT_SECTION);
+ else if (syms[idx]->flags & BSF_FILE)
+ sym.st_info = ELF_ST_INFO (STB_LOCAL, STT_FILE);
+ else if (syms[idx]->flags & (BSF_GLOBAL | BSF_EXPORT))
{
if (syms[idx]->flags & BSF_FUNCTION)
sym.st_info = ELF_ST_INFO (STB_GLOBAL, STT_FUNC);
else
sym.st_info = ELF_ST_INFO (STB_GLOBAL, STT_OBJECT);
}
- else if (syms[idx]->flags & BSF_EXPORT)
+ else if (syms[idx]->flags & BSF_LOCAL)
{
if (syms[idx]->flags & BSF_FUNCTION)
- sym.st_info = ELF_ST_INFO (STB_GLOBAL, STT_FUNC);
+ sym.st_info = ELF_ST_INFO (STB_LOCAL, STT_FUNC);
else
- sym.st_info = ELF_ST_INFO (STB_GLOBAL, STT_OBJECT);
+ sym.st_info = ELF_ST_INFO (STB_LOCAL, STT_OBJECT);
}
- else if (syms[idx]->flags & BSF_SECTION_SYM)
- sym.st_info = ELF_ST_INFO (STB_LOCAL, STT_SECTION);
- else if (syms[idx]->flags & BSF_FILE)
- sym.st_info = ELF_ST_INFO (STB_LOCAL, STT_FILE);
else
- sym.st_info = ELF_ST_INFO (STB_GLOBAL, STT_OBJECT);
+ /* Default to local if flag isn't set at all. */
+ sym.st_info = ELF_ST_INFO (STB_LOCAL, STT_OBJECT);
sym.st_other = 0;
- if (syms[idx]->section)
- sym.st_shndx =
- elf_section_from_bfd_section (abfd,
- syms[idx]->section->output_section);
- else
- sym.st_shndx = SHN_UNDEF;
-
elf_swap_symbol_out (abfd, &sym,
outbound_syms + elf_symtab_map (abfd)[idx]);
}
- symtab_hdr->contents = (void *) outbound_syms;
- symstrtab_hdr->contents = (void *) stt->tab;
+ symtab_hdr->contents = (PTR) outbound_syms;
+ symstrtab_hdr->contents = (PTR) stt->tab;
symstrtab_hdr->sh_size = stt->length;
symstrtab_hdr->sh_type = SHT_STRTAB;
+
+ symstrtab_hdr->sh_flags = 0;
+ symstrtab_hdr->sh_addr = 0;
+ symstrtab_hdr->sh_entsize = 0;
+ symstrtab_hdr->sh_link = 0;
+ symstrtab_hdr->sh_info = 0;
+ symstrtab_hdr->sh_addralign = 0;
+ symstrtab_hdr->size = 0;
}
/* put the strtab out too... */
{
Elf_Internal_Shdr *this_hdr;
- int this_section;
- this_section = i_ehdrp->e_shnum++;
- i_ehdrp->e_shstrndx = this_section;
- this_hdr = &i_shdrp[this_section];
- this_hdr->sh_name = bfd_add_to_strtab (abfd, shstrtab, ".shstrtab");
+ this_hdr = &elf_tdata(abfd)->shstrtab_hdr;
+ this_hdr->contents = (PTR) elf_shstrtab (abfd)->tab;
+ this_hdr->sh_size = elf_shstrtab (abfd)->length;
this_hdr->sh_type = SHT_STRTAB;
- this_hdr->sh_size = shstrtab->length;
- this_hdr->contents = (void *) shstrtab->tab;
+ this_hdr->sh_flags = 0;
+ this_hdr->sh_addr = 0;
+ this_hdr->sh_entsize = 0;
+ this_hdr->sh_addralign = 0;
+ this_hdr->size = 0;
}
+}
- outbase = i_ehdrp->e_ehsize;
+static boolean
+write_shdrs_and_ehdr (abfd)
+ bfd *abfd;
+{
+ Elf_External_Ehdr x_ehdr; /* Elf file header, external form */
+ Elf_Internal_Ehdr *i_ehdrp; /* Elf file header, internal form */
+ Elf_Internal_Phdr *i_phdrp = 0; /* Program header table, internal form */
+ Elf_External_Shdr *x_shdrp; /* Section header table, external form */
+ Elf_Internal_Shdr **i_shdrp; /* Section header table, internal form */
- /* if we're building an executable, we'll need a program header table */
- if (abfd->flags & EXEC_P)
- {
- i_ehdrp->e_phentsize = sizeof (Elf_External_Phdr);
+ int count;
+ int scnt;
+ struct strtab *shstrtab;
- /* elf_build_phdrs() returns a (NULL-terminated) array of
- Elf_Internal_Phdrs */
- i_phdrp = elf_build_phdrs (abfd, i_ehdrp, i_shdrp, &i_ehdrp->e_phnum);
- i_ehdrp->e_phoff = i_ehdrp->e_ehsize;
- i_ehdrp->e_shoff = i_ehdrp->e_phoff + (i_ehdrp->e_phentsize
- * i_ehdrp->e_phnum);
- }
+ i_ehdrp = elf_elfheader (abfd);
+ i_shdrp = elf_elfsections (abfd);
+ shstrtab = elf_shstrtab (abfd);
/* swap the header before spitting it out... */
+
+#if DEBUG & 1
+ elf_debug_file (i_ehdrp);
+#endif
elf_swap_ehdr_out (abfd, i_ehdrp, &x_ehdr);
bfd_seek (abfd, (file_ptr) 0, SEEK_SET);
bfd_write ((PTR) & x_ehdr, sizeof (x_ehdr), 1, abfd);
-#if 0
- outbase += i_ehdrp->e_phentsize * i_ehdrp->e_phnum;
- outbase += i_ehdrp->e_shentsize * i_ehdrp->e_shnum;
-#endif
- /* find the next available location in the file
- (just beyond the sections that have already been written). */
- outbase = 0;
- for (count = 1; count < i_ehdrp->e_shnum; count++)
- {
- if (i_shdrp[count].sh_offset && outbase < i_shdrp[count].sh_offset)
- outbase = i_shdrp[count].sh_offset + i_shdrp[count].sh_size;
- }
-
- /* now we fix up the offsets... */
- for (count = 1; count < i_ehdrp->e_shnum; count++)
- {
- if (i_shdrp[count].sh_offset == 0)
- i_shdrp[count].sh_offset = outbase;
- outbase += i_shdrp[count].sh_size;
- }
-
- /* If we're building an executable, fixup the program header table
- offsets.
-
- @@ For now, assume that the entries are in a fixed order: text,
- data, bss. FIXME */
-
- if (abfd->flags & EXEC_P)
- {
- static char *CONST section_name[] =
- {".text", ".data", ".bss"};
-
- for (count = 0; count < 3; count++)
- {
- asection *asect = bfd_get_section_by_name (abfd, section_name[count]);
- int sh_idx = elf_section_from_bfd_section (abfd, asect);
-
- i_phdrp[count].p_offset = i_shdrp[sh_idx].sh_offset;
- }
-
- /* write out the program header table entries */
- elf_write_phdrs (abfd, i_ehdrp, i_phdrp, i_ehdrp->e_phnum);
- }
-
/* at this point we've concocted all the ELF sections... */
x_shdrp = (Elf_External_Shdr *)
bfd_alloc (abfd, sizeof (*x_shdrp) * (i_ehdrp->e_shnum));
return false;
}
- for (count = 0, scnt = 0; count < i_ehdrp->e_shnum; count++)
+ for (count = 0; count < i_ehdrp->e_shnum; count++)
{
- elf_swap_shdr_out (abfd, i_shdrp + count, x_shdrp + scnt);
- scnt++;
+#if DEBUG & 2
+ elf_debug_section (shstrtab->tab + i_shdrp[count]->sh_name, count,
+ i_shdrp[count]);
+#endif
+ elf_swap_shdr_out (abfd, i_shdrp[count], x_shdrp + count);
}
+ bfd_seek (abfd, (file_ptr) i_ehdrp->e_shoff, SEEK_SET);
bfd_write ((PTR) x_shdrp, sizeof (*x_shdrp), i_ehdrp->e_shnum, abfd);
/* need to dump the string table too... */
- /* after writing the headers, we need to write the sections too... */
- nsect = abfd->sections;
- for (count = 0; count < i_ehdrp->e_shnum; count++)
+ return true;
+}
+
+static void
+assign_file_positions_for_relocs (abfd)
+ bfd *abfd;
+{
+ file_ptr off = elf_tdata(abfd)->next_file_pos;
+ int i;
+ Elf_Internal_Shdr **shdrpp = elf_elfsections (abfd);
+ Elf_Internal_Shdr *shdrp;
+ for (i = 0; i < elf_elfheader(abfd)->e_shnum; i++)
{
- if (i_shdrp[count].contents)
- {
- bfd_seek (abfd, i_shdrp[count].sh_offset, SEEK_SET);
- bfd_write (i_shdrp[count].contents, i_shdrp[count].sh_size, 1, abfd);
- }
+ shdrp = shdrpp[i];
+ if (shdrp->sh_type != SHT_REL && shdrp->sh_type != SHT_RELA)
+ continue;
+ off = assign_file_position_for_section (shdrp, off);
}
-
- return true;
+ elf_tdata(abfd)->next_file_pos = off;
}
-/* Given an index of a section, retrieve a pointer to it. Note
- that for our purposes, sections are indexed by {1, 2, ...} with
- 0 being an illegal index. */
+boolean
+DEFUN (NAME(bfd_elf,write_object_contents), (abfd), bfd * abfd)
+{
+ Elf_Internal_Ehdr *i_ehdrp;
+ Elf_Internal_Shdr **i_shdrp;
+ int count;
-/* In the original, each ELF section went into exactly one BFD
+ if (abfd->output_has_begun == false)
+ {
+ prep_headers (abfd);
+ elf_compute_section_file_positions (abfd);
+ abfd->output_has_begun = true;
+ }
+
+ i_shdrp = elf_elfsections (abfd);
+ i_ehdrp = elf_elfheader (abfd);
+
+ bfd_map_over_sections (abfd, write_relocs, (PTR) 0);
+ assign_file_positions_for_relocs (abfd);
+
+ /* After writing the headers, we need to write the sections too... */
+ for (count = 0; count < i_ehdrp->e_shnum; count++)
+ if (i_shdrp[count]->contents)
+ {
+ bfd_seek (abfd, i_shdrp[count]->sh_offset, SEEK_SET);
+ bfd_write (i_shdrp[count]->contents, i_shdrp[count]->sh_size, 1, abfd);
+ }
+ return write_shdrs_and_ehdr (abfd);
+}
+
+/* Given an index of a section, retrieve a pointer to it. Note
+ that for our purposes, sections are indexed by {1, 2, ...} with
+ 0 being an illegal index. */
+
+/* In the original, each ELF section went into exactly one BFD
section. This doesn't really make sense, so we need a real mapping.
The mapping has to hide in the Elf_Internal_Shdr since asection
doesn't have anything like a tdata field... */
be returned from this routine? */
if (index == SHN_ABS)
- return &bfd_com_section;
+ return &bfd_com_section; /* not abs? */
if (index == SHN_COMMON)
return &bfd_com_section;
+ if (index > elf_elfheader (abfd)->e_shnum)
+ return 0;
+
{
- Elf_Internal_Shdr *i_shdrp = elf_elfsections (abfd);
- Elf_Internal_Shdr *hdr = i_shdrp + index;
+ Elf_Internal_Shdr *hdr = elf_elfsections (abfd)[index];
switch (hdr->sh_type)
{
bfd * abfd AND
struct sec *asect)
{
- Elf_Internal_Shdr *i_shdrp = elf_elfsections (abfd);
+ Elf_Internal_Shdr **i_shdrp = elf_elfsections (abfd);
int index;
Elf_Internal_Shdr *hdr;
int maxindex = elf_elfheader (abfd)->e_shnum;
return SHN_ABS;
if (asect == &bfd_com_section)
return SHN_COMMON;
+ if (asect == &bfd_und_section)
+ return SHN_UNDEF;
for (index = 0; index < maxindex; index++)
{
- hdr = &i_shdrp[index];
+ hdr = i_shdrp[index];
switch (hdr->sh_type)
{
/* ELF sections that map to BFD sections */
break;
}
}
- return 0;
+ return -1;
}
/* given a symbol, return the bfd index for that symbol. */
{
struct symbol_cache_entry *asym_ptr = *asym_ptr_ptr;
CONST char *name = asym_ptr->name;
- flagword flags = asym_ptr->flags;
int idx;
int symcount = bfd_get_symcount (abfd);
asymbol **syms = bfd_get_outsymbols (abfd);
/* FIXME -- there has to be a better way than linear search. */
for (idx = 0; idx < symcount; idx++)
{
- if (syms[idx] == asym_ptr || (name == syms[idx]->name && name))
+ if (syms[idx] == asym_ptr
+ || (name == syms[idx]->name && name)
+ || ((asym_ptr->flags & BSF_SECTION_SYM)
+ && (syms[idx]->flags & BSF_SECTION_SYM)
+ && asym_ptr->section == syms[idx]->section))
break;
}
- BFD_ASSERT (idx < symcount);
+ if (idx >= symcount)
+ {
+ /* badness... */
+ fprintf (stderr, "bfd app err: can't find sym `%s' in symtab\n",
+ name);
+ abort ();
+ }
idx = elf_symtab_map (abfd)[idx];
-#ifdef DEBUG
- fprintf (stderr, "elf_symbol_from_bfd_symbol 0x%.8lx, name = %s, sym num = %d, flags =",
- (long) asym_ptr, asym_ptr->name, idx);
-
- if (flags == BSF_NO_FLAGS)
- fprintf (stderr, " none");
-
- if (flags & BSF_LOCAL)
- fprintf (stderr, " local");
-
- if (flags & BSF_GLOBAL)
- fprintf (stderr, " global");
+#if DEBUG & 4
+ {
+ flagword flags = asym_ptr->flags;
- if (flags & BSF_IMPORT)
- fprintf (stderr, " import");
+ fprintf (stderr,
+ "elfsym<-bfdsym %.8lx `%s' sec=%s symnum=%d {",
+ (long) asym_ptr, asym_ptr->name, asym_ptr->section->name, idx);
- if (flags & BSF_EXPORT)
- fprintf (stderr, " export");
+ if (flags == BSF_NO_FLAGS)
+ fprintf (stderr, " none");
- if (flags & BSF_UNDEFINED_OBS)
- fprintf (stderr, " undefined_obs");
+ if (flags & BSF_LOCAL)
+ fprintf (stderr, " local");
- if (flags & BSF_FORT_COMM_OBS)
- fprintf (stderr, " fort_comm_obs");
+ if (flags & BSF_GLOBAL)
+ fprintf (stderr, " global");
- if (flags & BSF_DEBUGGING)
- fprintf (stderr, " debugging");
+ if (flags & BSF_EXPORT)
+ fprintf (stderr, " export");
- if (flags & BSF_KEEP)
- fprintf (stderr, " keep");
+ if (flags & BSF_DEBUGGING)
+ fprintf (stderr, " debugging");
- if (flags & BSF_KEEP_G)
- fprintf (stderr, " keep_g");
+ if (flags & BSF_KEEP)
+ fprintf (stderr, " keep");
- if (flags & BSF_WEAK)
- fprintf (stderr, " weak");
+ if (flags & BSF_KEEP_G)
+ fprintf (stderr, " keep_g");
- if (flags & BSF_CTOR)
- fprintf (stderr, " ctor");
+ if (flags & BSF_WEAK)
+ fprintf (stderr, " weak");
- if (flags & BSF_SECTION_SYM)
- fprintf (stderr, " section_sym");
+ if (flags & BSF_SECTION_SYM)
+ fprintf (stderr, " section_sym");
- if (flags & BSF_OLD_COMMON)
- fprintf (stderr, " old_common");
+ if (flags & BSF_OLD_COMMON)
+ fprintf (stderr, " old_common");
- if (flags & BSF_NOT_AT_END)
- fprintf (stderr, " not_at_end");
+ if (flags & BSF_NOT_AT_END)
+ fprintf (stderr, " not_at_end");
- if (flags & BSF_CONSTRUCTOR)
- fprintf (stderr, " constructor");
+ if (flags & BSF_CONSTRUCTOR)
+ fprintf (stderr, " constructor");
- if (flags & BSF_WARNING)
- fprintf (stderr, " warning");
+ if (flags & BSF_WARNING)
+ fprintf (stderr, " warning");
- if (flags & BSF_INDIRECT)
- fprintf (stderr, " indirect");
+ if (flags & BSF_INDIRECT)
+ fprintf (stderr, " indirect");
- if (flags & BSF_FILE)
- fprintf (stderr, " file");
+ if (flags & BSF_FILE)
+ fprintf (stderr, " file");
- if (flags & BSF_FUNCTION)
- fprintf (stderr, " function");
+ if (flags & BSF_FUNCTION)
+ fprintf (stderr, " function");
- putc ('\n', stderr);
- fflush (stderr);
+ fputs (" }\n", stderr);
+ fflush (stderr);
+ }
#endif
return idx;
bfd * abfd AND
asymbol ** symptrs) /* Buffer for generated bfd symbols */
{
- Elf_Internal_Shdr *i_shdrp = elf_elfsections (abfd);
- Elf_Internal_Shdr *hdr = i_shdrp + elf_onesymtab (abfd);
+ Elf_Internal_Shdr *hdr = &elf_tdata(abfd)->symtab_hdr;
int symcount; /* Number of external ELF symbols */
int i;
elf_symbol_type *sym; /* Pointer to current bfd symbol */
i_sym.st_name);
sym->symbol.value = i_sym.st_value;
-#if 0
- /* FIXME -- this is almost certainly bogus. It's from Pace
- Willisson's hasty Solaris support, to pass the sizes of
- object files or functions down into GDB via the back door, to
- circumvent some other kludge in how Sun hacked stabs. --
- /* XXX Size is now stored via a pointer in an elf_symbol_type;
- should fix gdb then turn this off. */
- sym->symbol.udata = (PTR) i_sym.st_size;
- /* FIXME -- end of bogosity. */
-#endif
+
if (i_sym.st_shndx > 0 && i_sym.st_shndx < SHN_LORESERV)
{
sym->symbol.section = section_from_elf_index (abfd, i_sym.st_shndx);
else if (i_sym.st_shndx == SHN_COMMON)
{
sym->symbol.section = &bfd_com_section;
+ /* Elf puts the alignment into the `value' field, and the size
+ into the `size' field. BFD wants to see the size in the
+ value field, and doesn't care (at the moment) about the
+ alignment. */
+ sym->symbol.value = i_sym.st_size;
}
else if (i_sym.st_shndx == SHN_UNDEF)
{
sym->symbol.flags |= BSF_FUNCTION;
break;
}
+
/* Is this a definition of $global$? If so, keep it because it will be
needd if any relocations are performed. */
if (!strcmp (sym->symbol.name, "$global$")
abfd? FIXME */
struct elf_backend_data *be_data = (struct elf_backend_data *) abfd->xvec->backend_data;
- be_data->global_sym = sym;
+ be_data->global_sym = (PTR) sym;
}
sym++;
}
/* We rely on the zalloc to clear out the final symbol entry. */
- obj_raw_syms (abfd) = x_symp;
+ /* obj_raw_syms macro uses a cast... */
+ elf_tdata (abfd)->raw_syms = (PTR) x_symp;
bfd_get_symcount (abfd) = symcount = sym - symbase;
{
unsigned int symcount;
unsigned int symtab_size = 0;
- Elf_Internal_Shdr *i_shdrp;
- Elf_Internal_Shdr *hdr;
- i_shdrp = elf_elfsections (abfd);
- if (i_shdrp != NULL)
- {
- hdr = i_shdrp + elf_onesymtab (abfd);
- symcount = hdr->sh_size / sizeof (Elf_External_Sym);
- symtab_size = (symcount - 1 + 1) * (sizeof (asymbol));
- }
+ Elf_Internal_Shdr *hdr = &elf_tdata(abfd)->symtab_hdr;
+ symcount = hdr->sh_size / sizeof (Elf_External_Sym);
+ symtab_size = (symcount - 1 + 1) * (sizeof (asymbol));
+
return symtab_size;
}
if (asect->flags & SEC_RELOC)
{
/* either rel or rela */
- return asect->_raw_size;
+ return elf_section_data(asect)->rel_hdr.sh_size;
}
else
return 0;
}
/* ELF_R_SYM(dst.r_info) is the symbol table offset; subtract 1
because the first entry is NULL. */
- cache_ptr->sym_ptr_ptr = symbols + ELF32_R_SYM (dst.r_info) - 1;
+ cache_ptr->sym_ptr_ptr = symbols + ELF_R_SYM (dst.r_info) - 1;
+ {
+ /* Is it an ELF section symbol? If so, translate it into a
+ BFD section symbol. */
+ asymbol *s = *(cache_ptr->sym_ptr_ptr);
+ if (s->flags & BSF_SECTION_SYM)
+ cache_ptr->sym_ptr_ptr = s->section->symbol_ptr_ptr;
+ }
cache_ptr->addend = dst.r_addend;
/* Fill in the cache_ptr->howto field from dst.r_type */
Elf_Internal_Shdr *hdr;
{
fprintf (stderr, "\nSection#%d '%s' 0x%.8lx\n", num, str, (long) hdr);
- fprintf (stderr, "sh_name = %ld\n", (long) hdr->sh_name);
- fprintf (stderr, "sh_type = %ld\n", (long) hdr->sh_type);
- fprintf (stderr, "sh_flags = %ld\n", (long) hdr->sh_flags);
- fprintf (stderr, "sh_addr = %ld\n", (long) hdr->sh_addr);
- fprintf (stderr, "sh_offset = %ld\n", (long) hdr->sh_offset);
- fprintf (stderr, "sh_size = %ld\n", (long) hdr->sh_size);
- fprintf (stderr, "sh_link = %ld\n", (long) hdr->sh_link);
- fprintf (stderr, "sh_info = %ld\n", (long) hdr->sh_info);
- fprintf (stderr, "sh_addralign = %ld\n", (long) hdr->sh_addralign);
- fprintf (stderr, "sh_entsize = %ld\n", (long) hdr->sh_entsize);
+ fprintf (stderr,
+ "sh_name = %ld\tsh_type = %ld\tsh_flags = %ld\n",
+ (long) hdr->sh_name,
+ (long) hdr->sh_type,
+ (long) hdr->sh_flags);
+ fprintf (stderr,
+ "sh_addr = %ld\tsh_offset = %ld\tsh_size = %ld\n",
+ (long) hdr->sh_addr,
+ (long) hdr->sh_offset,
+ (long) hdr->sh_size);
+ fprintf (stderr,
+ "sh_link = %ld\tsh_info = %ld\tsh_addralign = %ld\n",
+ (long) hdr->sh_link,
+ (long) hdr->sh_info,
+ (long) hdr->sh_addralign);
+ fprintf (stderr, "sh_entsize = %ld\n",
+ (long) hdr->sh_entsize);
fprintf (stderr, "rawdata = 0x%.8lx\n", (long) hdr->rawdata);
fprintf (stderr, "contents = 0x%.8lx\n", (long) hdr->contents);
fprintf (stderr, "size = %ld\n", (long) hdr->size);
fflush (stderr);
}
+static void
+elf_debug_file (ehdrp)
+ Elf_Internal_Ehdr *ehdrp;
+{
+ fprintf (stderr, "e_entry = 0x%.8lx\n", (long) ehdrp->e_entry);
+ fprintf (stderr, "e_phoff = %ld\n", (long) ehdrp->e_phoff);
+ fprintf (stderr, "e_phnum = %ld\n", (long) ehdrp->e_phnum);
+ fprintf (stderr, "e_phentsize = %ld\n", (long) ehdrp->e_phentsize);
+ fprintf (stderr, "e_shoff = %ld\n", (long) ehdrp->e_shoff);
+ fprintf (stderr, "e_shnum = %ld\n", (long) ehdrp->e_shnum);
+ fprintf (stderr, "e_shentsize = %ld\n", (long) ehdrp->e_shentsize);
+}
#endif
static boolean
Elf_External_Rel *native_relocs;
arelent *reloc_cache;
arelent *cache_ptr;
- Elf_Internal_Shdr *i_shdrp;
Elf_Internal_Shdr *data_hdr;
ElfNAME (Off) data_off;
ElfNAME (Word) data_max;
/* Get the offset of the start of the segment we are relocating to read in
the implicit addend. */
- i_shdrp = elf_elfsections (abfd);
- data_hdr = i_shdrp + elf_section_from_bfd_section (abfd, asect);
+ data_hdr = &elf_section_data(asect)->this_hdr;
data_off = data_hdr->sh_offset;
data_max = data_hdr->sh_size - sizeof (buf) + 1;
-#ifdef DEBUG
- elf_debug_section ("data section", data_hdr - i_shdrp, data_hdr);
+#if DEBUG & 2
+ elf_debug_section ("data section", -1, data_hdr);
#endif
for (idx = 0; idx < asect->reloc_count; idx++)
}
/* ELF_R_SYM(dst.r_info) is the symbol table offset...
-1 is to skip the dummy symbol table entry */
- cache_ptr->sym_ptr_ptr = symbols + ELF32_R_SYM (dst.r_info) - 1;
+ cache_ptr->sym_ptr_ptr = symbols + ELF_R_SYM (dst.r_info) - 1;
BFD_ASSERT (dst.r_offset <= data_max);
if (bfd_seek (abfd, data_off + dst.r_offset, SEEK_SET) != 0
|| bfd_read ((PTR) buf, sizeof (buf), 1, abfd) != sizeof (buf))
fprintf (file, "%s", symbol->name);
break;
case bfd_print_symbol_more:
- fprintf (file, "elf %lx %lx",
- symbol->value,
- (long) symbol->flags);
+ fprintf (file, "elf ");
+ fprintf_vma (file, symbol->value);
+ fprintf (file, " %lx", (long) symbol->flags);
break;
case bfd_print_symbol_all:
{
CONST char **functionname_ptr AND
unsigned int *line_ptr)
{
- fprintf (stderr, "elf_find_nearest_line unimplemented\n");
- fflush (stderr);
- BFD_FAIL ();
return false;
}
file_ptr offset AND
bfd_size_type count)
{
- int dest_sect;
+ Elf_Internal_Shdr *hdr;
if (abfd->output_has_begun == false) /* set by bfd.c handler? */
{
/* do setup calculations (FIXME) */
+ prep_headers (abfd);
elf_compute_section_file_positions (abfd);
abfd->output_has_begun = true;
}
- dest_sect = elf_section_from_bfd_section (abfd, section);
- if (!dest_sect)
- return false;
+ hdr = &elf_section_data(section)->this_hdr;
- if (bfd_seek (abfd, elf_elfsections (abfd)[dest_sect].sh_offset + offset, SEEK_SET) == -1)
+ if (bfd_seek (abfd, hdr->sh_offset + offset, SEEK_SET) == -1)
return false;
if (bfd_write (location, 1, count, abfd) != count)
return false;
+
return true;
}
BFD_FAIL ();
}
-boolean
-DEFUN (elf_get_sect_thunk, (abfd, est),
+\f
+/* Core file support */
+
+#ifdef HAVE_PROCFS /* Some core file support requires host /proc files */
+#include <sys/procfs.h>
+#else
+#define bfd_prstatus(abfd, descdata, descsz, filepos) /* Define away */
+#define bfd_fpregset(abfd, descdata, descsz, filepos) /* Define away */
+#define bfd_prpsinfo(abfd, descdata, descsz, filepos) /* Define away */
+#endif
+
+#ifdef HAVE_PROCFS
+
+static void
+DEFUN (bfd_prstatus, (abfd, descdata, descsz, filepos),
bfd * abfd AND
- elf_sect_thunk * est)
+ char *descdata AND
+ int descsz AND
+ long filepos)
{
- if (est == (elf_sect_thunk *) NULL)
- return false;
+ asection *newsect;
+ prstatus_t *status = (prstatus_t *) 0;
+
+ if (descsz == sizeof (prstatus_t))
+ {
+ newsect = bfd_make_section (abfd, ".reg");
+ newsect->_raw_size = sizeof (status->pr_reg);
+ newsect->filepos = filepos + (long) &status->pr_reg;
+ newsect->flags = SEC_ALLOC | SEC_HAS_CONTENTS;
+ newsect->alignment_power = 2;
+ if ((core_prstatus (abfd) = bfd_alloc (abfd, descsz)) != NULL)
+ {
+ memcpy (core_prstatus (abfd), descdata, descsz);
+ }
+ }
+}
+
+/* Stash a copy of the prpsinfo structure away for future use. */
+
+static void
+DEFUN (bfd_prpsinfo, (abfd, descdata, descsz, filepos),
+ bfd * abfd AND
+ char *descdata AND
+ int descsz AND
+ long filepos)
+{
+ asection *newsect;
+
+ if (descsz == sizeof (prpsinfo_t))
+ {
+ if ((core_prpsinfo (abfd) = bfd_alloc (abfd, descsz)) != NULL)
+ {
+ memcpy (core_prpsinfo (abfd), descdata, descsz);
+ }
+ }
+}
+
+static void
+DEFUN (bfd_fpregset, (abfd, descdata, descsz, filepos),
+ bfd * abfd AND
+ char *descdata AND
+ int descsz AND
+ long filepos)
+{
+ asection *newsect;
+
+ newsect = bfd_make_section (abfd, ".reg2");
+ newsect->_raw_size = descsz;
+ newsect->filepos = filepos;
+ newsect->flags = SEC_ALLOC | SEC_HAS_CONTENTS;
+ newsect->alignment_power = 2;
+}
+
+#endif /* HAVE_PROCFS */
+
+/* Return a pointer to the args (including the command name) that were
+ seen by the program that generated the core dump. Note that for
+ some reason, a spurious space is tacked onto the end of the args
+ in some (at least one anyway) implementations, so strip it off if
+ it exists. */
+
+char *
+DEFUN (elf_core_file_failing_command, (abfd),
+ bfd * abfd)
+{
+#ifdef HAVE_PROCFS
+ if (core_prpsinfo (abfd))
+ {
+ prpsinfo_t *p = core_prpsinfo (abfd);
+ char *scan = p->pr_psargs;
+ while (*scan++)
+ {;
+ }
+ scan -= 2;
+ if ((scan > p->pr_psargs) && (*scan == ' '))
+ {
+ *scan = '\000';
+ }
+ return p->pr_psargs;
+ }
+#endif
+ return NULL;
+}
+
+/* Return the number of the signal that caused the core dump. Presumably,
+ since we have a core file, we got a signal of some kind, so don't bother
+ checking the other process status fields, just return the signal number.
+ */
+
+int
+DEFUN (elf_core_file_failing_signal, (abfd),
+ bfd * abfd)
+{
+#ifdef HAVE_PROCFS
+ if (core_prstatus (abfd))
+ {
+ return ((prstatus_t *) (core_prstatus (abfd)))->pr_cursig;
+ }
+#endif
+ return -1;
+}
+
+/* Check to see if the core file could reasonably be expected to have
+ come for the current executable file. Note that by default we return
+ true unless we find something that indicates that there might be a
+ problem.
+ */
+
+boolean
+DEFUN (elf_core_file_matches_executable_p, (core_bfd, exec_bfd),
+ bfd * core_bfd AND
+ bfd * exec_bfd)
+{
+#ifdef HAVE_PROCFS
+ char *corename;
+ char *execname;
+#endif
+
+ /* First, xvecs must match since both are ELF files for the same target. */
+
+ if (core_bfd->xvec != exec_bfd->xvec)
+ {
+ bfd_error = system_call_error;
+ return false;
+ }
+
+#ifdef HAVE_PROCFS
+
+ /* If no prpsinfo, just return true. Otherwise, grab the last component
+ of the exec'd pathname from the prpsinfo. */
+
+ if (core_prpsinfo (core_bfd))
+ {
+ corename = (((struct prpsinfo *) core_prpsinfo (core_bfd))->pr_fname);
+ }
+ else
+ {
+ return true;
+ }
+
+ /* Find the last component of the executable pathname. */
+
+ if ((execname = strrchr (exec_bfd->filename, '/')) != NULL)
+ {
+ execname++;
+ }
+ else
+ {
+ execname = (char *) exec_bfd->filename;
+ }
+
+ /* See if they match */
+
+ return strcmp (execname, corename) ? false : true;
+
+#else
+
+ return true;
- est->i_ehdr = elf_elfheader (abfd);
- est->i_shdrp = elf_elfsections (abfd);
- est->shstrtab = elf_shstrtab (abfd);
- est->symtab_section = elf_onesymtab (abfd); /* filled in by elf_fake */
+#endif /* HAVE_PROCFS */
+}
+
+/* ELF core files contain a segment of type PT_NOTE, that holds much of
+ the information that would normally be available from the /proc interface
+ for the process, at the time the process dumped core. Currently this
+ includes copies of the prstatus, prpsinfo, and fpregset structures.
+
+ Since these structures are potentially machine dependent in size and
+ ordering, bfd provides two levels of support for them. The first level,
+ available on all machines since it does not require that the host
+ have /proc support or the relevant include files, is to create a bfd
+ section for each of the prstatus, prpsinfo, and fpregset structures,
+ without any interpretation of their contents. With just this support,
+ the bfd client will have to interpret the structures itself. Even with
+ /proc support, it might want these full structures for it's own reasons.
+
+ In the second level of support, where HAVE_PROCFS is defined, bfd will
+ pick apart the structures to gather some additional information that
+ clients may want, such as the general register set, the name of the
+ exec'ed file and its arguments, the signal (if any) that caused the
+ core dump, etc.
+ */
+
+static boolean
+DEFUN (elf_corefile_note, (abfd, hdr),
+ bfd * abfd AND
+ Elf_Internal_Phdr * hdr)
+{
+ Elf_External_Note *x_note_p; /* Elf note, external form */
+ Elf_Internal_Note i_note; /* Elf note, internal form */
+ char *buf = NULL; /* Entire note segment contents */
+ char *namedata; /* Name portion of the note */
+ char *descdata; /* Descriptor portion of the note */
+ char *sectname; /* Name to use for new section */
+ long filepos; /* File offset to descriptor data */
+ asection *newsect;
+
+ if (hdr->p_filesz > 0
+ && (buf = (char *) bfd_xmalloc (hdr->p_filesz)) != NULL
+ && bfd_seek (abfd, hdr->p_offset, SEEK_SET) != -1
+ && bfd_read ((PTR) buf, hdr->p_filesz, 1, abfd) == hdr->p_filesz)
+ {
+ x_note_p = (Elf_External_Note *) buf;
+ while ((char *) x_note_p < (buf + hdr->p_filesz))
+ {
+ i_note.namesz = bfd_h_get_32 (abfd, (bfd_byte *) x_note_p->namesz);
+ i_note.descsz = bfd_h_get_32 (abfd, (bfd_byte *) x_note_p->descsz);
+ i_note.type = bfd_h_get_32 (abfd, (bfd_byte *) x_note_p->type);
+ namedata = x_note_p->name;
+ descdata = namedata + BFD_ALIGN (i_note.namesz, 4);
+ filepos = hdr->p_offset + (descdata - buf);
+ switch (i_note.type)
+ {
+ case NT_PRSTATUS:
+ /* process descdata as prstatus info */
+ bfd_prstatus (abfd, descdata, i_note.descsz, filepos);
+ sectname = ".prstatus";
+ break;
+ case NT_FPREGSET:
+ /* process descdata as fpregset info */
+ bfd_fpregset (abfd, descdata, i_note.descsz, filepos);
+ sectname = ".fpregset";
+ break;
+ case NT_PRPSINFO:
+ /* process descdata as prpsinfo */
+ bfd_prpsinfo (abfd, descdata, i_note.descsz, filepos);
+ sectname = ".prpsinfo";
+ break;
+ default:
+ /* Unknown descriptor, just ignore it. */
+ sectname = NULL;
+ break;
+ }
+ if (sectname != NULL)
+ {
+ newsect = bfd_make_section (abfd, sectname);
+ newsect->_raw_size = i_note.descsz;
+ newsect->filepos = filepos;
+ newsect->flags = SEC_ALLOC | SEC_HAS_CONTENTS;
+ newsect->alignment_power = 2;
+ }
+ x_note_p = (Elf_External_Note *)
+ (descdata + BFD_ALIGN (i_note.descsz, 4));
+ }
+ }
+ if (buf != NULL)
+ {
+ free (buf);
+ }
return true;
+
+}
+
+/* Core files are simply standard ELF formatted files that partition
+ the file using the execution view of the file (program header table)
+ rather than the linking view. In fact, there is no section header
+ table in a core file.
+
+ The process status information (including the contents of the general
+ register set) and the floating point register set are stored in a
+ segment of type PT_NOTE. We handcraft a couple of extra bfd sections
+ that allow standard bfd access to the general registers (.reg) and the
+ floating point registers (.reg2).
+
+ */
+
+bfd_target *
+DEFUN (elf_core_file_p, (abfd), bfd * abfd)
+{
+ Elf_External_Ehdr x_ehdr; /* Elf file header, external form */
+ Elf_Internal_Ehdr *i_ehdrp; /* Elf file header, internal form */
+ Elf_External_Phdr x_phdr; /* Program header table entry, external form */
+ Elf_Internal_Phdr *i_phdrp; /* Program header table, internal form */
+ unsigned int phindex;
+
+ /* Read in the ELF header in external format. */
+
+ if (bfd_read ((PTR) & x_ehdr, sizeof (x_ehdr), 1, abfd) != sizeof (x_ehdr))
+ {
+ bfd_error = system_call_error;
+ return NULL;
+ }
+
+ /* Now check to see if we have a valid ELF file, and one that BFD can
+ make use of. The magic number must match, the address size ('class')
+ and byte-swapping must match our XVEC entry, and it must have a
+ program header table (FIXME: See comments re segments at top of this
+ file). */
+
+ if (elf_file_p (&x_ehdr) == false)
+ {
+ wrong:
+ bfd_error = wrong_format;
+ return NULL;
+ }
+
+ /* FIXME, Check EI_VERSION here ! */
+
+ {
+#if ARCH_SIZE == 32
+ int desired_address_size = ELFCLASS32;
+#endif
+#if ARCH_SIZE == 64
+ int desired_address_size = ELFCLASS64;
+#endif
+
+ if (x_ehdr.e_ident[EI_CLASS] != desired_address_size)
+ goto wrong;
+ }
+
+ /* Switch xvec to match the specified byte order. */
+ switch (x_ehdr.e_ident[EI_DATA])
+ {
+ case ELFDATA2MSB: /* Big-endian */
+ if (abfd->xvec->byteorder_big_p == false)
+ goto wrong;
+ break;
+ case ELFDATA2LSB: /* Little-endian */
+ if (abfd->xvec->byteorder_big_p == true)
+ goto wrong;
+ break;
+ case ELFDATANONE: /* No data encoding specified */
+ default: /* Unknown data encoding specified */
+ goto wrong;
+ }
+
+ /* Allocate an instance of the elf_obj_tdata structure and hook it up to
+ the tdata pointer in the bfd. */
+
+ elf_tdata (abfd) =
+ (struct elf_obj_tdata *) bfd_zalloc (abfd, sizeof (struct elf_obj_tdata));
+ if (elf_tdata (abfd) == NULL)
+ {
+ bfd_error = no_memory;
+ return NULL;
+ }
+
+ /* FIXME, `wrong' returns from this point onward, leak memory. */
+
+ /* Now that we know the byte order, swap in the rest of the header */
+ i_ehdrp = elf_elfheader (abfd);
+ elf_swap_ehdr_in (abfd, &x_ehdr, i_ehdrp);
+#if DEBUG & 1
+ elf_debug_file (i_ehdrp);
+#endif
+
+ /* If there is no program header, or the type is not a core file, then
+ we are hosed. */
+ if (i_ehdrp->e_phoff == 0 || i_ehdrp->e_type != ET_CORE)
+ goto wrong;
+
+ /* Allocate space for a copy of the program header table in
+ internal form, seek to the program header table in the file,
+ read it in, and convert it to internal form. As a simple sanity
+ check, verify that the what BFD thinks is the size of each program
+ header table entry actually matches the size recorded in the file. */
+
+ if (i_ehdrp->e_phentsize != sizeof (x_phdr))
+ goto wrong;
+ i_phdrp = (Elf_Internal_Phdr *)
+ bfd_alloc (abfd, sizeof (*i_phdrp) * i_ehdrp->e_phnum);
+ if (!i_phdrp)
+ {
+ bfd_error = no_memory;
+ return NULL;
+ }
+ if (bfd_seek (abfd, i_ehdrp->e_phoff, SEEK_SET) == -1)
+ {
+ bfd_error = system_call_error;
+ return NULL;
+ }
+ for (phindex = 0; phindex < i_ehdrp->e_phnum; phindex++)
+ {
+ if (bfd_read ((PTR) & x_phdr, sizeof (x_phdr), 1, abfd)
+ != sizeof (x_phdr))
+ {
+ bfd_error = system_call_error;
+ return NULL;
+ }
+ elf_swap_phdr_in (abfd, &x_phdr, i_phdrp + phindex);
+ }
+
+ /* Once all of the program headers have been read and converted, we
+ can start processing them. */
+
+ for (phindex = 0; phindex < i_ehdrp->e_phnum; phindex++)
+ {
+ bfd_section_from_phdr (abfd, i_phdrp + phindex, phindex);
+ if ((i_phdrp + phindex)->p_type == PT_NOTE)
+ {
+ elf_corefile_note (abfd, i_phdrp + phindex);
+ }
+ }
+
+ /* Remember the entry point specified in the ELF file header. */
+
+ bfd_get_start_address (abfd) = i_ehdrp->e_entry;
+
+ return abfd->xvec;
}
projects / binutils.git / blobdiff