X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=ld%2Femultempl%2Fspuelf.em;h=baaf44f3b464c83b59fbf290d6d6636d71c47903;hb=1d934d768573dc3e54f32d21f13e962718fcd47f;hp=f8650a5e65e2f63e7275eae526b24107f6bcabe5;hpb=6c19b93bcd0d136f7be4d1e1e3f2e8d7b5917009;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/emultempl/spuelf.em b/ld/emultempl/spuelf.em index f8650a5e65..baaf44f3b4 100644 --- a/ld/emultempl/spuelf.em +++ b/ld/emultempl/spuelf.em @@ -1,5 +1,5 @@ # This shell script emits a C file. -*- C -*- -# Copyright (C) 2006-2017 Free Software Foundation, Inc. +# Copyright (C) 2006-2020 Free Software Foundation, Inc. # # This file is part of the GNU Binutils. # @@ -19,7 +19,7 @@ # 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 <addr_tree = NULL; } else if (params.ovly_flavour != ovly_soft_icache @@ -272,7 +272,7 @@ spu_before_allocation (void) /* 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. */ @@ -290,7 +290,7 @@ spu_before_allocation (void) } /* 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 @@ -426,7 +426,7 @@ gld${EMULATION_NAME}_finish (void) 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")); @@ -512,9 +512,9 @@ embedded_spu_file (lang_input_statement_type *entry, const char *flags) 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); @@ -575,7 +575,7 @@ embedded_spu_file (lang_input_statement_type *entry, const char *flags) 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); @@ -641,32 +641,51 @@ PARSE_AND_LIST_LONGOPTS=' 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=' @@ -700,7 +719,7 @@ 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; @@ -736,12 +755,12 @@ PARSE_AND_LIST_ARGS_CASES=' 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; @@ -762,7 +781,7 @@ PARSE_AND_LIST_ARGS_CASES=' && (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; @@ -775,7 +794,7 @@ PARSE_AND_LIST_ARGS_CASES=' && (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; @@ -784,7 +803,7 @@ PARSE_AND_LIST_ARGS_CASES=' 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; @@ -793,7 +812,7 @@ PARSE_AND_LIST_ARGS_CASES=' 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; @@ -802,7 +821,7 @@ PARSE_AND_LIST_ARGS_CASES=' 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;