bfd_h_put_32 (abfd, (bfd_vma) 2, s.format);
bfd_h_put_32 (abfd, (bfd_vma) sizeof s, s.size);
if (bfd_write ((PTR) &s, sizeof s, 1, abfd) != sizeof s)
- {
- bfd_error = system_call_error;
- return false;
- }
+ return false;
+ return true;
}
\f
/* How to process the various reloc types. */
/* Read the reloc from the file. */
if (bfd_read (&ext, sizeof ext, 1, abfd) != sizeof ext)
- {
- bfd_error = system_call_error;
- return false;
- }
+ return false;
/* Swap in the reloc information. */
r_vaddr = bfd_h_get_64 (abfd, (bfd_byte *) ext.r_vaddr);
rel->sym_ptr_ptr = bfd_abs_section.symbol_ptr_ptr;
rel->addend = 0;
}
- else if (r_symndx == RELOC_SECTION_TEXT)
+ else if (r_symndx == ALPHA_RELOC_SECTION_TEXT)
{
rel->sym_ptr_ptr = code_sec->symbol_ptr_ptr;
BFD_ASSERT (bfd_get_section_vma (abfd, code_sec) == 0);
rel->addend = 0;
}
- else if (r_symndx == RELOC_SECTION_DATA)
+ else if (r_symndx == ALPHA_RELOC_SECTION_DATA)
{
rel->sym_ptr_ptr = data_sec->symbol_ptr_ptr;
rel->addend = - bfd_get_section_vma (abfd, data_sec);
break;
case ALPHA_R_NW_RELOC:
+ /* If this is SETGP, we set the addend to 0. Otherwise we set
+ the addend to the size of the .lita section (this is
+ r_symndx) plus 1. We have already set the address of the
+ reloc to r_vaddr. */
if (r_size == ALPHA_R_NW_RELOC_SETGP)
- gp_value = r_vaddr;
+ {
+ gp_value = r_vaddr;
+ rel->addend = 0;
+ }
else if (r_size == ALPHA_R_NW_RELOC_LITA)
- lita_address = r_vaddr;
+ {
+ lita_address = r_vaddr;
+ rel->addend = r_symndx + 1;
+ }
else
BFD_ASSERT (0);
rel->sym_ptr_ptr = bfd_abs_section.symbol_ptr_ptr;
- rel->addend = r_size;
break;
default:
if (bfd_read ((PTR) &symlength, sizeof (symlength), 1, abfd)
!= sizeof (symlength))
- {
- bfd_error = system_call_error;
- return (false);
- }
+ return false;
sym -> symbol.the_bfd = abfd;
sym -> symbol.name = bfd_alloc (abfd, symlength + 1);
- if (bfd_read ((PTR) sym -> symbol.name, symlength, 1, abfd)
- != symlength)
+ if (!sym -> symbol.name)
{
- bfd_error = system_call_error;
- return (false);
+ bfd_set_error (bfd_error_no_memory);
+ return false;
}
+ if (bfd_read ((PTR) sym -> symbol.name, symlength, 1, abfd)
+ != symlength)
+ return false;
sym -> symbol.flags = 0;
sym -> symbol.value = 0;
sym -> symbol.section = &bfd_und_section;
if (bfd_read ((PTR) temp, sizeof (temp), 1, abfd) != sizeof (temp))
- {
- bfd_error = system_call_error;
- return (false);
- }
+ return false;
rcount = bfd_h_get_32 (abfd, temp);
nlm_relocs = ((struct nlm_relent *)
bfd_alloc (abfd, rcount * sizeof (struct nlm_relent)));
+ if (!nlm_relocs)
+ {
+ bfd_set_error (bfd_error_no_memory);
+ return false;
+ }
sym -> relocs = nlm_relocs;
sym -> rcnt = 0;
while (sym -> rcnt < rcount)
sym = *rel->sym_ptr_ptr;
/* Get values for the relocation fields. */
- r_vaddr = bfd_get_section_vma (abfd, sec) + rel->address;
- if (bfd_get_section (sym) == &bfd_und_section)
- {
- r_extern = 1;
- r_symndx = 0;
- }
- else
+ r_type = rel->howto->type;
+ if (r_type != ALPHA_R_NW_RELOC)
{
- r_extern = 0;
- if (bfd_get_section_flags (abfd, bfd_get_section (sym)) & SEC_CODE)
- r_symndx = RELOC_SECTION_TEXT;
+ r_vaddr = bfd_get_section_vma (abfd, sec) + rel->address;
+ if ((sec->flags & SEC_CODE) == 0)
+ r_vaddr += bfd_section_size (abfd,
+ bfd_get_section_by_name (abfd,
+ NLM_CODE_NAME));
+ if (bfd_get_section (sym) == &bfd_und_section)
+ {
+ r_extern = 1;
+ r_symndx = 0;
+ }
else
- r_symndx = RELOC_SECTION_DATA;
- }
- r_type = rel->howto->type;
- r_offset = 0;
- r_size = 0;
+ {
+ r_extern = 0;
+ if (bfd_get_section_flags (abfd, bfd_get_section (sym)) & SEC_CODE)
+ r_symndx = ALPHA_RELOC_SECTION_TEXT;
+ else
+ r_symndx = ALPHA_RELOC_SECTION_DATA;
+ }
+ r_offset = 0;
+ r_size = 0;
- switch (r_type)
+ switch (r_type)
+ {
+ case ALPHA_R_LITUSE:
+ case ALPHA_R_GPDISP:
+ r_symndx = rel->addend;
+ break;
+
+ case ALPHA_R_OP_STORE:
+ r_size = rel->addend & 0xff;
+ r_offset = (rel->addend >> 8) & 0xff;
+ break;
+
+ case ALPHA_R_OP_PUSH:
+ case ALPHA_R_OP_PSUB:
+ case ALPHA_R_OP_PRSHIFT:
+ r_vaddr = rel->addend;
+ break;
+
+ case ALPHA_R_IGNORE:
+ r_vaddr = rel->address;
+ break;
+
+ default:
+ break;
+ }
+ }
+ else
{
- case ALPHA_R_LITUSE:
- case ALPHA_R_GPDISP:
- r_symndx = rel->addend;
- break;
-
- case ALPHA_R_OP_STORE:
- r_size = rel->addend & 0xff;
- r_offset = (rel->addend >> 8) & 0xff;
- break;
-
- case ALPHA_R_OP_PUSH:
- case ALPHA_R_OP_PSUB:
- case ALPHA_R_OP_PRSHIFT:
- r_vaddr = rel->addend;
- break;
-
- case ALPHA_R_IGNORE:
+ /* r_type == ALPHA_R_NW_RELOC */
r_vaddr = rel->address;
- break;
-
- case ALPHA_R_NW_RELOC:
- r_size = rel->addend;
- break;
-
- default:
- break;
+ if (rel->addend == 0)
+ {
+ r_symndx = 0;
+ r_size = ALPHA_R_NW_RELOC_SETGP;
+ }
+ else
+ {
+ r_symndx = rel->addend - 1;
+ r_size = ALPHA_R_NW_RELOC_LITA;
+ }
+ r_extern = 0;
+ r_offset = 0;
}
/* Swap out the relocation fields. */
/* Write out the relocation. */
if (bfd_write (&ext, sizeof ext, 1, abfd) != sizeof ext)
- {
- bfd_error = system_call_error;
- return false;
- }
+ return false;
return true;
}
static boolean
nlm_alpha_write_external (abfd, count, sym, relocs)
bfd *abfd;
- bfd_vma count;
+ bfd_size_type count;
asymbol *sym;
struct reloc_and_sec *relocs;
{
int i;
bfd_byte len;
unsigned char temp[NLM_TARGET_LONG_SIZE];
+ arelent r;
len = strlen (sym->name);
if ((bfd_write (&len, sizeof (bfd_byte), 1, abfd) != sizeof(bfd_byte))
|| bfd_write (sym->name, len, 1, abfd) != len)
- {
- bfd_error = system_call_error;
- return false;
- }
+ return false;
- bfd_put_32 (abfd, count, temp);
+ bfd_put_32 (abfd, count + 2, temp);
if (bfd_write (temp, sizeof (temp), 1, abfd) != sizeof (temp))
- {
- bfd_error = system_call_error;
- return false;
- }
+ return false;
+
+ /* The first two relocs for each external symbol are the .lita
+ address and the GP value. */
+ r.sym_ptr_ptr = bfd_abs_section.symbol_ptr_ptr;
+ r.howto = &nlm32_alpha_nw_howto;
+
+ r.address = nlm_alpha_backend_data (abfd)->lita_address;
+ r.addend = nlm_alpha_backend_data (abfd)->lita_size + 1;
+ if (nlm_alpha_write_import (abfd, (asection *) NULL, &r) == false)
+ return false;
+
+ r.address = nlm_alpha_backend_data (abfd)->gp;
+ r.addend = 0;
+ if (nlm_alpha_write_import (abfd, (asection *) NULL, &r) == false)
+ return false;
for (i = 0; i < count; i++)
{
sizeof (struct nlm32_alpha_external_prefix_header),
bfd_arch_alpha,
0,
+ true, /* no uninitialized data permitted by Alpha NetWare. */
nlm_alpha_backend_object_p,
nlm_alpha_write_prefix,
nlm_alpha_read_reloc,
nlm_swap_fixed_header_in,
nlm_swap_fixed_header_out,
nlm_alpha_write_external,
+ 0, /* write_export */
};
#define TARGET_LITTLE_NAME "nlm32-alpha"
projects / deliverable / binutils-gdb.git / blobdiff