# This shell script emits a C file. -*- C -*-
-# Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2006-2016 Free Software Foundation, Inc.
#
# This file is part of the GNU Binutils.
#
&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");
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);
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;
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;
one_lang_size_sections_pass (NULL, TRUE);
/* Find overlays by inspecting section vmas. */
- if (spu_elf_find_overlays (&link_info))
+ ret = spu_elf_find_overlays (&link_info);
+ if (ret == 0)
+ einfo ("%X%P: can not find overlays: %E\n");
+ else if (ret == 2)
{
- int ret;
lang_output_section_statement_type *os;
if (params.auto_overlay != 0)
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;
}
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++] = "-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)
if grep -q 'ld_elf.*ppc.*_emulation' ldemul-list.h; then
fragment <<EOF
+#include "safe-ctype.h"
#include "filenames.h"
-#include <fcntl.h>
-#include <sys/wait.h>
+#include "libiberty.h"
static const char *
base_name (const char *path)
embedded_spu_file (lang_input_statement_type *entry, const char *flags)
{
const char *cmd[6];
+ const char *pex_return;
const char *sym;
char *handle, *p;
char *oname;
int fd;
- pid_t pid;
int status;
union lang_statement_union **old_stat_tail;
union lang_statement_union **old_file_tail;
}
}
- /* Use fork() and exec() rather than system() so that we don't
- need to worry about quoting args. */
cmd[0] = EMBEDSPU;
cmd[1] = flags;
cmd[2] = handle;
cmd[3] = entry->the_bfd->filename;
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]);
fflush (stdout);
}
- pid = fork ();
- if (pid == -1)
- return FALSE;
- if (pid == 0)
- {
- execvp (cmd[0], (char *const *) cmd);
+ pex_return = pex_one (PEX_SEARCH | PEX_LAST, cmd[0], (char *const *) cmd,
+ cmd[0], NULL, NULL, &status, &errno);
+ if (NULL != pex_return) {
if (strcmp ("embedspu", EMBEDSPU) != 0)
{
cmd[0] = "embedspu";
- execvp (cmd[0], (char *const *) cmd);
+ pex_return = pex_one (PEX_SEARCH | PEX_LAST, cmd[0], (char *const *) cmd,
+ cmd[0], NULL, NULL, &status, &errno);
}
- perror (cmd[0]);
- _exit (127);
- }
-#ifdef HAVE_WAITPID
-#define WAITFOR(PID, STAT) waitpid (PID, STAT, 0)
-#else
-#define WAITFOR(PID, STAT) wait (STAT)
-#endif
- if (WAITFOR (pid, &status) != pid
- || !WIFEXITED (status)
- || WEXITSTATUS (status) != 0)
+ if (NULL != pex_return) {
+ perror (pex_return);
+ _exit (127);
+ }
+ }
+ if (status)
return FALSE;
-#undef WAITFOR
+
old_stat_tail = stat_ptr->tail;
old_file_tail = input_file_chain.tail;
/* 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='
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)
break;
}
break;
+
+ case OPTION_SPU_EMIT_FIXUPS:
+ params.emit_fixups = 1;
+ break;
'
LDEMUL_AFTER_OPEN=spu_after_open