github/amigaos-binutils
2
0
Fork 0
mirror of https://frontier.innolan.net/github/amigaos-binutils.git synced 2025-11-23 20:21:48 +00:00
Code Releases Activity

* amigaos.c (bfd_is_bfd_section): New macro.

Browse Source 
(determine_datadata_relocs): Use section_ptr macros.
(amiga_write_object_contents): Likewise.
(amiga_write_symbols): Likewise.
(amiga_get_symbol_info): Likewise.
* amigaoslink.c (amiga_perform_reloc): Use section_ptr macros.
(aout_perform_reloc): Likewise.
This commit is contained in:
Gunther Nikl
2008-11-25 20:39:10 +00:00
parent cb64fb89dd
commit 22ac4a8137
2 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
bfd/amigaos.c
View File

@ -129,6 +129,9 @@ BFD:
extern PTR alloca PARAMS ((size_t));
#endif
#define bfd_is_bfd_section(sec) \
(bfd_is_abs_section(sec)||bfd_is_com_section(sec)||bfd_is_und_section(sec)||bfd_is_ind_section(sec))
struct arch_syms {
unsigned long offset; /* disk offset in the archive */
unsigned long size; /* size of the block of symbols */
@ -1248,8 +1251,7 @@ determine_datadata_relocs (abfd, section)
insection=sym_p->section;
/* Is reloc relative to a special section? */
if ((insection==bfd_abs_section_ptr)||(insection==bfd_com_section_ptr)||
(insection==bfd_und_section_ptr)||(insection==bfd_ind_section_ptr))
if (bfd_is_bfd_section(insection))
continue; /* Nothing to do, since this translates to HUNK_EXT */
if (insection->output_section == section)
relocs++;
@ -1385,7 +1387,7 @@ amiga_write_object_contents (abfd)
for (i=0;i<abfd->symcount;i++) {
asymbol *sym_p=abfd->outsymbols[i];
sec_ptr osection=sym_p->section;
if (!osection || osection->output_section!=bfd_com_section_ptr)
if (!osection || !bfd_is_com_section(osection->output_section))
continue;
for (p=abfd->sections; p!=NULL; p=p->next) {
if (!strcmp(p->name, ".bss")) {
@ -1808,10 +1810,7 @@ amiga_write_section_contents (abfd, section, data_sec, datadata_relocs,
DPRINT(5,("Sec for reloc is %lx(%s)\n",insection,insection->name));
DPRINT(5,("Symbol for this reloc is %lx(%s)\n",sym_p,sym_p->name));
/* Is reloc relative to a special section? */
if ((insection == bfd_abs_section_ptr) ||
(insection == bfd_com_section_ptr) ||
(insection == bfd_und_section_ptr) ||
(insection == bfd_ind_section_ptr))
if (bfd_is_bfd_section(insection))
continue; /* Nothing to do, since this translates to HUNK_EXT */
r->addend += sym_p->value; /* Add offset of symbol from section start */
@ -1911,10 +1910,7 @@ amiga_write_section_contents (abfd, section, data_sec, datadata_relocs,
sym_p = *(r->sym_ptr_ptr); /* The symbol for this section */
insection = sym_p->section;
/* Is reloc relative to a special section? */
if ((insection == bfd_abs_section_ptr) ||
(insection == bfd_com_section_ptr) ||
(insection == bfd_und_section_ptr) ||
(insection == bfd_ind_section_ptr))
if (bfd_is_bfd_section(insection))
continue; /* Nothing to do, since this translates to HUNK_EXT */
if (insection->output_section == data_sec)
@ -1963,10 +1959,7 @@ amiga_write_section_contents (abfd, section, data_sec, datadata_relocs,
sym_p = *(r->sym_ptr_ptr); /* The symbol for this section */
insection = sym_p->section;
/* Is reloc relative to a special section? */
if ((insection == bfd_abs_section_ptr) ||
(insection == bfd_com_section_ptr) ||
(insection == bfd_und_section_ptr) ||
(insection == bfd_ind_section_ptr))
if (bfd_is_bfd_section(insection))
continue; /* Nothing to do, since this translates to HUNK_EXT */
#if 0
/* Determine which hunk to write, and index of target */
@ -2054,7 +2047,7 @@ amiga_write_symbols (abfd, section)
DPRINT(5,("Symbol is %s, section is %lx(%s)\n",sym_p->name,osection,osection->name));
if (osection!=bfd_com_section_ptr) /* Not common symbol */
if (!bfd_is_com_section(osection)) /* Not common symbol */
{
DPRINT(5,("Non common ref\n"));
if ((symbol_count++)==0) /* First write out the HUNK_EXT */
@ -2184,13 +2177,13 @@ amiga_write_symbols (abfd, section)
if (osection==NULL) /* FIXME: Happens with constructor functions. */
continue;
if ((osection==bfd_und_section_ptr)
/*||(osection==bfd_com_section_ptr)*/
||(osection==bfd_ind_section_ptr))
if (bfd_is_und_section(osection)
/*||bfd_is_com_section(osection)*/
||bfd_is_ind_section(osection))
continue; /* Don't write these */
/* Only write abs defs, if not writing a Loadfile */
if ((osection==bfd_abs_section_ptr)&&(section->index==0)&&
if (bfd_is_abs_section(osection)&&(section->index==0)&&
!AMIGA_DATA(abfd)->IsLoadFile)
{
DPRINT(5,("Abs symbol\n"));
@ -2212,7 +2205,7 @@ amiga_write_symbols (abfd, section)
return FALSE;
continue;
}/* Of abs def */
if (osection==bfd_abs_section_ptr)
if (bfd_is_abs_section(osection))
continue; /* Not first hunk, already written */
/* If it is a warning symbol, or a constructor symbol or a
@ -2243,7 +2236,7 @@ amiga_write_symbols (abfd, section)
else
{
/* write common definitions as bss common references */
if (osection->output_section == bfd_com_section_ptr &&
if (bfd_is_com_section(osection->output_section) &&
section->index == 2)
{
if ((symbol_count++)==0) /* First write out the header */
@ -2458,7 +2451,7 @@ amiga_get_symbol_info (ignore_abfd, symbol, ret)
bfd_symbol_info (symbol, ret);
if (symbol->name[0] == ' ')
ret->name = "* empty table entry ";
if (symbol->section==bfd_abs_section_ptr)
if (bfd_is_abs_section(symbol->section))
ret->type = (symbol->flags & BSF_LOCAL) ? 'a' : 'A';
}

29
bfd/amigaoslink.c
View File

@ -450,7 +450,7 @@ amiga_perform_reloc (abfd, r, data, sec, obfd, error_message)
target_section=sym->section;
if (target_section==bfd_und_section_ptr) /* Error */
if (bfd_is_und_section(target_section)) /* Error */
{
DPRINT(10,("amiga_perf_reloc: target_sec==UND\n"));
return bfd_reloc_undefined;
@ -463,9 +463,9 @@ amiga_perform_reloc (abfd, r, data, sec, obfd, error_message)
case H_ABS32:
DPRINT(5,("ABSRELOC32\n"));
size-=H_ABS8;
if (target_section==bfd_abs_section_ptr) /* Ref to absolute hunk */
if (bfd_is_abs_section(target_section)) /* Ref to absolute hunk */
relocation=sym->value;
else if (target_section==bfd_com_section_ptr) /* ref to common */
else if (bfd_is_com_section(target_section)) /* ref to common */
{
relocation=0;
copy=TRUE;
@ -501,9 +501,9 @@ amiga_perform_reloc (abfd, r, data, sec, obfd, error_message)
case H_PC32:
DPRINT(5,("RELRELOC\n"));
size-=H_PC8;
if (target_section==bfd_abs_section_ptr) /* Ref to absolute hunk */
if (bfd_is_abs_section(target_section)) /* Ref to absolute hunk */
relocation=sym->value;
else if (target_section==bfd_com_section_ptr) /* Error.. */
else if (bfd_is_com_section(target_section)) /* Error.. */
{
ret=bfd_reloc_undefined;
}
@ -529,7 +529,7 @@ amiga_perform_reloc (abfd, r, data, sec, obfd, error_message)
since .bss section contains only COMMON sections...... and should
be following .data section.. */
size-=H_SD8;
if (target_section==bfd_abs_section_ptr)
if (bfd_is_abs_section(target_section))
relocation=sym->value;
else if (!AMIGA_DATA(target_section->output_section->owner)->baserel)
{
@ -617,7 +617,7 @@ aout_perform_reloc (abfd, r, data, sec, obfd, error_message)
sym=*(r->sym_ptr_ptr);
target_section=sym->section;
if (target_section==bfd_und_section_ptr) /* Error */
if (bfd_is_und_section(target_section)) /* Error */
{
DPRINT(10,("aout_perf_reloc: target_sec==UND\n"));
return bfd_reloc_undefined;
@ -631,9 +631,9 @@ aout_perform_reloc (abfd, r, data, sec, obfd, error_message)
case H_ABS16:
DPRINT(10,("8/16 bit\n"));
size-=H_ABS8;
if (target_section==bfd_abs_section_ptr) /* Ref to absolute hunk */
if (bfd_is_abs_section(target_section)) /* Ref to absolute hunk */
relocation=sym->value;
else if (target_section==bfd_com_section_ptr) /* Error.. */
else if (bfd_is_com_section(target_section)) /* Error.. */
{
bfd_msg ("pc relative relocation to common symbol \"%s\" in "
"section %s\n",sym->name,sec->name);
@ -664,9 +664,9 @@ aout_perform_reloc (abfd, r, data, sec, obfd, error_message)
case H_ABS32: /* 32 bit reloc, pc relative or absolute */
DPRINT(10,("32 bit\n"));
size-=H_ABS8;
if (target_section==bfd_abs_section_ptr) /* Ref to absolute hunk */
if (bfd_is_abs_section(target_section)) /* Ref to absolute hunk */
relocation=sym->value;
else if (target_section==bfd_com_section_ptr) /* ref to common */
else if (bfd_is_com_section(target_section)) /* ref to common */
{
relocation=0;
copy=TRUE;
@ -705,7 +705,8 @@ aout_perform_reloc (abfd, r, data, sec, obfd, error_message)
case H_PC16:
case H_PC32:
size-=H_PC8;
if (target_section == bfd_abs_section_ptr) /* Ref to absolute hunk */
DPRINT(10,("8/16/32 bit pcrel: size=%d\n", size));
if (bfd_is_abs_section(target_section)) /* Ref to absolute hunk */
relocation=sym->value;
else
{
@ -724,9 +725,9 @@ aout_perform_reloc (abfd, r, data, sec, obfd, error_message)
size-=H_SD8;
baserel:
/* We use the symbol ___a4_init as base */
if (target_section==bfd_abs_section_ptr)
if (bfd_is_abs_section(target_section))
relocation=sym->value;
else if (target_section==bfd_com_section_ptr) /* Error.. */
else if (bfd_is_com_section(target_section)) /* Error.. */
{
bfd_msg ("baserelative relocation to common \"%s\"\n",sym->name);
DPRINT(10,("Ref to common symbol...aout_perf_reloc\n"));