This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Re: SPU call graph and prologue scan fixes
- From: Alan Modra <amodra at bigpond dot net dot au>
- To: binutils at sourceware dot org
- Date: Wed, 10 Dec 2008 14:18:12 +1030
- Subject: Re: SPU call graph and prologue scan fixes
- References: <20081210003441.GG9361@bubble.grove.modra.org>
More bug fixes.
* elf32-spu.c (define_ovtab_symbol): Don't abort on symbols
defined in linker scripts.
(discover_functions): Consider STT_SECTION symbols too.
(collect_lib_sections): Don't cut short call tree traversal
when function size is too large.
Index: bfd/elf32-spu.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-spu.c,v
retrieving revision 1.54
diff -u -p -r1.54 elf32-spu.c
--- bfd/elf32-spu.c 10 Dec 2008 00:37:11 -0000 1.54
+++ bfd/elf32-spu.c 10 Dec 2008 03:25:34 -0000
@@ -1401,7 +1401,7 @@ define_ovtab_symbol (struct spu_link_has
h->ref_regular_nonweak = 1;
h->non_elf = 0;
}
- else
+ else if (h->root.u.def.section->owner != NULL)
{
(*_bfd_error_handler) (_("%B is not allowed to define %s"),
h->root.u.def.section->owner,
@@ -1409,6 +1409,13 @@ define_ovtab_symbol (struct spu_link_has
bfd_set_error (bfd_error_bad_value);
return NULL;
}
+ else
+ {
+ (*_bfd_error_handler) (_("you are not allowed to define %s in a script"),
+ h->root.root.string);
+ bfd_set_error (bfd_error_bad_value);
+ return NULL;
+ }
return h;
}
@@ -2434,7 +2441,8 @@ discover_functions (struct bfd_link_info
sec_arr[bfd_idx] = psecs;
for (psy = psyms, p = psecs, sy = syms; sy < syms + symcount; ++p, ++sy)
if (ELF_ST_TYPE (sy->st_info) == STT_NOTYPE
- || ELF_ST_TYPE (sy->st_info) == STT_FUNC)
+ || ELF_ST_TYPE (sy->st_info) == STT_FUNC
+ || ELF_ST_TYPE (sy->st_info) == STT_SECTION)
{
asection *s;
@@ -3047,18 +3055,18 @@ collect_lib_sections (struct function_in
size = fun->sec->size;
if (fun->rodata)
size += fun->rodata->size;
- if (size > lib_param->lib_size)
- return TRUE;
-
- *lib_param->lib_sections++ = fun->sec;
- fun->sec->gc_mark = 0;
- if (fun->rodata && fun->rodata->linker_mark && fun->rodata->gc_mark)
+ if (size <= lib_param->lib_size)
{
- *lib_param->lib_sections++ = fun->rodata;
- fun->rodata->gc_mark = 0;
+ *lib_param->lib_sections++ = fun->sec;
+ fun->sec->gc_mark = 0;
+ if (fun->rodata && fun->rodata->linker_mark && fun->rodata->gc_mark)
+ {
+ *lib_param->lib_sections++ = fun->rodata;
+ fun->rodata->gc_mark = 0;
+ }
+ else
+ *lib_param->lib_sections++ = NULL;
}
- else
- *lib_param->lib_sections++ = NULL;
for (call = fun->call_list; call != NULL; call = call->next)
collect_lib_sections (call->fun, info, param);
--
Alan Modra
Australia Development Lab, IBM