# This shell script emits a C file. -*- C -*-
-# Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 Free Software Foundation, Inc.
#
# This file is part of the GNU Binutils.
#
# MA 02110-1301, USA.
#
-# This file is sourced from elf32.em, and defines extra spu specific
+# This file is sourced from elf.em, and defines extra spu specific
# features.
#
fragment <<EOF
&spu_elf_load_ovl_mgr,
&spu_elf_open_overlay_script,
&spu_elf_relink,
- 0, ovly_normal, 0, 0, 0, 0, 0, 0, 0,
+ 0, ovly_normal, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0x3ffff,
1, 0, 16, 0, 0, 2000
};
-static unsigned int no_overlays = 0;
+static unsigned int no_overlays = 0;
static unsigned int num_lines_set = 0;
static unsigned int line_size_set = 0;
static char *auto_overlay_file = 0;
static int
is_spu_target (void)
{
- extern const bfd_target bfd_elf32_spu_vec;
+ extern const bfd_target spu_elf32_vec;
- return link_info.output_bfd->xvec == &bfd_elf32_spu_vec;
+ return link_info.output_bfd->xvec == &spu_elf32_vec;
}
/* Create our note section. */
params.emit_stub_syms |= link_info.emitrelocations;
spu_elf_setup (&link_info, ¶ms);
- if (link_info.relocatable)
+ if (bfd_link_relocatable (&link_info))
lang_add_unique (".text.ia.*");
- if (!link_info.relocatable
+ if (!bfd_link_relocatable (&link_info)
&& link_info.input_bfds != NULL
&& !spu_elf_create_sections (&link_info))
- einfo ("%X%P: can not create note section: %E\n");
+ einfo (_("%X%P: can not create note section: %E\n"));
}
gld${EMULATION_NAME}_after_open ();
lang_output_section_statement_type *os;
if (o != NULL)
- output_name = o->name;
- os = lang_output_section_find (output_name);
+ os = lang_output_section_get (o);
+ else
+ os = lang_output_section_find (output_name);
if (os == NULL)
{
- os = gld${EMULATION_NAME}_place_orphan (s, output_name, 0);
+ os = ldelf_place_orphan (s, output_name, 0);
os->addr_tree = NULL;
}
else if (params.ovly_flavour != ovly_soft_icache
lang_statement_list_type add;
lang_list_init (&add);
- lang_add_section (&add, s, os);
+ lang_add_section (&add, s, NULL, os);
*add.tail = os->children.head;
os->children.head = add.head;
}
push_stat_ptr (&os->children);
e_size = exp_intop (params.line_size - s->size);
- lang_add_assignment (exp_assop ('=', ".", e_size));
+ lang_add_assignment (exp_assign (".", e_size, FALSE));
pop_stat_ptr ();
}
- lang_add_section (&os->children, s, os);
+ lang_add_section (&os->children, s, NULL, os);
}
s->output_section->size += s->size;
/* User supplied __ovly_load. */
}
else if (mgr_stream->start == mgr_stream->end)
- einfo ("%F%P: no built-in overlay manager\n");
+ einfo (_("%F%P: no built-in overlay manager\n"));
else
{
lang_input_statement_type *ovl_is;
NULL);
if (!spu_elf_open_builtin_lib (&ovl_is->the_bfd, mgr_stream))
- einfo ("%X%P: can not open built-in overlay manager: %E\n");
+ einfo (_("%X%P: can not open built-in overlay manager: %E\n"));
else
{
asection *in;
if (!load_symbols (ovl_is, NULL))
- einfo ("%X%P: can not load built-in overlay manager: %E\n");
+ einfo (_("%X%P: can not load built-in overlay manager: %E\n"));
/* Map overlay manager sections to output sections.
First try for a matching output section name, if that
spu_before_allocation (void)
{
if (is_spu_target ()
- && !link_info.relocatable
+ && !bfd_link_relocatable (&link_info)
&& !no_overlays)
{
int ret;
/* Size the sections. This is premature, but we need to know the
rough layout so that overlays can be found. */
expld.phase = lang_mark_phase_enum;
- expld.dataseg.phase = exp_dataseg_none;
+ expld.dataseg.phase = exp_seg_none;
one_lang_size_sections_pass (NULL, TRUE);
/* Find overlays by inspecting section vmas. */
ret = spu_elf_find_overlays (&link_info);
if (ret == 0)
- einfo ("%X%P: can not find overlays: %E\n");
+ einfo (_("%X%P: can not find overlays: %E\n"));
else if (ret == 2)
{
lang_output_section_statement_type *os;
if (params.auto_overlay != 0)
{
- einfo ("%P: --auto-overlay ignored with user overlay script\n");
+ einfo (_("%P: --auto-overlay ignored with user overlay script\n"));
params.auto_overlay = 0;
}
/* Ensure alignment of overlay sections is sufficient. */
- for (os = &lang_output_section_statement.head->output_section_statement;
+ for (os = (void *) lang_os_list.head;
os != NULL;
os = os->next)
if (os->bfd_section != NULL
ret = spu_elf_size_stubs (&link_info);
if (ret == 0)
- einfo ("%X%P: can not size overlay stubs: %E\n");
+ einfo (_("%X%P: can not size overlay stubs: %E\n"));
else if (ret == 2)
spu_elf_load_ovl_mgr ();
+
+ spu_elf_place_overlay_data (&link_info);
}
/* We must not cache anything from the preliminary sizing. */
lang_reset_memory_regions ();
}
+ if (is_spu_target ()
+ && !bfd_link_relocatable (&link_info))
+ spu_elf_size_sections (link_info.output_bfd, &link_info);
+
gld${EMULATION_NAME}_before_allocation ();
}
*fname = mktemp (*fname);
if (*fname == NULL)
return -1;
- fd = open (fname, O_RDWR | O_CREAT | O_EXCL, 0600);
+ fd = open (*fname, O_RDWR | O_CREAT | O_EXCL, 0600);
#endif
return fd;
}
if (script == NULL)
{
file_err:
- einfo ("%F%P: can not open script: %E\n");
+ einfo (_("%F%P: can not open script: %E\n"));
}
return script;
}
+#include <errno.h>
+
static void
spu_elf_relink (void)
{
+ const char *pex_return;
+ int status;
char **argv = xmalloc ((my_argc + 4) * sizeof (*argv));
memcpy (argv, my_argv, my_argc * sizeof (*argv));
argv[my_argc++] = "--no-auto-overlay";
- if (tmp_file_list->name == auto_overlay_file)
+ if (tmp_file_list != NULL && tmp_file_list->name == auto_overlay_file)
argv[my_argc - 1] = concat (argv[my_argc - 1], "=",
auto_overlay_file, (const char *) NULL);
argv[my_argc++] = "-T";
argv[my_argc++] = auto_overlay_file;
argv[my_argc] = 0;
- execvp (argv[0], (char *const *) argv);
- perror (argv[0]);
- _exit (127);
+
+ pex_return = pex_one (PEX_SEARCH | PEX_LAST, (const char *) argv[0],
+ (char * const *) argv, (const char *) argv[0],
+ NULL, NULL, & status, & errno);
+ if (pex_return != NULL)
+ {
+ perror (pex_return);
+ _exit (127);
+ }
+ exit (status);
}
/* Final emulation specific call. */
static void
gld${EMULATION_NAME}_finish (void)
{
- int need_laying_out;
-
- need_laying_out = bfd_elf_discard_info (link_info.output_bfd, &link_info);
-
- gld${EMULATION_NAME}_map_segments (need_laying_out);
-
if (is_spu_target ())
{
if (params.local_store_lo < params.local_store_hi)
- {
+ {
asection *s;
s = spu_elf_check_vma (&link_info);
if (s != NULL && !params.auto_overlay)
- einfo ("%X%P: %A exceeds local store range\n", s);
+ einfo (_("%X%P: %pA exceeds local store range\n"), s);
}
else if (params.auto_overlay)
- einfo ("%P: --auto-overlay ignored with zero local store range\n");
+ einfo (_("%P: --auto-overlay ignored with zero local store range\n"));
}
finish_default ();
if grep -q 'ld_elf.*ppc.*_emulation' ldemul-list.h; then
fragment <<EOF
-#include <errno.h>
+#include "safe-ctype.h"
#include "filenames.h"
#include "libiberty.h"
return FALSE;
/* Use the filename as the symbol marking the program handle struct. */
- sym = base_name (entry->the_bfd->filename);
+ sym = base_name (bfd_get_filename (entry->the_bfd));
handle = xstrdup (sym);
for (p = handle; *p; ++p)
return FALSE;
close (fd);
- for (search = (lang_input_statement_type *) input_file_chain.head;
+ for (search = (void *) input_file_chain.head;
search != NULL;
- search = (lang_input_statement_type *) search->next_real_file)
+ search = search->next_real_file)
if (search->filename != NULL)
{
const char *infile = base_name (search->filename);
cmd[0] = EMBEDSPU;
cmd[1] = flags;
cmd[2] = handle;
- cmd[3] = entry->the_bfd->filename;
+ cmd[3] = bfd_get_filename (entry->the_bfd);
cmd[4] = oname;
cmd[5] = NULL;
- if (trace_file_tries)
+ if (verbose)
{
info_msg (_("running: %s \"%s\" \"%s\" \"%s\" \"%s\"\n"),
cmd[0], cmd[1], cmd[2], cmd[3], cmd[4]);
pex_return = pex_one (PEX_SEARCH | PEX_LAST, cmd[0], (char *const *) cmd,
cmd[0], NULL, NULL, &status, &errno);
}
- if (NULL != pex_return) {
+ if (NULL != pex_return) {
perror (pex_return);
_exit (127);
}
new_ent->header.next = entry->header.next;
entry->header.next = new_ent;
new_ent->input_statement.next_real_file = entry->next_real_file;
- entry->next_real_file = new_ent;
+ entry->next_real_file = &new_ent->input_statement;
/* Ensure bfd sections are excluded from the output. */
bfd_section_list_clear (entry->the_bfd);
- entry->loaded = TRUE;
+ entry->flags.loaded = TRUE;
return TRUE;
}
#define OPTION_SPU_RESERVED_SPACE (OPTION_SPU_FIXED_SPACE + 1)
#define OPTION_SPU_EXTRA_STACK (OPTION_SPU_RESERVED_SPACE + 1)
#define OPTION_SPU_NO_AUTO_OVERLAY (OPTION_SPU_EXTRA_STACK + 1)
+#define OPTION_SPU_EMIT_FIXUPS (OPTION_SPU_NO_AUTO_OVERLAY + 1)
'
PARSE_AND_LIST_LONGOPTS='
{ "reserved-space", required_argument, NULL, OPTION_SPU_RESERVED_SPACE },
{ "extra-stack-space", required_argument, NULL, OPTION_SPU_EXTRA_STACK },
{ "no-auto-overlay", optional_argument, NULL, OPTION_SPU_NO_AUTO_OVERLAY },
+ { "emit-fixups", optional_argument, NULL, OPTION_SPU_EMIT_FIXUPS },
'
PARSE_AND_LIST_OPTIONS='
fprintf (file, _("\
- --plugin Make SPU plugin.\n\
- --no-overlays No overlay handling.\n\
- --compact-stubs Use smaller and possibly slower call stubs.\n\
- --emit-stub-syms Add symbols on overlay call stubs.\n\
- --extra-overlay-stubs Add stubs on all calls out of overlay regions.\n\
- --local-store=lo:hi Valid address range.\n\
- --stack-analysis Estimate maximum stack requirement.\n\
- --emit-stack-syms Add sym giving stack needed for each func.\n\
+ --plugin Make SPU plugin\n"));
+ fprintf (file, _("\
+ --no-overlays No overlay handling\n"));
+ fprintf (file, _("\
+ --compact-stubs Use smaller and possibly slower call stubs\n"));
+ fprintf (file, _("\
+ --emit-stub-syms Add symbols on overlay call stubs\n"));
+ fprintf (file, _("\
+ --extra-overlay-stubs Add stubs on all calls out of overlay regions\n"));
+ fprintf (file, _("\
+ --local-store=lo:hi Valid address range\n"));
+ fprintf (file, _("\
+ --stack-analysis Estimate maximum stack requirement\n"));
+ fprintf (file, _("\
+ --emit-stack-syms Add sym giving stack needed for each func\n"));
+ fprintf (file, _("\
--auto-overlay [=filename] Create an overlay script in filename if\n\
- executable does not fit in local store.\n\
- --auto-relink Rerun linker using auto-overlay script.\n\
+ executable does not fit in local store\n"));
+ fprintf (file, _("\
+ --auto-relink Rerun linker using auto-overlay script\n"));
+ fprintf (file, _("\
--overlay-rodata Place read-only data with associated function\n\
- code in overlays.\n\
- --num-regions Number of overlay buffers (default 1).\n\
- --region-size Size of overlay buffers (default 0, auto).\n\
- --fixed-space=bytes Local store for non-overlay code and data.\n\
+ code in overlays\n"));
+ fprintf (file, _("\
+ --num-regions Number of overlay buffers (default 1)\n"));
+ fprintf (file, _("\
+ --region-size Size of overlay buffers (default 0, auto)\n"));
+ fprintf (file, _("\
+ --fixed-space=bytes Local store for non-overlay code and data\n"));
+ fprintf (file, _("\
--reserved-space=bytes Local store for stack and heap. If not specified\n\
- ld will estimate stack size and assume no heap.\n\
+ ld will estimate stack size and assume no heap\n"));
+ fprintf (file, _("\
--extra-stack-space=bytes Space for negative sp access (default 2000) if\n\
- --reserved-space not given.\n\
- --soft-icache Generate software icache overlays.\n\
- --num-lines Number of soft-icache lines (default 32).\n\
- --line-size Size of soft-icache lines (default 1k).\n\
- --non-ia-text Allow non-icache code in icache lines.\n\
- --lrlive-analysis Scan function prologue for lr liveness.\n"
- ));
+ --reserved-space not given\n"));
+ fprintf (file, _("\
+ --soft-icache Generate software icache overlays\n"));
+ fprintf (file, _("\
+ --num-lines Number of soft-icache lines (default 32)\n"));
+ fprintf (file, _("\
+ --line-size Size of soft-icache lines (default 1k)\n"));
+ fprintf (file, _("\
+ --non-ia-text Allow non-icache code in icache lines\n"));
+ fprintf (file, _("\
+ --lrlive-analysis Scan function prologue for lr liveness\n"));
'
PARSE_AND_LIST_ARGS_CASES='
if (*end == 0)
break;
}
- einfo (_("%P%F: invalid --local-store address range `%s'\''\n"), optarg);
+ einfo (_("%F%P: invalid --local-store address range `%s'\''\n"), optarg);
}
break;
auto_overlay_file = optarg;
break;
}
- /* Fall thru */
+ /* Fallthru */
case OPTION_SPU_AUTO_RELINK:
params.auto_overlay |= 2;
case OPTION_SPU_SOFT_ICACHE:
params.ovly_flavour = ovly_soft_icache;
+ /* Software i-cache stubs are always "compact". */
+ params.compact_stub = 1;
if (!num_lines_set)
params.num_lines = 32;
else if ((params.num_lines & -params.num_lines) != params.num_lines)
- einfo (_("%P%F: invalid --num-lines/--num-regions `%u'\''\n"),
+ einfo (_("%F%P: invalid --num-lines/--num-regions `%u'\''\n"),
params.num_lines);
if (!line_size_set)
params.line_size = 1024;
else if ((params.line_size & -params.line_size) != params.line_size)
- einfo (_("%P%F: invalid --line-size/--region-size `%u'\''\n"),
+ einfo (_("%F%P: invalid --line-size/--region-size `%u'\''\n"),
params.line_size);
break;
&& (params.ovly_flavour != ovly_soft_icache
|| (params.num_lines & -params.num_lines) == params.num_lines))
break;
- einfo (_("%P%F: invalid --num-lines/--num-regions `%s'\''\n"), optarg);
+ einfo (_("%F%P: invalid --num-lines/--num-regions `%s'\''\n"), optarg);
}
break;
&& (params.ovly_flavour != ovly_soft_icache
|| (params.line_size & -params.line_size) == params.line_size))
break;
- einfo (_("%P%F: invalid --line-size/--region-size `%s'\''\n"), optarg);
+ einfo (_("%F%P: invalid --line-size/--region-size `%s'\''\n"), optarg);
}
break;
char *end;
params.auto_overlay_fixed = strtoul (optarg, &end, 0);
if (*end != 0)
- einfo (_("%P%F: invalid --fixed-space value `%s'\''\n"), optarg);
+ einfo (_("%F%P: invalid --fixed-space value `%s'\''\n"), optarg);
}
break;
char *end;
params.auto_overlay_reserved = strtoul (optarg, &end, 0);
if (*end != 0)
- einfo (_("%P%F: invalid --reserved-space value `%s'\''\n"), optarg);
+ einfo (_("%F%P: invalid --reserved-space value `%s'\''\n"), optarg);
}
break;
char *end;
params.extra_stack_space = strtol (optarg, &end, 0);
if (*end != 0)
- einfo (_("%P%F: invalid --extra-stack-space value `%s'\''\n"), optarg);
+ einfo (_("%F%P: invalid --extra-stack-space value `%s'\''\n"), optarg);
}
break;
break;
}
break;
+
+ case OPTION_SPU_EMIT_FIXUPS:
+ params.emit_fixups = 1;
+ break;
'
LDEMUL_AFTER_OPEN=spu_after_open
projects / thirdparty / binutils-gdb.git / blobdiff